gnome-games r8248 - in trunk/gnect: data pixmaps src

[chpe svn gnome org]

Author: chpe
Date: Tue Nov  4 14:25:40 2008
New Revision: 8248
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8248&view=rev

Log:
Remove directory defines from CPPFLAGS to ensure they're not used, and replace remaining uses of the directory defines, if any, with games-runtime lookups. Prettify the Makefile.am in the process, and make libgames-support includes consistent.

Modified:
   trunk/gnect/data/Makefile.am
   trunk/gnect/pixmaps/Makefile.am
   trunk/gnect/src/Makefile.am

Modified: trunk/gnect/data/Makefile.am
==============================================================================
--- trunk/gnect/data/Makefile.am	(original)
+++ trunk/gnect/data/Makefile.am	Tue Nov  4 14:25:40 2008
@@ -1,6 +1,6 @@
 NULL =
 
-velenadir      = $(datadir)/gnome-games/gnect
+velenadir      = $(pkgdatadir)/gnect
 velena_DATA    = white_ob.cn4.gz
 
 Games_in_files = gnect.desktop.in.in

Modified: trunk/gnect/pixmaps/Makefile.am
==============================================================================
--- trunk/gnect/pixmaps/Makefile.am	(original)
+++ trunk/gnect/pixmaps/Makefile.am	Tue Nov  4 14:25:40 2008
@@ -1,4 +1,4 @@
-pixmapdir = $(datadir)/gnome-games/gnect/pixmaps
+pixmapdir = $(pkgdatadir)/gnect/pixmaps
 
 pixmap_DATA = \
     tileset_50x50_sunspot.svg \
@@ -12,4 +12,3 @@
     bg_toplight.png
 
 EXTRA_DIST = $(pixmap_DATA)
-

Modified: trunk/gnect/src/Makefile.am
==============================================================================
--- trunk/gnect/src/Makefile.am	(original)
+++ trunk/gnect/src/Makefile.am	Tue Nov  4 14:25:40 2008
@@ -21,6 +21,16 @@
                  proto.h    \
                  rules.h    
 
+gnectd_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+gnectd_CFLAGS = \
+	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
+	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
+	$(GNOME_GAMES_CFLAGS) \
+	$(AM_CFLAGS)
+
 gnectd_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la         \
 	$(GNOME_GAMES_LIBS)     \
@@ -60,18 +70,19 @@
                 rules.h	   \
 		$(GGZ_FILES)
 
-INCLUDES = -I.. \
+gnect_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DDATADIR=\""$(datadir)"\"         \
-	-DGNECT_DATA_DIR=\""$(datadir)/"\" \
+	$(AM_CPPFLAGS)
+
+gnect_CFLAGS = \
 	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
 	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
-	$(GNOME_GAMES_CFLAGS)
+	$(GNOME_GAMES_CFLAGS) \
+	$(AM_CFLAGS)
 
 gnect_LDADD = \
-	../../libgames-support/libgames-support.la         \
-	$(GNOME_GAMES_LIBS)     \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GNOME_GAMES_LIBS) \
 	$(INTLLIBS) \
 	$(LIB_GGZMOD) \
 	$(LIB_GGZ_GTK)