[gnome-games] Remove more obsolete help build rules
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] Remove more obsolete help build rules
- Date: Tue, 3 Jan 2012 06:49:11 +0000 (UTC)
commit 0715ec563901c98d4f9c696157078f8723d157e0
Author: Robert Ancell <robert ancell canonical com>
Date: Tue Jan 3 17:41:38 2012 +1100
Remove more obsolete help build rules
configure.ac | 10 +---------
glchess/Makefile.am | 2 +-
glines/Makefile.am | 6 +-----
gnect/Makefile.am | 6 +-----
gnibbles/Makefile.am | 6 +-----
gnobots2/Makefile.am | 6 +-----
gnome-sudoku/Makefile.am | 2 +-
gnomine/Makefile.am | 6 +-----
gnotravex/Makefile.am | 6 +-----
gnotski/Makefile.am | 6 +-----
gtali/Makefile.am | 6 +-----
iagno/Makefile.am | 6 +-----
lightsoff/Makefile.am | 6 +-----
mahjongg/Makefile.am | 6 +-----
quadrapassel/Makefile.am | 6 +-----
swell-foop/Makefile.am | 6 +-----
16 files changed, 16 insertions(+), 76 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b53e7d7..56a320c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -529,14 +529,7 @@ AC_HEADER_TIME
# Documentation
# *************
-GNOME_DOC_INIT([0.10.0],
- [have_gdu=yes],
- [have_gdu=no
- if test "$with_help_method" = "ghelp"; then
- AC_MSG_ERROR([ghelp requested, but gnome-doc-utils not found!])
- fi])
-
-AM_CONDITIONAL([BUILD_HELP],[test "$with_help_method" = "ghelp"])
+GNOME_DOC_INIT
# *************
# setgid checks
@@ -724,7 +717,6 @@ fi
echo "
Games to be compiled: ${gamelist}
- Help method: ${with_help_method} ${with_help_file_format}
Using RSVG: ${have_rsvg}
Using SQLite: ${have_sqlite}
Use setgid binaries: ${enable_setgid}
diff --git a/glchess/Makefile.am b/glchess/Makefile.am
index 9d7a3e7..40c0ea9 100644
--- a/glchess/Makefile.am
+++ b/glchess/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = data help src
+SUBDIRS = src data help
-include $(top_srcdir)/git.mk
diff --git a/glines/Makefile.am b/glines/Makefile.am
index f55ec37..0cc122c 100644
--- a/glines/Makefile.am
+++ b/glines/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
SCOREFILES = \
Small \
diff --git a/gnect/Makefile.am b/gnect/Makefile.am
index 904a4c8..40c0ea9 100644
--- a/gnect/Makefile.am
+++ b/gnect/Makefile.am
@@ -1,7 +1,3 @@
-SUBDIRS = src data
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
-include $(top_srcdir)/git.mk
diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
index 37e3a21..2873fb3 100644
--- a/gnibbles/Makefile.am
+++ b/gnibbles/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
SCOREFILES = 4.0 3.0 2.0 1.0 4.1 3.1 2.1 1.1
diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
index 2effef4..eec1080 100644
--- a/gnobots2/Makefile.am
+++ b/gnobots2/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
install-data-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
diff --git a/gnome-sudoku/Makefile.am b/gnome-sudoku/Makefile.am
index 682cb61..40c0ea9 100644
--- a/gnome-sudoku/Makefile.am
+++ b/gnome-sudoku/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = data help src
+SUBDIRS = src data help
-include $(top_srcdir)/git.mk
diff --git a/gnomine/Makefile.am b/gnomine/Makefile.am
index 0643bcd..608c414 100644
--- a/gnomine/Makefile.am
+++ b/gnomine/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = data src help
SCOREFILES = Small Medium Large Custom
diff --git a/gnotravex/Makefile.am b/gnotravex/Makefile.am
index 06a52d0..c424197 100644
--- a/gnotravex/Makefile.am
+++ b/gnotravex/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = data src help
SCOREFILES = 2 3 4 5 6
diff --git a/gnotski/Makefile.am b/gnotski/Makefile.am
index 06c8655..a867aef 100644
--- a/gnotski/Makefile.am
+++ b/gnotski/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = src data
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
SCOREFILES = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/gtali/Makefile.am b/gtali/Makefile.am
index a44bdab..2af65e2 100644
--- a/gtali/Makefile.am
+++ b/gtali/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = src data
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
install-data-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
diff --git a/iagno/Makefile.am b/iagno/Makefile.am
index 904a4c8..40c0ea9 100644
--- a/iagno/Makefile.am
+++ b/iagno/Makefile.am
@@ -1,7 +1,3 @@
-SUBDIRS = src data
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
-include $(top_srcdir)/git.mk
diff --git a/lightsoff/Makefile.am b/lightsoff/Makefile.am
index 904a4c8..40c0ea9 100644
--- a/lightsoff/Makefile.am
+++ b/lightsoff/Makefile.am
@@ -1,7 +1,3 @@
-SUBDIRS = src data
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
-include $(top_srcdir)/git.mk
diff --git a/mahjongg/Makefile.am b/mahjongg/Makefile.am
index b814dd2..b14967d 100644
--- a/mahjongg/Makefile.am
+++ b/mahjongg/Makefile.am
@@ -1,7 +1,3 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = data src help
-include $(top_srcdir)/git.mk
diff --git a/quadrapassel/Makefile.am b/quadrapassel/Makefile.am
index 243a01f..f0343ca 100644
--- a/quadrapassel/Makefile.am
+++ b/quadrapassel/Makefile.am
@@ -1,8 +1,4 @@
-SUBDIRS = src data
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = src data help
install-data-local:
-$(mkinstalldirs) $(DESTDIR)$(scoredir)
diff --git a/swell-foop/Makefile.am b/swell-foop/Makefile.am
index b814dd2..b14967d 100644
--- a/swell-foop/Makefile.am
+++ b/swell-foop/Makefile.am
@@ -1,7 +1,3 @@
-SUBDIRS = data src
-
-if BUILD_HELP
-SUBDIRS += help
-endif
+SUBDIRS = data src help
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]