[gnome-games/telepathy] Remove GGZ

From: Thomas Hindoe Paaboel Andersen <thomashpa src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gnome-games/telepathy] Remove GGZ
Date: Sun, 27 Sep 2009 18:01:42 +0000 (UTC)
commit 01beb00cbfab30516d01e5e17adeca97af60a912
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date:   Sun Sep 27 20:00:37 2009 +0200

    Remove GGZ

 configure.in                                |   59 -
 dependencies/Makefile.am                    |    4 -
 dependencies/ggz-gtk/Makefile.am            |   86 -
 dependencies/ggz-gtk/about.c                |  313 --
 dependencies/ggz-gtk/about.h                |   26 -
 dependencies/ggz-gtk/about_bg.png           |  Bin 90621 -> 0 bytes
 dependencies/ggz-gtk/chat.c                 | 1098 ------
 dependencies/ggz-gtk/chat.h                 |   68 -
 dependencies/ggz-gtk/client.c               | 1441 --------
 dependencies/ggz-gtk/client.h               |   54 -
 dependencies/ggz-gtk/first.c                |  215 --
 dependencies/ggz-gtk/first.h                |   28 -
 dependencies/ggz-gtk/game.c                 |  383 --
 dependencies/ggz-gtk/game.h                 |   46 -
 dependencies/ggz-gtk/ggz-embed.h            |   38 -
 dependencies/ggz-gtk/ggz-gtk.h              |   40 -
 dependencies/ggz-gtk/ggz_gtk_admin.svg      |  278 --
 dependencies/ggz-gtk/ggz_gtk_bot.svg        |  278 --
 dependencies/ggz-gtk/ggz_gtk_guest.svg      |   94 -
 dependencies/ggz-gtk/ggz_gtk_lag0.svg       |   61 -
 dependencies/ggz-gtk/ggz_gtk_lag1.svg       |   69 -
 dependencies/ggz-gtk/ggz_gtk_lag2.svg       |   76 -
 dependencies/ggz-gtk/ggz_gtk_lag3.svg       |   83 -
 dependencies/ggz-gtk/ggz_gtk_lag4.svg       |   90 -
 dependencies/ggz-gtk/ggz_gtk_lag5.svg       |   97 -
 dependencies/ggz-gtk/ggz_gtk_registered.svg |  278 --
 dependencies/ggz-gtk/ggzclient.c            | 1218 -------
 dependencies/ggz-gtk/ggzclient.h            |   38 -
 dependencies/ggz-gtk/glade/about.glade      |  117 -
 dependencies/ggz-gtk/glade/first.glade      |   99 -
 dependencies/ggz-gtk/glade/info.glade       |  324 --
 dependencies/ggz-gtk/glade/launch.glade     | 1131 ------
 dependencies/ggz-gtk/glade/license.glade    |  231 --
 dependencies/ggz-gtk/glade/login.glade      |  572 ---
 dependencies/ggz-gtk/glade/main.glade       | 1161 ------
 dependencies/ggz-gtk/glade/motd.glade       |  132 -
 dependencies/ggz-gtk/glade/props.glade      | 1843 ----------
 dependencies/ggz-gtk/glade/types.glade      |  226 --
 dependencies/ggz-gtk/launch.c               |  730 ----
 dependencies/ggz-gtk/launch.h               |   29 -
 dependencies/ggz-gtk/login.c                |  827 -----
 dependencies/ggz-gtk/login.h                |   39 -
 dependencies/ggz-gtk/motd.c                 |  204 --
 dependencies/ggz-gtk/motd.h                 |   25 -
 dependencies/ggz-gtk/msgbox.c               |  226 --
 dependencies/ggz-gtk/msgbox.h               |   64 -
 dependencies/ggz-gtk/pick_module.c          |  191 -
 dependencies/ggz-gtk/pick_module.h          |   28 -
 dependencies/ggz-gtk/playerinfo.c           |  431 ---
 dependencies/ggz-gtk/playerinfo.h           |   29 -
 dependencies/ggz-gtk/playerlist.c           |  382 --
 dependencies/ggz-gtk/playerlist.h           |   33 -
 dependencies/ggz-gtk/props.c                | 1614 ---------
 dependencies/ggz-gtk/props.h                |   28 -
 dependencies/ggz-gtk/roominfo.c             |  177 -
 dependencies/ggz-gtk/roominfo.h             |   29 -
 dependencies/ggz-gtk/roomlist.c             |  442 ---
 dependencies/ggz-gtk/roomlist.h             |   36 -
 dependencies/ggz-gtk/server.c               |  263 --
 dependencies/ggz-gtk/server.h               |  110 -
 dependencies/ggz-gtk/support.c              |  132 -
 dependencies/ggz-gtk/support.h              |  119 -
 dependencies/ggz-gtk/tablelist.c            |  221 --
 dependencies/ggz-gtk/tablelist.h            |   39 -
 dependencies/ggz-gtk/types.c                |  292 --
 dependencies/ggz-gtk/types.h                |   26 -
 dependencies/ggz-gtk/xtext-ggz.h            |   67 -
 dependencies/ggz-gtk/xtext.c                | 5113 ---------------------------
 dependencies/ggz-gtk/xtext.h                |  263 --
 gnect/data/Makefile.am                      |   37 +-
 gnect/data/connectx.protocol                |   95 -
 gnect/data/gnect-client.dsc.in              |    9 -
 gnect/data/gnect-server.dsc.in              |   19 -
 gnect/data/gnect.room.in                    |   12 -
 gnect/src/Makefile.am                       |   37 +-
 gnect/src/connectx_client.c                 |  372 --
 gnect/src/connectx_client.h                 |   84 -
 gnect/src/ggz-network.c                     |  297 --
 gnect/src/ggz-network.h                     |    9 -
 gnect/src/main.c                            |   21 +-
 gnect/src/server.c                          |  715 ----
 gnect/src/server.h                          |   61 -
 gnibbles/Makefile.am                        |   68 +-
 gnibbles/boni.c                             |    1 -
 gnibbles/ggz-network.c                      |  420 ---
 gnibbles/ggz-network.h                      |   58 -
 gnibbles/gnibbles-client.dsc.in             |   10 -
 gnibbles/gnibbles-server.dsc.in             |   20 -
 gnibbles/gnibbles.room.in                   |   12 -
 gnibbles/server.c                           |  388 --
 gnibbles/server.h                           |   88 -
 iagno/Makefile.am                           |   64 +-
 iagno/ggz-network.c                         |  330 --
 iagno/ggz-network.h                         |  200 --
 iagno/iagno-client.dsc.in                   |   10 -
 iagno/iagno-server.dsc.in                   |   19 -
 iagno/iagno.room.in                         |   12 -
 iagno/server.c                              |  639 ----
 iagno/server.h                              |  233 --
 libgames-support/GGZ-1.0.gir                |   10 -
 libgames-support/Makefile.am                |   28 -
 libgames-support/games-dlg-chat.c           |  243 --
 libgames-support/games-dlg-chat.h           |   43 -
 libgames-support/games-dlg-players.c        |  548 ---
 libgames-support/games-dlg-players.h        |   60 -
 m4/ggz.m4                                   | 1101 ------
 106 files changed, 10 insertions(+), 30967 deletions(-)
