gnome-games r8048 - in trunk: . gtali

[thomashpa svn gnome org]

Author: thomashpa
Date: Wed Oct 15 13:27:34 2008
New Revision: 8048
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8048&view=rev

Log:
more libgnome removal and enable gtali to be build with --with-platform=gtk-only

Modified:
   trunk/configure.in
   trunk/gtali/Makefile.am
   trunk/gtali/clist.c
   trunk/gtali/setup.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Oct 15 13:27:34 2008
@@ -142,7 +142,7 @@
     *) ;;
   esac
   case $game in
-    aisleriot|glines|gnotravex|gnotski|mahjongg|same-gnome) ;;
+    aisleriot|glines|gnotravex|gnotski|gtali|mahjongg|same-gnome) ;;
     *) need_gnome=yes
        disallow_gtk_only=yes
        ;;

Modified: trunk/gtali/Makefile.am
==============================================================================
--- trunk/gtali/Makefile.am	(original)
+++ trunk/gtali/Makefile.am	Wed Oct 15 13:27:34 2008
@@ -13,18 +13,39 @@
 
 
 gtali_SOURCES =       \
-        gyahtzee.c       \
-        gyahtzee.h       \
-        clist.c          \
-        yahtzee.h        \
-        yahtzee.c        \
-        computer.c       \
-        setup.c
-
-gtali_LDADD =				\
-	../libgames-support/libgames-support.la \
-	$(GNOME_GAMES_LIBS) \
-	$(INTLLIBS)
+	gyahtzee.c       \
+	gyahtzee.h       \
+	clist.c          \
+	yahtzee.h        \
+	yahtzee.c        \
+	computer.c       \
+	setup.c          \
+	$(NULL)
+
+gtali_CFLAGS = \
+	$(GTK_CFLAGS)	\
+	$(AM_CFLAGS)
+		
+gtali_LDADD = \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GTK_LIBS)	\
+	$(INTLLIBS)	\
+	$(NULL)
+
+if HAVE_GNOME
+gtali_CFLAGS += $(GNOME_CFLAGS)
+gtali_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gtali_CFLAGS += $(RSVG_CFLAGS)
+gtali_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gtali_CFLAGS += $(GHTREAD_CFLAGS)
+gtali_LDADD += $(GTHREAD_LIBS)
+endif
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gtali.schemas.in

Modified: trunk/gtali/clist.c
==============================================================================
--- trunk/gtali/clist.c	(original)
+++ trunk/gtali/clist.c	Wed Oct 15 13:27:34 2008
@@ -27,8 +27,9 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <config.h>
+
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <gnome.h>
 
 #include <stdio.h>
 

Modified: trunk/gtali/setup.c
==============================================================================
--- trunk/gtali/setup.c	(original)
+++ trunk/gtali/setup.c	Wed Oct 15 13:27:34 2008
@@ -30,7 +30,8 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <config.h>
-#include <gnome.h>
+
+#include <gtk/gtk.h>
 
 #include <games-frame.h>
 #include <games-conf.h>