gnome-games r7628 - in trunk: . gnect/src gnibbles iagno

[andreasr svn gnome org]

Author: andreasr
Date: Tue Apr 15 17:40:03 2008
New Revision: 7628
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7628&view=rev

Log:
 Reorder the -I/path/to in Makefile.am 
        to import GGZ libraries in correct order - Bug #527210. 



Modified:
   trunk/ChangeLog
   trunk/gnect/src/Makefile.am
   trunk/gnibbles/Makefile.am
   trunk/iagno/Makefile.am

Modified: trunk/gnect/src/Makefile.am
==============================================================================
--- trunk/gnect/src/Makefile.am	(original)
+++ trunk/gnect/src/Makefile.am	Tue Apr 15 17:40:03 2008
@@ -65,9 +65,9 @@
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DDATADIR=\""$(datadir)"\"         \
 	-DGNECT_DATA_DIR=\""$(datadir)/"\" \
-	$(GNOME_GAMES_CFLAGS) \
-	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
-	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES)
+	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
+	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
+	$(GNOME_GAMES_CFLAGS)
 
 gnect_LDADD = \
 	../../libgames-support/libgames-support.la         \

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Tue Apr 15 17:40:03 2008
@@ -50,8 +50,8 @@
 	$(NULL)
 
 gnibbles_CPPFLAGS += \
-	$(GGZMOD_INCLUDES) \
 	$(GGZ_GTK_INCLUDES) \
+	$(GGZMOD_INCLUDES) \
 	$(GGZCORE_INCLUDES) \
 	$(LIBGGZ_INCLUDES) \
 	$(GGZCORE_INCLUDES) \
@@ -115,7 +115,7 @@
 	-I$(top_srcdir)/libgames-support \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DREAL_DATADIR=\""$(datadir)"\" \
-	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
+	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
 	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
 	$(AM_CPPFLAGS)
 

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Tue Apr 15 17:40:03 2008
@@ -8,11 +8,11 @@
 INCLUDES =						\
 	-I$(top_srcdir)/libgames-support		\
 	$(WARN_CFLAGS)					\
-	$(GNOME_GAMES_CFLAGS)				\
 	-DDATADIR=\""$(datadir)"\"		   	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\
-	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
+	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
+	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES) \
+	$(GNOME_GAMES_CFLAGS)
 
 bin_PROGRAMS = iagno
 ggzexecmod_PROGRAMS =