---
diff --git a/configure.in b/configure.in
index 01f15b7..86bec68 100644
--- a/configure.in
+++ b/configure.in
@@ -109,7 +109,6 @@ AC_SUBST([gamelist])
 # Feature matrix
 
 need_cxx=no
-need_ggz=no
 need_rsvg=no
 need_guile=no
 need_python=no
@@ -130,10 +129,6 @@ for game in $gamelist; do
     *) ;;
   esac
   case $game in
-    gnibbles|iagno|gnect|glchess) need_ggz=yes ;;
-    *) ;;
-  esac
-  case $game in
     aisleriot) need_guile=yes ;;
     *) ;;
   esac
@@ -232,11 +227,6 @@ if test "$need_cxx" = "yes"; then
   AC_LANG_POP([C++])
 fi
 
-# Run these before AC_PROG_LIBTOOL, else it bugs
-AC_GGZ_INIT
-AC_GGZ_PLATFORM_BASE
-AC_GGZ_PLATFORM
-
 AM_PROG_CC_C_O
 
 AC_PROG_LIBTOOL
@@ -821,50 +811,6 @@ if test "$enable_binreloc" = "yes"; then
   AC_DEFINE([ENABLE_BINRELOC],[1],[Define for binary relocation support])
 fi
 
-# *************
-# Check for GGZ
-# *************
-
-have_ggz=no
-if test "$need_ggz" = "yes"; then
-
-  AC_GGZ_INIT(defaults, export)
-  AC_GGZ_LIBGGZ([],[])
-  AC_GGZ_VERSION(0, 0, 14)
-  AC_GGZ_GGZCORE
-  AC_GGZ_GGZMOD
-  AC_GGZ_CONFIG("true", ignore)
-  #AC_GGZ_INTL
-
-  AC_GGZ_CHECK_SERVER
-
-  AC_GGZ_PTHREADS
-  AC_GGZ_GCRYPT
-  AC_GGZ_TLS
-
-  GGZ_GTK_INCLUDES="-I\$(top_srcdir)/dependencies/ggz-gtk"
-  AC_SUBST(GGZ_GTK_INCLUDES)
-  GGZ_GTK_LDFLAGS=""
-  AC_SUBST(GGZ_GTK_LDFLAGS)
-  LIB_GGZ_GTK="\$(top_builddir)/dependencies/ggz-gtk/libggz-gtk.la"
-  AC_SUBST(LIB_GGZ_GTK)
-
-  AC_DEFINE(GGZ_GTK, 1, [Support for embedded GGZ through libggz-gtk])
-  AC_DEFINE(GGZ_CLIENT, 1, [Client support for GGZ])
-
-  have_ggz=yes
-fi # need_ggz = yes
-
-AC_GGZ_CHECK_SERVER_DEFINES
-AM_CONDITIONAL([GGZ_GTK],[test "$have_ggz" = "yes"])
-AM_CONDITIONAL([INSTALL_GGZ_GTK],[false])
-AM_CONDITIONAL([GGZ_CLIENT], [test "$have_ggz" = "yes"])
-AM_CONDITIONAL([WITH_INCLUDED_GGZ],[test "$have_ggz" = "yes"])
-
-m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
-GNOME_GAMES_GGZ_DSC_RULE='%.dsc:   %.dsc.in   ; $(AM_V_GEN) $(SED) -e "s|[ ]VERSION[@]|$(VERSION)|g" -e "s|[ ]libexecdir[@]|$(libexecdir)|g" -e "s|[ ]bindir[@]|$(bindir)|g" -e "s|[ ]ggzexecmoddir[@]|$(ggzexecmoddir)|g"< $< > $[ ]'
-AC_SUBST([GNOME_GAMES_GGZ_DSC_RULE])
-
 # ********
 
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
@@ -881,9 +827,6 @@ AM_GLIB_GNU_GETTEXT
 
 IT_PROG_INTLTOOL([0.35.0])
 
-GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE='%.room:   %.room.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST([GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE])
-
 # ********************
 # Game specific checks
 # ********************
@@ -1158,7 +1101,6 @@ AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
 dependencies/Makefile
-dependencies/ggz-gtk/Makefile
 dependencies/gnuchess/Makefile
 icons/Makefile
 sounds/Makefile
@@ -1215,7 +1157,6 @@ glchess/src/lib/Makefile
 glchess/src/lib/defaults.py
 glchess/src/lib/chess/Makefile
 glchess/src/lib/chess/fics/Makefile
-glchess/src/lib/ggz/Makefile
 glchess/src/lib/gtkui/Makefile
 glchess/src/lib/scene/Makefile
 glchess/src/lib/scene/cairo/Makefile
diff --git a/dependencies/Makefile.am b/dependencies/Makefile.am
index 82c9bfe..28deb64 100644
--- a/dependencies/Makefile.am
+++ b/dependencies/Makefile.am
@@ -3,7 +3,3 @@ SUBDIRS =
 if WITH_INCLUDED_GNUCHESS
 SUBDIRS += gnuchess
 endif
-
-if WITH_INCLUDED_GGZ
-SUBDIRS += ggz-gtk
-endif
diff --git a/gnect/data/Makefile.am b/gnect/data/Makefile.am
index 4658513..6002a3b 100644
--- a/gnect/data/Makefile.am
+++ b/gnect/data/Makefile.am
@@ -15,50 +15,19 @@ endif
 
 man_MANS     = gnect.6
 
