gnome-games r8606 - in trunk: . aisleriot blackjack/src dependencies/ggz-gtk gnect/src gnibbles gnobots2 gnometris gnomine iagno tests/libgames-support

[thomashpa svn gnome org]

Author: thomashpa
Date: Wed Jan 21 17:30:15 2009
New Revision: 8606
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8606&view=rev

Log:
Split GNOME_GAMES_CFLAGS up into the needed pars in each games Makefile.am

Modified:
   trunk/aisleriot/Makefile.am
   trunk/blackjack/src/Makefile.am
   trunk/configure.in
   trunk/dependencies/ggz-gtk/Makefile.am
   trunk/gnect/src/Makefile.am
   trunk/gnibbles/Makefile.am
   trunk/gnobots2/Makefile.am
   trunk/gnometris/Makefile.am
   trunk/gnomine/Makefile.am
   trunk/iagno/Makefile.am
   trunk/tests/libgames-support/Makefile.am

Modified: trunk/aisleriot/Makefile.am
==============================================================================
--- trunk/aisleriot/Makefile.am	(original)
+++ trunk/aisleriot/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -47,9 +47,6 @@
 	$(GUILE_CFLAGS)	      \
 	$(AM_CFLAGS)
 
-sol_LDFLAGS = \
-	$(AM_LDFLAGS)
-
 sol_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \

Modified: trunk/blackjack/src/Makefile.am
==============================================================================
--- trunk/blackjack/src/Makefile.am	(original)
+++ trunk/blackjack/src/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -38,13 +38,28 @@
 	$(AM_CPPFLAGS)
 
 blackjack_CXXFLAGS = \
-	$(GNOME_GAMES_CXXFLAGS) \
+	$(GTK_CFLAGS) \
 	$(XML_CFLAGS) \
 	$(AM_CXXFLAGS)
 
 blackjack_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
+	$(GTK_LIBS) \
 	$(XML_LIBS) \
 	-lz
 # FIXMEchpe: what's this -lz about??
+
+if HAVE_GNOME
+blackjack_CXXFLAGS += $(GNOME_CFLAGS)
+blackjack_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+blackjack_CXXFLAGS += $(RSVG_CFLAGS)
+blackjack_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+blackjack_CXXFLAGS += $(GHTREAD_CFLAGS)
+blackjack_LDADD += $(GTHREAD_LIBS)
+endif

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jan 21 17:30:15 2009
@@ -705,11 +705,6 @@
 AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
 AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
 
-# Compat defines (FIXMEchpe: update all games to only use those flags they require!)
-
-GNOME_GAMES_CFLAGS="$GTK_CFLAGS $GNOME_CFLAGS $PYGTK_CFLAGS $RSVG_CFLAGS $GSTREAMER_CFLAGS $SDL_MIXER_CFLAGS"
-GNOME_GAMES_LIBS="$GTK_LIBS $GNOME_LIBS $PYGTK_LIBS $RSVG_LIBS $GSTREAMER_LIBS $SDL_MIXER_LIBS"
-
 # *************
 
 AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
@@ -766,27 +761,8 @@
 
 # ********
 
-GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
-GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CFLAGS"
-
-## Use a separate set of flags for C++ (so we can exclude -std=gnu89 for
-## example, it doesn't make sense under C++).
-GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CXXFLAGS"
-AC_SUBST(GNOME_GAMES_CXXFLAGS)
-
-## This should make sure that developers using gcc 3.x will write something
-## that compiles using gcc 2.9x. Straight -ansi is a little tough given the
-## current code base, although what breaks is probably not that portable.
-if test x$CC=xgcc ; then
-  GNOME_GAMES_CFLAGS="-std=gnu89 $GNOME_GAMES_CFLAGS"
-fi
-
-## Check for some special cases
-OS_FLAGS=""
-case "$ac_cv_build" in
-     *-*-osf1-* ) OS_FLAGS="-D_POSIX_PII_SOCKET" ;;
-esac
-GNOME_GAMES_CFLAGS="$OS_FLAGS $GNOME_GAMES_CFLAGS"
+AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS"
 
 # ****
 # i18n
@@ -1015,26 +991,8 @@
 scoredir='${localstatedir}/games'
 AC_SUBST(scoredir)
 
