[gnome-games] build: Always build libgames-support



commit 8e271625777cf3394f6d8a525e866dd675eab29f
Author: Christian Persch <chpe gnome org>
Date:   Sun Apr 3 15:47:07 2011 +0200

    build: Always build libgames-support

 Makefile.am                  |    6 +-----
 configure.in                 |    7 -------
 libgames-support/Makefile.am |    3 ---
 3 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a0d552e..2617bca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 NULL =
 
-SUBDIRS= \
-	po \
-	icons \
-	libgames-support \
-	$(gamelist)
+SUBDIRS = libgames-support $(gamelist) po icons
 
 if ENABLE_SOUND
 SUBDIRS += sounds
diff --git a/configure.in b/configure.in
index c48841d..4eb19eb 100644
--- a/configure.in
+++ b/configure.in
@@ -125,7 +125,6 @@ allow_smclient=no
 disallow_hildon=no
 require_gtk_2_16=no
 require_cairo_1_10=no
-libgames_support_full=no
 
 for game in $gamelist; do
   case $game in
@@ -188,14 +187,8 @@ for game in $gamelist; do
     aisleriot) ;;
     *) require_gtk_2_16=yes ;;
   esac
-  case $game in
-    aisleriot) ;;
-    *) libgames_support_full=yes ;;
-  esac
 done
 
-AM_CONDITIONAL([LIBGAMES_SUPPORT_FULL],[test "$libgames_support_full" = "yes"])
-
 # Set a conditional for each game to build
 
 for game in $allgames $staginggames; do
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 62c5043..5346d5d 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -57,7 +57,6 @@ libgames_support_la_SOURCES += \
 	$(NULL)
 endif
 
-if LIBGAMES_SUPPORT_FULL
 libgames_support_la_SOURCES +=		\
 	games-files.c			\
 	games-files.h			\
@@ -88,8 +87,6 @@ libgames_support_la_SOURCES +=		\
 	$(NULL)
 endif # ENABLE_SETGID
 
-endif # LIBGAMES_SUPPORT_FULL
-
 libgames_support_la_CPPFLAGS = \
 	-DPKGDATADIR="\"$(pkgdatadir)\""			\
 	-DPREFIX="\"$(prefix)\"" \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]