-if GGZ_SERVER
-ggzroom_in_files = gnect.room.in
-ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${ggzdconfdir}/rooms/
-
-ggzserver_dscdir = ${ggzdconfdir}/games/
-ggzserver_dsc_in_files = gnect-server.dsc.in
-ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
-endif # GGZ_SERVER
-
-if GGZ_CLIENT
-ggzclient_dsc_in_files = gnect-client.dsc.in
-endif # GGZ_CLIENT
-
-EXTRA_DIST = gnect-client.dsc.in \
-	     gnect-server.dsc.in \
-             gnect.room.in \
-	     $(velena_DATA) \
+EXTRA_DIST = $(velena_DATA) \
              $(schema_in_files) \
              $(man_MANS)
 
 
-CLEANFILES = \
-	$(ggzroom_DATA) \
-	$(ggzserver_dsc_in_files:.dsc.in=.dsc) \
-	$(ggzclient_dsc_in_files:.dsc.in=.dsc) \
-	$(NULL)
+CLEANFILES = $(NULL)
 
 DISTCLEANFILES = $(schema_DATA) $(Games_DATA)
 
-install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
+install-data-local: 
 if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnect/data/$(schema_DATA)
 endif
-if GGZ_CLIENT
-	$(GGZ_CONFIG) -D --install --modfile=gnect-client.dsc --force
-endif
-
-uninstall-local:
-if GGZ_CLIENT
-	-$(GGZ_CONFIG) -D --remove --modfile=gnect-client.dsc
-endif
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
- GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
- GNOME_GAMES_GGZ_DSC_RULE@
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index 9609fdb..adf7d32 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -1,32 +1,4 @@
 bin_PROGRAMS = gnect
-ggzexecmod_PROGRAMS =
-
-if GGZ_SERVER
-ggzexecmod_PROGRAMS += gnectd
-gnectd_SOURCES = \
-	server.h \
-	server.c   
-
-gnectd_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-gnectd_CFLAGS = \
-	$(GGZDMOD_INCLUDES) \
-	$(AM_CFLAGS)
-
-gnectd_LDADD = \
-	$(INTLLIBS) 		\
-	$(LIB_GGZDMOD)
-endif
-
-if GGZ_CLIENT
-GGZ_FILES =	connectx_client.h \
-		connectx_client.c \
-		ggz-network.h \
-		ggz-network.c \
-		$(NULL)
-endif
 
 gnect_SOURCES = main.h     \
                 main.c     \
@@ -49,25 +21,20 @@ gnect_SOURCES = main.h     \
                 playgame.c \
                 pnsearch.h \
                 proto.h    \
-                rules.h	   \
-		$(GGZ_FILES)
+                rules.h
 
 gnect_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
 
 gnect_CFLAGS = \
-	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
 	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnect_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