-BUILD_BREAKER_BASIC="-Werror -Wextra -Wfloat-equal -Wmissing-declarations -Wredundant-decls -Wold-style-definition -Wmissing-noreturn -Wdeclaration-after-statement -Wshadow -Wendif-labels -Wlarger-than-4000 -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wundef -Wunreachable-code -fdata-sections"
-MEGA_BUILD_BREAKER="$DISABLE_DEPRECATED -Wstrict-prototypes -Wbad-function-cast"
-
-AC_ARG_ENABLE(build-breaker,
-  AC_HELP_STRING([--enable-build-breaker],
-    [Enable extra compiler warnings]),
-  [GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS $BUILD_BREAKER_BASIC"
-   GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CXXFLAGS $BUILD_BREAKER_BASIC"])
-AC_ARG_ENABLE(mega-build-breaker,
-  AC_HELP_STRING([--enable-mega-build-breaker],
-    [Enable extra compiler options that are almost guaranteed to stop compilation.]),
-  [GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS $BUILD_BREAKER_BASIC $MEGA_BUILD_BREAKER"
-   GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CXXFLAGS $BUILD_BREAKER_BASIC $MEGA_BUILD_BREAKER"])  
-
 ##############################################
 
-AC_SUBST([GNOME_GAMES_CFLAGS])
-AC_SUBST([GNOME_GAMES_CXXFLAGS])
-AC_SUBST([GNOME_GAMES_LIBS])
-
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])

Modified: trunk/dependencies/ggz-gtk/Makefile.am
==============================================================================
--- trunk/dependencies/ggz-gtk/Makefile.am	(original)
+++ trunk/dependencies/ggz-gtk/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -1,10 +1,10 @@
 ggzgtkdatadir=$(datadir)/ggz/$(PACKAGE)
-AM_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/intl \
-	$(GGZCORE_INCLUDES) $(LIBGGZ_INCLUDES) \
+libggz_gtk_la_CFLAGS = $(GTK_CFLAGS) \
+	-I$(top_srcdir)/intl \
+	$(GGZCORE_INCLUDES) \
+	$(LIBGGZ_INCLUDES) \
 	-DGGZGTKDATADIR=\"$(ggzgtkdatadir)\" \
-	-UG_DISABLE_SINGLE_INCLUDES \
-	-UGTK_DISABLE_SINGLE_INCLUDES \
-	-UGTK_DISABLE_DEPRECATED
+	$(AM_CFLAGS)
 
 ggzgtkdata_DATA =	about_bg.png		\
 			ggz_gtk_admin.svg 	\
@@ -18,8 +18,6 @@
 			ggz_gtk_lag4.svg	\
 			ggz_gtk_lag5.svg
 
-INCLUDES = $(GNOME_GAMES_CFLAGS)
-
 if INSTALL_GGZ_GTK
 lib_LTLIBRARIES = libggz-gtk.la
 

Modified: trunk/gnect/src/Makefile.am
==============================================================================
--- trunk/gnect/src/Makefile.am	(original)
+++ trunk/gnect/src/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -59,12 +59,27 @@
 gnect_CFLAGS = \
 	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
 	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
-	$(GNOME_GAMES_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnect_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
+	$(GTK_LIBS) \
 	$(INTLLIBS) \
 	$(LIB_GGZMOD) \
 	$(LIB_GGZ_GTK)
+
+if HAVE_GNOME
+gnect_CFLAGS += $(GNOME_CFLAGS)
+gnect_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnect_CFLAGS += $(RSVG_CFLAGS)
+gnect_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnect_CFLAGS += $(GHTREAD_CFLAGS)
+gnect_LDADD += $(GTHREAD_LIBS)
+endif

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -31,16 +31,29 @@
 	$(AM_CPPFLAGS)
 
 gnibbles_CFLAGS = \
-	$(GNOME_GAMES_CFLAGS)			\
+	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
-gnibbles_LDFLAGS = $(AM_LDFLAGS)
-
 gnibbles_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
+	$(GTK_LIBS) \
 	$(INTLLIBS)
 
+if HAVE_GNOME
+gnibbles_CFLAGS += $(GNOME_CFLAGS)
+gnibbles_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnibbles_CFLAGS += $(RSVG_CFLAGS)
+gnibbles_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnibbles_CFLAGS += $(GHTREAD_CFLAGS)
+gnibbles_LDADD += $(GTHREAD_LIBS)
+endif
+
 if GGZ_CLIENT
 gnibbles_SOURCES += \
 	ggz-network.h \

Modified: trunk/gnobots2/Makefile.am
==============================================================================
--- trunk/gnobots2/Makefile.am	(original)
+++ trunk/gnobots2/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -36,14 +36,29 @@
 	$(AM_CPPFLAGS)
 
 gnobots2_CFLAGS = \
-	$(GNOME_GAMES_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnobots2_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
+	$(GTK_LIBS) \
 	$(INTLLIBS)
 
+if HAVE_GNOME
+gnobots2_CFLAGS += $(GNOME_CFLAGS)
+gnobots2_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnobots2_CFLAGS += $(RSVG_CFLAGS)
+gnobots2_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnobots2_CFLAGS += $(GHTREAD_CFLAGS)
+gnobots2_LDADD += $(GTHREAD_LIBS)
+endif
+
 pixmapdir = $(pkgdatadir)/gnobots2/pixmaps
 pixmap_DATA = gnomes.png \
               yahoo.png \

Modified: trunk/gnometris/Makefile.am
==============================================================================
--- trunk/gnometris/Makefile.am	(original)
+++ trunk/gnometris/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -40,16 +40,29 @@
 	$(AM_CPPFLAGS)
 
 gnometris_CXXFLAGS = \
-	$(GNOME_GAMES_CXXFLAGS) \
-	$(ESD_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(AM_CXXFLAGS)
 
 gnometris_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
-	$(ESD_LIBS) \
+	$(GTK_LIBS) \
 	$(INTLLIBS)
 
+if HAVE_GNOME
+gnometris_CXXFLAGS += $(GNOME_CFLAGS)
+gnometris_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnometris_CXXFLAGS += $(RSVG_CFLAGS)
+gnometris_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnometris_CXXFLAGS += $(GHTREAD_CFLAGS)
+gnometris_LDADD += $(GTHREAD_LIBS)
+endif
+
 if HAVE_CLUTTER
 noinst_PROGRAMS = gnometris-noclutter
 

Modified: trunk/gnomine/Makefile.am
==============================================================================
--- trunk/gnomine/Makefile.am	(original)
+++ trunk/gnomine/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -12,13 +12,27 @@
 	$(AM_CPPFLAGS)
 
 gnomine_CFLAGS = \
-	$(WARN_CFLAGS) \
-	$(GNOME_GAMES_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnomine_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS)
+	$(GTK_LIBS)
+
+if HAVE_GNOME
+gnomine_CFLAGS += $(GNOME_CFLAGS)
+gnomine_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnomine_CFLAGS += $(RSVG_CFLAGS)
+gnomine_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnomine_CFLAGS += $(GHTREAD_CFLAGS)
+gnomine_LDADD += $(GTHREAD_LIBS)
+endif
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnomine.schemas.in

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -47,16 +47,31 @@
 iagno_CFLAGS = \
 	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
 	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
-	$(GNOME_GAMES_CFLAGS) \
+	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 iagno_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
+	$(GTK_LIBS) \
 	$(INTLLIBS) \
 	$(LIB_GGZMOD) \
 	$(LIB_GGZ_GTK)
 
+if HAVE_GNOME
+iagno_CFLAGS += $(GNOME_CFLAGS)
+iagno_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+iagno_CFLAGS += $(RSVG_CFLAGS)
+iagno_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+iagno_CFLAGS += $(GHTREAD_CFLAGS)
+iagno_LDADD += $(GTHREAD_LIBS)
+endif
+
 pixmapdir = $(pkgdatadir)/iagno/pixmaps
 pixmap_DATA = \
 	classic.png \

Modified: trunk/tests/libgames-support/Makefile.am
==============================================================================
--- trunk/tests/libgames-support/Makefile.am	(original)
+++ trunk/tests/libgames-support/Makefile.am	Wed Jan 21 17:30:15 2009
@@ -5,10 +5,28 @@
 test_libgames_support_SOURCES = test-libgames-support.c 
 
 test_libgames_support_CPPFLAGS = -I$(top_srcdir)
-test_libgames_support_CFLAGS = $(CHECK_CFLAGS) $(GNOME_GAMES_CFLAGS)
+test_libgames_support_CFLAGS = \
+	$(CHECK_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(AM_CFLAGS)
 
 test_libgames_support_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
+	$(GTK_LIBS) \
 	$(INTLLIBS) \
 	$(CHECK_LIBS)
+
+if HAVE_GNOME
+test_libgames_support_CFLAGS += $(GNOME_CFLAGS)
+test_libgames_support_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+test_libgames_support_CFLAGS += $(RSVG_CFLAGS)
+test_libgames_support_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+test_libgames_support_CFLAGS += $(GHTREAD_CFLAGS)
+test_libgames_support_LDADD += $(GTHREAD_LIBS)
+endif