gnome-games r8308 - in trunk: gnect/src gnibbles iagno

[thomashpa svn gnome org]

Author: thomashpa
Date: Thu Nov 13 13:30:35 2008
New Revision: 8308
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8308&view=rev

Log:
Clean up linking in networked game servers. Patch by Roger Light. Fixes bug #560088

Modified:
   trunk/gnect/src/Makefile.am
   trunk/gnect/src/server.c
   trunk/gnibbles/Makefile.am
   trunk/gnibbles/server.c
   trunk/iagno/Makefile.am
   trunk/iagno/server.c

Modified: trunk/gnect/src/Makefile.am
==============================================================================
--- trunk/gnect/src/Makefile.am	(original)
+++ trunk/gnect/src/Makefile.am	Thu Nov 13 13:30:35 2008
@@ -3,37 +3,19 @@
 
 if GGZ_SERVER
 ggzexecmod_PROGRAMS += gnectd
-gnectd_SOURCES = server.h   \
-		 server.c   \
-		 main.h	    \
-                 adjmtrx.c  \
-                 bintree.c  \
-                 con4vals.h \
-                 connect4.h \
-                 connect4.c \
-                 evaluate.c \
-                 heurist.h  \
-                 heurist.c  \
-                 ia_main.c  \
-                 pbsolver.c \
-                 playgame.c \
-                 pnsearch.h \
-                 proto.h    \
-                 rules.h    
+gnectd_SOURCES = \
+	server.h \
+	server.c   
 
 gnectd_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
 
 gnectd_CFLAGS = \
-	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
-	$(GNOME_GAMES_CFLAGS) \
+	$(GGZDMOD_INCLUDES) \
 	$(AM_CFLAGS)
 
 gnectd_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la         \
-	$(GNOME_GAMES_LIBS)     \
 	$(INTLLIBS) 		\
 	$(LIB_GGZDMOD)
 endif

Modified: trunk/gnect/src/server.c
==============================================================================
--- trunk/gnect/src/server.c	(original)
+++ trunk/gnect/src/server.c	Thu Nov 13 13:30:35 2008
@@ -24,12 +24,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <ggzdmod.h>
 
-#include "connect4.h"
-#include "main.h"
 #include "server.h"
 
 

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Thu Nov 13 13:30:35 2008
@@ -51,9 +51,7 @@
 	$(GGZ_GTK_INCLUDES) \
 	$(GGZMOD_INCLUDES) \
 	$(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES) \
-	$(GGZCORE_INCLUDES) \
-	$(GGZDMOD_INCLUDES)
+	$(LIBGGZ_INCLUDES)
 
 gnibbles_LDADD += \
 	$(LIB_GGZMOD) \
@@ -111,18 +109,15 @@
 
 gnibblesd_CPPFLAGS = \
 	-I$(top_srcdir) \
-	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES)
+	$(GGZDMOD_INCLUDES)
 	$(AM_CPPFLAGS)
 
 gnibblesd_CFLAGS = \
-	$(GNOME_GAMES_CFLAGS)			\
 	$(AM_CFLAGS)
 
 gnibblesd_LDFLAGS = $(AM_LDFLAGS)
 
 gnibblesd_LDADD = \
-	$(GNOME_GAMES_LIBS)	\
 	$(INTLLIBS)			\
 	$(LIB_GGZDMOD)
 

Modified: trunk/gnibbles/server.c
==============================================================================
--- trunk/gnibbles/server.c	(original)
+++ trunk/gnibbles/server.c	Thu Nov 13 13:30:35 2008
@@ -26,8 +26,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <gtk/gtk.h>
-
 #include <ggzdmod.h>
 
 #include "server.h"

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Thu Nov 13 13:30:35 2008
@@ -16,13 +16,10 @@
 	$(AM_CPPFLAGS)
 
 iagnod_CFLAGS = \
-	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
-	$(GNOME_GAMES_CFLAGS) \
+	$(GGZDMOD_INCLUDES) \
 	$(AM_CFLAGS)
 
 iagnod_LDADD = \
-	$(GNOME_GAMES_LIBS)     \
 	$(INTLLIBS) 		\
 	$(LIB_GGZDMOD)
 endif

Modified: trunk/iagno/server.c
==============================================================================
--- trunk/iagno/server.c	(original)
+++ trunk/iagno/server.c	Thu Nov 13 13:30:35 2008
@@ -32,7 +32,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <gtk/gtk.h>
 #include <ggzdmod.h>