gnome-games r8245 - in trunk/gtali: . help/da pix

[chpe svn gnome org]

Author: chpe
Date: Tue Nov  4 14:25:34 2008
New Revision: 8245
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8245&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/gtali/Makefile.am
   trunk/gtali/gyahtzee.c
   trunk/gtali/help/da/Makefile.am
   trunk/gtali/pix/Makefile.am
   trunk/gtali/setup.c

Modified: trunk/gtali/Makefile.am
==============================================================================
--- trunk/gtali/Makefile.am	(original)
+++ trunk/gtali/Makefile.am	Tue Nov  4 14:25:34 2008
@@ -1,17 +1,7 @@
-Gamesdir = $(datadir)/applications
-
 SUBDIRS = pix help
 
-INCLUDES =						\
-	$(GNOME_GAMES_CFLAGS)				\
-	-I$(top_srcdir)/libgames-support           \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\"		   \
-	-DGNOMEPIXMAPDIR=\""$(pkgdatadir)/pixmaps"\"
-
 bin_PROGRAMS = gtali
 
-
 gtali_SOURCES =       \
 	gyahtzee.c       \
 	gyahtzee.h       \
@@ -22,6 +12,10 @@
 	setup.c          \
 	$(NULL)
 
+gtali_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
 gtali_CFLAGS = \
 	$(GTK_CFLAGS)	\
 	$(AM_CFLAGS)
@@ -47,13 +41,14 @@
 gtali_LDADD += $(GTHREAD_LIBS)
 endif
 
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
+schemadir   = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = gtali.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 EXTRA_DIST = README AUTHORS $(schema_in_files)
 
+Gamesdir = $(datadir)/applications
 Games_in_files = gtali.desktop.in.in
 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

Modified: trunk/gtali/gyahtzee.c
==============================================================================
--- trunk/gtali/gyahtzee.c	(original)
+++ trunk/gtali/gyahtzee.c	Tue Nov  4 14:25:34 2008
@@ -44,12 +44,12 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <games-help.h>
-#include <games-stock.h>
-#include <games-scores.h>
-#include <games-scores-dialog.h>
-#include <games-conf.h>
-#include <games-runtime.h>
+#include <libgames-support/games-help.h>
+#include <libgames-support/games-stock.h>
+#include <libgames-support/games-scores.h>
+#include <libgames-support/games-scores-dialog.h>
+#include <libgames-support/games-conf.h>
+#include <libgames-support/games-runtime.h>
 
 #include "yahtzee.h"
 #include "gyahtzee.h"

Modified: trunk/gtali/help/da/Makefile.am
==============================================================================
--- trunk/gtali/help/da/Makefile.am	(original)
+++ trunk/gtali/help/da/Makefile.am	Tue Nov  4 14:25:34 2008
@@ -5,4 +5,3 @@
 entities= legal.xml
 include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
- 

Modified: trunk/gtali/pix/Makefile.am
==============================================================================
--- trunk/gtali/pix/Makefile.am	(original)
+++ trunk/gtali/pix/Makefile.am	Tue Nov  4 14:25:34 2008
@@ -1,4 +1,3 @@
-
 Pixmapdir = $(pkgdatadir)/gtali/pixmaps
 Pixmap_DATA = \
 	gnome-dice-1.svg \

Modified: trunk/gtali/setup.c
==============================================================================
--- trunk/gtali/setup.c	(original)
+++ trunk/gtali/setup.c	Tue Nov  4 14:25:34 2008
@@ -33,8 +33,8 @@
 
 #include <gtk/gtk.h>
 
-#include <games-frame.h>
-#include <games-conf.h>
+#include <libgames-support/games-frame.h>
+#include <libgames-support/games-conf.h>
 
 #include "yahtzee.h"
 #include "gyahtzee.h"