gnome-games r8241 - trunk/gnomine

[chpe svn gnome org]

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

Modified: trunk/gnomine/Makefile.am
==============================================================================
--- trunk/gnomine/Makefile.am	(original)
+++ trunk/gnomine/Makefile.am	Tue Nov  4 14:25:27 2008
@@ -1,14 +1,5 @@
-Gamesdir = $(datadir)/applications
-
 SUBDIRS = help
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	$(WARN_CFLAGS)					\
-	$(GNOME_GAMES_CFLAGS)				\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\" 
-
 bin_PROGRAMS = gnomine
 
 gnomine_SOURCES =	\
@@ -16,8 +7,17 @@
 	minefield.h	\
 	minefield.c
 
+gnomine_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+gnomine_CFLAGS = \
+	$(WARN_CFLAGS) \
+	$(GNOME_GAMES_CFLAGS) \
+	$(AM_CFLAGS)
+
 gnomine_LDADD = \
-	../libgames-support/libgames-support.la \
+	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GNOME_GAMES_LIBS)
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -33,6 +33,7 @@
 EXTRA_DIST = README AUTHORS \
 	$(schema_in_files) $(pixmap_DATA)
 
+Gamesdir = $(datadir)/applications
 Games_in_files = gnomine.desktop.in.in
 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@