gnome-games r8240 - in trunk/gnibbles: . pix

[chpe svn gnome org]

Author: chpe
Date: Tue Nov  4 14:25:25 2008
New Revision: 8240
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8240&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/gnibbles/Makefile.am
   trunk/gnibbles/pix/Makefile.am

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Tue Nov  4 14:25:25 2008
@@ -28,8 +28,6 @@
 
 gnibbles_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DREAL_DATADIR=\""$(datadir)"\" \
 	$(AM_CPPFLAGS)
 
 gnibbles_CFLAGS = \
@@ -99,7 +97,7 @@
 desktop_in_files = gnibbles.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-schemadir = @GCONF_SCHEMA_FILE_DIR@
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = gnibbles.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
@@ -112,9 +110,7 @@
 	$(NULL)
 
 gnibblesd_CPPFLAGS = \
-	-I$(top_srcdir)/libgames-support \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DREAL_DATADIR=\""$(datadir)"\" \
+	-I$(top_srcdir) \
 	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
 	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
 	$(AM_CPPFLAGS)

Modified: trunk/gnibbles/pix/Makefile.am
==============================================================================
--- trunk/gnibbles/pix/Makefile.am	(original)
+++ trunk/gnibbles/pix/Makefile.am	Tue Nov  4 14:25:25 2008
@@ -1,6 +1,6 @@
-pixmapdir=$(datadir)/gnome-games/gnibbles/pixmaps
+pixmapdir = $(pkgdatadir)/gnibbles/pixmaps
 
-BONUS_PIX=\
+BONUS_PIX = \
 	blank.svg \
 	bonus1.svg \
 	bonus2.svg \
@@ -11,8 +11,7 @@
 	life.svg \
 	questionmark.svg
 
-
-SMALL_PIX=\
+SMALL_PIX = \
 	snake-blue.svg \
 	snake-cyan.svg \
 	snake-green.svg \
@@ -33,6 +32,6 @@
 	wall-tee-right.svg \
 	wall-tee-up.svg
 
-pixmap_DATA= ${BONUS_PIX} ${SMALL_PIX}
+pixmap_DATA = ${BONUS_PIX} ${SMALL_PIX}
 
 EXTRA_DIST = $(pixmap_DATA)