-	$(INTLLIBS) \
-	$(LIB_GGZMOD) \
-	$(LIB_GGZ_GTK)
+	$(INTLLIBS)
 
 if HAVE_GNOME
 gnect_CFLAGS += $(GNOME_CFLAGS)
diff --git a/gnect/src/main.c b/gnect/src/main.c
index ceaf357..1e623f8 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -41,15 +41,6 @@
 #include "prefs.h"
 #include "gfx.h"
 
-#ifdef GGZ_CLIENT
-#include <libgames-support/games-dlg-chat.h>
-#include <libgames-support/games-dlg-players.h>
-#include "connectx_client.h"
-#include "ggz-network.h"
-#include <ggz-embed.h>
-#endif
-
-
 #define SPEED_MOVE     25
 #define SPEED_DROP     20
 #define SPEED_BLINK    150
@@ -144,8 +135,8 @@ static gint
 get_n_human_players (void)
 {
   if (ggz_network_mode)
-    return 2;			/* FIXME */
-
+    return 2;
+  
   if (p.level[PLAYER1] != LEVEL_HUMAN && p.level[PLAYER2] != LEVEL_HUMAN) {
     return 0;
   }
@@ -160,9 +151,6 @@ get_n_human_players (void)
 static gboolean
 is_player_human (void)
 {
-  if (ggz_network_mode)
-    return TRUE;		/* FIXME */
-
   if (player == PLAYER1) {
     return p.level[PLAYER1] == LEVEL_HUMAN;
   }
@@ -571,11 +559,6 @@ prompt_player (void)
     return;
   }
 
-/*	if (ggz_network_mode) {
-		network_update_status ();
-		return;
-	}*/
-
   switch (players) {
   case 1:
     if (human) {
diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
index 22a04e1..42e9973 100644
--- a/gnibbles/Makefile.am
+++ b/gnibbles/Makefile.am
@@ -7,7 +7,6 @@ endif
 NULL =
 
 bin_PROGRAMS = gnibbles
-ggzexecmod_PROGRAMS =
 
 gnibbles_SOURCES = \
 	bonus.h \
@@ -60,23 +59,6 @@ gnibbles_CFLAGS += $(GHTREAD_CFLAGS)
 gnibbles_LDADD += $(GTHREAD_LIBS)
 endif
 
-if GGZ_CLIENT
-gnibbles_SOURCES += \
-	ggz-network.h \
-	ggz-network.c \
-	$(NULL)
-
-gnibbles_CPPFLAGS += \
-	$(GGZ_GTK_INCLUDES) \
-	$(GGZMOD_INCLUDES) \
-	$(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES)
-
-gnibbles_LDADD += \
-	$(LIB_GGZMOD) \
-	$(LIB_GGZ_GTK)
-endif
-
 pixmapdir = $(datadir)/gnome-games/gnibbles/pixmaps
 pixmap_DATA = gnibbles-logo.svg
 
@@ -122,41 +104,6 @@ endif
 
 man_MANS = gnibbles.6
 
-if GGZ_SERVER
-ggzexecmod_PROGRAMS += gnibblesd
-
-gnibblesd_SOURCES = \
-	server.h \
-	server.c \
-	$(NULL)
-
-gnibblesd_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(GGZDMOD_INCLUDES)
-	$(AM_CPPFLAGS)
-
-gnibblesd_CFLAGS = \
-	$(AM_CFLAGS)
-
-gnibblesd_LDFLAGS = $(AM_LDFLAGS)
-
-gnibblesd_LDADD = \
-	$(INTLLIBS)			\
-	$(LIB_GGZDMOD)
-
-ggzroom_in_files = gnibbles.room.in
-ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${ggzdconfdir}/rooms/
-
-ggzserver_dscdir = ${ggzdconfdir}/games/
-ggzserver_dsc_in_files = gnibbles-server.dsc.in
-ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
-endif # GGZ_SERVER
-
-if GGZ_CLIENT
-ggzclient_dsc_in_files = gnibbles-client.dsc.in
-endif # GGZ_CLIENT
-
 EXTRA_DIST = \
 	$(pixmap_DATA) 	\
 	$(config_DATA) \
@@ -167,22 +114,16 @@ EXTRA_DIST = \
 	gnibbles.room.in
 
 CLEANFILES = \
-	$(ggzroom_DATA) \
-	$(ggzserver_dsc_in_files:.dsc.in=.dsc) \
-	$(ggzclient_dsc_in_files:.dsc.in=.dsc) \
 	$(NULL)
 
 DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
 
 SCOREFILES = 4.0 3.0 2.0 1.0 4.1 3.1 2.1 1.1
 
-install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
+install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnibbles/$(schema_DATA)
 endif
-if GGZ_CLIENT
-	$(GGZ_CONFIG) -D --install --modfile=gnibbles-client.dsc --force
-endif
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-for i in ${SCOREFILES} ; do \
 	   touch $(DESTDIR)$(scoredir)/gnibbles.$$i.scores; \
@@ -195,12 +136,5 @@ install-exec-hook:
 	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnibbles && chmod 2555 $(DESTDIR)$(bindir)/gnibbles ;\
 	fi
 
-uninstall-local:
-if GGZ_CLIENT
-	-$(GGZ_CONFIG) -D --remove --modfile=gnibbles-client.dsc
-endif
-
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
- GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
- GNOME_GAMES_GGZ_DSC_RULE@
diff --git a/gnibbles/boni.c b/gnibbles/boni.c
index 88dd8e0..7586e43 100644
--- a/gnibbles/boni.c
+++ b/gnibbles/boni.c
@@ -29,7 +29,6 @@
 #include "main.h"
 #include "bonus.h"
 #include "boni.h"
-#include "ggz-network.h"
 
 extern gchar board[BOARDWIDTH][BOARDHEIGHT];
 
diff --git a/iagno/Makefile.am b/iagno/Makefile.am
index 27efa4a..016d57d 100644
--- a/iagno/Makefile.am
+++ b/iagno/Makefile.am
@@ -7,26 +7,6 @@ endif
 NULL =
 
 bin_PROGRAMS = iagno
-ggzexecmod_PROGRAMS =
-
-if GGZ_SERVER
-ggzexecmod_PROGRAMS += iagnod
-
-iagnod_SOURCES = server.h   \
-		 server.c   
-
-iagnod_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-iagnod_CFLAGS = \
-	$(GGZDMOD_INCLUDES) \
-	$(AM_CFLAGS)
-
-iagnod_LDADD = \
-	$(INTLLIBS) 		\
-	$(LIB_GGZDMOD)
-endif
 
 iagno_SOURCES = \
 	gnothello.c \
@@ -37,29 +17,18 @@ iagno_SOURCES = \
 	properties.h \
 	$(NULL)
 
-if GGZ_CLIENT
-iagno_SOURCES += \
-	ggz-network.h \
-	ggz-network.c \
-	$(NULL)
-endif
-
 iagno_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
 
 iagno_CFLAGS = \
-	$(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES) \
-	$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \
 	$(GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 iagno_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
-	$(INTLLIBS) \
-	$(LIB_GGZMOD) \
-	$(LIB_GGZ_GTK)
+	$(INTLLIBS)
 
 if HAVE_GNOME
 iagno_CFLAGS += $(GNOME_CFLAGS)
@@ -93,51 +62,22 @@ endif
 
 man_MANS = iagno.6
 
-if GGZ_SERVER
-ggzroom_in_files = iagno.room.in
-ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${ggzdconfdir}/rooms/
-
-ggzserver_dscdir = ${ggzdconfdir}/games/
-ggzserver_dsc_in_files = iagno-server.dsc.in
-ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
-endif # GGZ_SERVER
-
-if GGZ_CLIENT
-ggzclient_dsc_in_files = iagno-client.dsc.in
-endif # GGZ_CLIENT
-
 EXTRA_DIST = \
 	AUTHORS \
-	iagno-client.dsc.in \
-	iagno-server.dsc.in \
-        iagno.room.in \
 	$(pixmap_DATA)	\
 	$(schema_in_files) \
 	$(man_MANS)
 
 CLEANFILES = \
-	$(ggzroom_DATA) \
-	$(ggzserver_dsc_in_files:.dsc.in=.dsc) \
-	$(ggzclient_dsc_in_files:.dsc.in=.dsc) \
 	$(NULL)
 
 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
 
-install-data-local: $(ggzclient_dsc_in_files:.dsc.in=.dsc)
+install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/iagno/$(schema_DATA)
 endif
-if GGZ_CLIENT
-	$(GGZ_CONFIG) -D --install --modfile=iagno-client.dsc --force
-endif
-uninstall-local:
-if GGZ_CLIENT
-	-$(GGZ_CONFIG) -D --remove --modfile=iagno-client.dsc
-endif
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 @INTLTOOL_SOUNDLIST_RULE@
- GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE@
- GNOME_GAMES_GGZ_DSC_RULE@
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 18b5a14..af5d7b3 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -5,7 +5,6 @@ commondatadir = $(datadir)/gnome-games-common
 EXTRA_DIST = \
 	$(schema_in_files)	\
 	games-marshal.list	\
-	GGZ-1.0.gir		\
 	$(NULL)
 
 noinst_LTLIBRARIES = libgames-support.la
@@ -89,17 +88,6 @@ endif # ENABLE_SETGID
 
 endif # LIBGAMES_SUPPORT_FULL
 
-if HAVE_GNOME
-if GGZ_CLIENT
-libgames_support_la_SOURCES +=		\
-	games-dlg-chat.c		\
-	games-dlg-chat.h		\
-	games-dlg-players.c		\
-	games-dlg-players.h		\
-	$(NULL)	
-endif
-endif
-
 libgames_support_la_CPPFLAGS = \
 	-DPKGDATADIR="\"$(pkgdatadir)\""			\
 	-DDATADIR="\"$(datadir)\""				\
@@ -142,19 +130,6 @@ endif # WITH_SMCLIENT
 if HAVE_GNOME
 libgames_support_la_CFLAGS += $(GNOME_CFLAGS)
 libgames_support_la_LIBADD += $(GNOME_LIBS)
-
-if GGZ_CLIENT
-libgames_support_la_CFLAGS += 	\
-	$(GGZMOD_INCLUDES) 	\
-	$(GGZ_GTK_INCLUDES) 	\
-	$(GGZCORE_INCLUDES)	\
-	$(LIBGGZ_INCLUDES)
-libgames_support_la_LIBADD += 	\
-	$(GGZMOD_LIBS) 	\
-	$(GGZ_GTK_LIBS) 	\
-	$(GGZCORE_LIBS)	\
-	$(LIBGGZ_LIBS) -lggzmod
-endif
 endif
 
 if HAVE_RSVG
@@ -360,8 +335,6 @@ libgames_support_gi_la_CPPFLAGS = $(libgames_support_la_CPPFLAGS) -DLIBGAMES_SUP
 libgames_support_gi_la_CFLAGS = $(libgames_support_la_CFLAGS)
 libgames_support_gi_la_LIBADD = $(libgames_support_la_LIBADD)
 
-BUILT_GIRSOURCES = GnomeGamesSupport-1.0.gir GGZ-1.0.gir
-
 GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(libgames_support_gi_la_SOURCES)
 	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v \
 	--namespace GnomeGamesSupport --nsversion=1.0 \
@@ -370,7 +343,6 @@ GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(lib
 	--include=Clutter-1.0 \
 	--include=Cogl-1.0 \
 	--include=Gtk-2.0 \
-	--include=GGZ-1.0 \
 	--library=games-support-gi \
 	--libtool="$(LIBTOOL)" \
 	--output $@ \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]