gnome-games r8201 - in trunk: dependencies/ggz-gtk gnect/src gnibbles gnobots2 gnometris gnomine iagno

[chpe svn gnome org]

Author: chpe
Date: Sun Oct 26 14:45:48 2008
New Revision: 8201
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8201&view=rev

Log:
Fix out-of-srcdir build, and exempt ggz-gtk from deprecation flags.

Modified:
   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

Modified: trunk/dependencies/ggz-gtk/Makefile.am
==============================================================================
--- trunk/dependencies/ggz-gtk/Makefile.am	(original)
+++ trunk/dependencies/ggz-gtk/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -1,7 +1,10 @@
 ggzgtkdatadir=$(datadir)/ggz/$(PACKAGE)
-AM_CPPFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/intl \
+AM_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/intl \
 	$(GGZCORE_INCLUDES) $(LIBGGZ_INCLUDES) \
-	-DGGZGTKDATADIR=\"$(ggzgtkdatadir)\"
+	-DGGZGTKDATADIR=\"$(ggzgtkdatadir)\" \
+	-UG_DISABLE_SINGLE_INCLUDES \
+	-UGTK_DISABLE_SINGLE_INCLUDES \
+	-UGTK_DISABLE_DEPRECATED
 
 ggzgtkdata_DATA =	about_bg.png		\
 			ggz_gtk_admin.svg 	\

Modified: trunk/gnect/src/Makefile.am
==============================================================================
--- trunk/gnect/src/Makefile.am	(original)
+++ trunk/gnect/src/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -61,7 +61,7 @@
 		$(GGZ_FILES)
 
 INCLUDES = -I.. \
-	-I$(top_srcdir)/libgames-support                \
+	-I$(top_srcdir) \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DDATADIR=\""$(datadir)"\"         \
 	-DGNECT_DATA_DIR=\""$(datadir)/"\" \

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -27,7 +27,7 @@
 	$(NULL)
 
 gnibbles_CPPFLAGS = \
-	-I$(top_srcdir)/libgames-support \
+	-I$(top_srcdir) \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DREAL_DATADIR=\""$(datadir)"\" \
 	$(AM_CPPFLAGS)

Modified: trunk/gnobots2/Makefile.am
==============================================================================
--- trunk/gnobots2/Makefile.am	(original)
+++ trunk/gnobots2/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -13,7 +13,7 @@
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DDATADIR=\""$(datadir)"\"		   \
 	-DPIXMAPDIR=\""$(pixmapdir)"\"		\
-	-I$(top_srcdir)/libgames-support   	        \
+	-I$(top_srcdir)   	        \
 	$(GNOME_GAMES_CFLAGS)
 
 bin_PROGRAMS = gnobots2

Modified: trunk/gnometris/Makefile.am
==============================================================================
--- trunk/gnometris/Makefile.am	(original)
+++ trunk/gnometris/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -3,20 +3,9 @@
 Gamesdir=$(datadir)/applications
 pixmapdir=$(datadir)/gnome-games/gnometris/pixmaps
 
-AM_CPPFLAGS=\
-	-I$(top_srcdir)/libgames-support \
-	-DDATADIR=\""$(datadir)"\"		   \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-AM_CXXFLAGS=\
-	$(GNOME_GAMES_CXXFLAGS) $(ESD_CFLAGS)
-
-AM_CFLAGS=\
-	$(GNOME_GAMES_CFLAGS)
-
 bin_PROGRAMS=gnometris
 
-gnometris_SOURCES=\
+gnometris_SOURCES = \
 	main.cpp \
 	blocks.cpp \
 	blocks.h \
@@ -35,7 +24,18 @@
 	tetris.cpp \
 	tetris.h
 
-gnometris_LDADD=\
+gnometris_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-DDATADIR=\""$(datadir)"\" \
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+gnometris_CXXFLAGS = \
+	$(GNOME_GAMES_CXXFLAGS) \
+	$(ESD_CFLAGS) \
+	$(AM_CXXFLAGS)
+
+gnometris_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GNOME_GAMES_LIBS) \
 	$(ESD_LIBS) \

Modified: trunk/gnomine/Makefile.am
==============================================================================
--- trunk/gnomine/Makefile.am	(original)
+++ trunk/gnomine/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -3,7 +3,7 @@
 SUBDIRS = help
 
 INCLUDES = \
-	-I$(top_srcdir)/libgames-support		\
+	-I$(top_srcdir) \
 	$(WARN_CFLAGS)					\
 	$(GNOME_GAMES_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Sun Oct 26 14:45:48 2008
@@ -6,7 +6,7 @@
 Gamesdir = $(datadir)/applications
 
 INCLUDES =						\
-	-I$(top_srcdir)/libgames-support		\
+	-I$(top_srcdir)		\
 	$(WARN_CFLAGS)					\
 	-DDATADIR=\""$(datadir)"\"		   	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\