[gnome-games] libgames-support: Remove libgames-support and copy score code into the few games that still use it

From: Robert Ancell <rancell src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-games] libgames-support: Remove libgames-support and copy score code into the few games that still use it
Date: Fri, 28 Sep 2012 00:10:17 +0000 (UTC)
commit 19ab10d7f19a850b3194482a8bfae73dfef4ff37
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Sep 28 12:10:11 2012 +1200

    libgames-support: Remove libgames-support and copy score code into the few games that still use it

 Makefile.am               |    4 ++--
 configure.ac              |    1 -
 glines/src/Makefile.am    |   16 +++++++++++++++-
 glines/src/glines.c       |    5 ++---
 gnect/src/Makefile.am     |    1 -
 gnibbles/src/Makefile.am  |   16 +++++++++++++++-
 gnibbles/src/gnibbles.c   |    5 ++---
 gnibbles/src/main.c       |    3 +--
 gnibbles/src/main.h       |    3 +--
 gnibbles/src/properties.c |    3 +--
 gnobots2/src/Makefile.am  |   16 +++++++++++++++-
 gnobots2/src/game.c       |    5 ++---
 gnobots2/src/gnobots.c    |    5 ++---
 gnobots2/src/gnobots.h    |    3 +++
 gnobots2/src/graphics.c   |    5 ++---
 gnobots2/src/menu.c       |    5 ++---
 gnobots2/src/properties.c |    5 ++---
 gnobots2/src/statusbar.h  |    2 ++
 gnotski/src/Makefile.am   |   16 +++++++++++++++-
 gnotski/src/gnotski.c     |    5 ++---
 gtali/src/Makefile.am     |   16 +++++++++++++++-
 gtali/src/gyahtzee.c      |    5 ++---
 po/POTFILES.in            |    6 +++++-
 23 files changed, 108 insertions(+), 43 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0314376..8cce8ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgames-support $(gamelist) po
+SUBDIRS = $(gamelist) po
 
-DIST_SUBDIRS = po libgames-support $(allgames) $(staginggames)
+DIST_SUBDIRS = po $(allgames) $(staginggames)
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-platform=gnome \
diff --git a/configure.ac b/configure.ac
index 19e98a9..879cd1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,7 +459,6 @@ AC_SUBST([AM_LDFLAGS])
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
-libgames-support/Makefile
 gnect/Makefile
 gnect/src/Makefile
 gnect/data/Makefile
diff --git a/glines/src/Makefile.am b/glines/src/Makefile.am
index c12bac2..67fdd88 100644
--- a/glines/src/Makefile.am
+++ b/glines/src/Makefile.am
@@ -7,11 +7,25 @@ glines_SOURCES =	\
 	games-gridframe.h	\
 	games-preimage.c	\
 	games-preimage.h	\
+	games-score.h			\
+	games-score.c			\
+	games-scores.c			\
+	games-scores.h			\
+	games-scores-dialog.c	\
+	games-scores-dialog.h	\
+	games-scores-backend.c	\
+	games-scores-backend.h \
 	games-stock.c	\
 	games-stock.h	\
 	glines.c	\
 	glines.h
 
+if ENABLE_SETGID
+glines_SOURCES +=		\
+	games-setgid-io.c		\
+	games-setgid-io.h
+endif # ENABLE_SETGID
+
 glines_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
@@ -20,13 +34,13 @@ glines_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/glines\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
+	-DSCORESDIR="\"$(scoredir)\""				\
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(AM_CFLAGS)
 
 glines_LDADD =	\
-	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GMODULE_LIBS) \
 	$(GTK_LIBS)	\
 	$(RSVG_LIBS) \
diff --git a/glines/src/glines.c b/glines/src/glines.c
index 3d15506..7983eb2 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -36,13 +36,12 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "glines.h"
 #include "games-file-list.h"
 #include "games-preimage.h"
 #include "games-gridframe.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 #include "games-stock.h"
 
 #define KEY_BACKGROUND_COLOR  "background-color"
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index 95e8627..0408e67 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -46,7 +46,6 @@ gnect_CFLAGS = \
 	$(AM_CFLAGS)
 
 gnect_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
 	$(RSVG_LIBS) \
 	$(CANBERRA_GTK_LIBS) \
diff --git a/gnibbles/src/Makefile.am b/gnibbles/src/Makefile.am
index b582713..ee6b963 100644
--- a/gnibbles/src/Makefile.am
+++ b/gnibbles/src/Makefile.am
@@ -17,6 +17,14 @@ gnibbles_SOURCES = \
 	games-gridframe.c \
 	games-pause-action.h \
 	games-pause-action.c \
+	games-score.h			\
+	games-score.c			\
+	games-scores.c			\
+	games-scores.h			\
+	games-scores-dialog.c	\
+	games-scores-dialog.h	\
+	games-scores-backend.c	\
+	games-scores-backend.h	\
 	games-stock.h \
 	games-stock.c \
 	gnibbles.h \
@@ -36,6 +44,12 @@ gnibbles_SOURCES = \
 	worm.c \
 	worm.h
 
+if ENABLE_SETGID
+gnibbles_SOURCES +=		\
+	games-setgid-io.c		\
+	games-setgid-io.h
+endif # ENABLE_SETGID
+
 gnibbles_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
@@ -45,6 +59,7 @@ gnibbles_CFLAGS = \
 	-DSOUND_DIRECTORY=\"$(datadir)/gnibbles/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
+	-DSCORESDIR="\"$(scoredir)\""				\
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
@@ -53,7 +68,6 @@ gnibbles_CFLAGS = \
 	$(AM_CFLAGS)
 
 gnibbles_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
 	$(RSVG_LIBS) \
 	$(CANBERRA_GTK_LIBS) \
diff --git a/gnibbles/src/gnibbles.c b/gnibbles/src/gnibbles.c
index 6ec3c22..90cb8b8 100644
--- a/gnibbles/src/gnibbles.c
+++ b/gnibbles/src/gnibbles.c
@@ -30,9 +30,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <clutter/clutter.h>
 
-#include <libgames-support/games-scores-dialog.h>
-#include <libgames-support/games-scores.h>
-
 #include "main.h"
 #include "gnibbles.h"
 #include "boni.h"
@@ -43,6 +40,8 @@
 #include "board.h"
 #include "sound.h"
 #include "worm.h"
+#include "games-scores-dialog.h"
+#include "games-scores.h"
 
 GnibblesWorm *worms[NUMWORMS];
 
diff --git a/gnibbles/src/main.c b/gnibbles/src/main.c
index d746078..430fbe6 100644
--- a/gnibbles/src/main.c
+++ b/gnibbles/src/main.c
@@ -31,8 +31,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-scores.h>
-
 #include "main.h"
 #include "properties.h"
 #include "gnibbles.h"
@@ -44,6 +42,7 @@
 #include "games-gridframe.h"
 #include "games-pause-action.h"
 #include "games-fullscreen-action.h"
+#include "games-scores.h"
 #include "games-stock.h"
 
 #include <clutter-gtk/clutter-gtk.h>
diff --git a/gnibbles/src/main.h b/gnibbles/src/main.h
index 1a1d855..258d860 100644
--- a/gnibbles/src/main.h
+++ b/gnibbles/src/main.h
@@ -21,9 +21,8 @@
 #ifndef _MAIN_H_
 #define _MAIN_H_
 
-#include <libgames-support/games-scores.h>
-
 #include "gnibbles.h"
+#include "games-scores.h"
 
 #define MAIN_PAGE 0
 
diff --git a/gnibbles/src/properties.c b/gnibbles/src/properties.c
index c8bb30a..1130f03 100644
--- a/gnibbles/src/properties.c
+++ b/gnibbles/src/properties.c
@@ -26,11 +26,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-scores.h>
-
 #include "properties.h"
 #include "main.h"
 #include "sound.h"
+#include "games-scores.h"
 
 #define MAX_SPEED 4
 
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index 84149ff..31353c7 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -34,6 +34,14 @@ gnobots2_SOURCES = \
 	games-gridframe.h \
 	games-preimage.c \
 	games-preimage.h \
+	games-score.h			\
+	games-score.c			\
+	games-scores.c			\
+	games-scores.h			\
+	games-scores-dialog.c	\
+	games-scores-dialog.h	\
+	games-scores-backend.c	\
+	games-scores-backend.h	\
 	games-stock.c \
 	games-stock.h \
 	cursor-down.h \
@@ -46,6 +54,12 @@ gnobots2_SOURCES = \
 	cursor-up-left.h \
 	cursor-up-right.h
 
+if ENABLE_SETGID
+gnobots2_SOURCES +=		\
+	games-setgid-io.c		\
+	games-setgid-io.h
+endif # ENABLE_SETGID
+
 gnobots2_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
@@ -55,13 +69,13 @@ gnobots2_CFLAGS = \
 	-DSOUND_DIRECTORY=\"$(datadir)/gnobots2/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
+	-DSCORESDIR="\"$(scoredir)\""				\
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnobots2_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
 	$(RSVG_LIBS) \
 	$(CANBERRA_GTK_LIBS) \
diff --git a/gnobots2/src/game.c b/gnobots2/src/game.c
index 190636a..9f04b06 100644
--- a/gnobots2/src/game.c
+++ b/gnobots2/src/game.c
@@ -27,9 +27,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "gbdefs.h"
 #include "gameconfig.h"
 #include "keyboard.h"
@@ -41,6 +38,8 @@
 #include "statusbar.h"
 #include "graphics.h"
 #include "cursors.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 
 /**********************************************************************/
 /* Exported Variables                                                 */
diff --git a/gnobots2/src/gnobots.c b/gnobots2/src/gnobots.c
index d3c94b3..8f85c76 100644
--- a/gnobots2/src/gnobots.c
+++ b/gnobots2/src/gnobots.c
@@ -29,9 +29,6 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "gbdefs.h"
 #include "statusbar.h"
 #include "gameconfig.h"
@@ -42,6 +39,8 @@
 #include "game.h"
 #include "cursors.h"
 #include "games-gridframe.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 #include "games-stock.h"
 
 /* Minimum sizes. */
diff --git a/gnobots2/src/gnobots.h b/gnobots2/src/gnobots.h
index d9da9a0..0b1e6f2 100644
--- a/gnobots2/src/gnobots.h
+++ b/gnobots2/src/gnobots.h
@@ -1,6 +1,9 @@
 #ifndef GNOBOTS_H
 #define GNOBOTS_H
 
+#include <gtk/gtk.h>
+
+#include "games-scores.h"
 
 /**********************************************************************/
 /* Exported Variables                                                 */
diff --git a/gnobots2/src/graphics.c b/gnobots2/src/graphics.c
index f60b724..bbf5504 100644
--- a/gnobots2/src/graphics.c
+++ b/gnobots2/src/graphics.c
@@ -25,9 +25,6 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
@@ -41,6 +38,8 @@
 #include "gnobots.h"
 #include "properties.h"
 #include "games-preimage.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 
 /**********************************************************************/
 
diff --git a/gnobots2/src/menu.c b/gnobots2/src/menu.c
index 8c35399..87281d9 100644
--- a/gnobots2/src/menu.c
+++ b/gnobots2/src/menu.c
@@ -26,9 +26,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "gbdefs.h"
 #include "menu.h"
 #include "game.h"
@@ -36,6 +33,8 @@
 #include "properties.h"
 #include "gameconfig.h"
 #include "games-fullscreen-action.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 #include "games-stock.h"
 
 GtkAction *scores_action;
diff --git a/gnobots2/src/properties.c b/gnobots2/src/properties.c
index ae5e4f9..c0a126c 100644
--- a/gnobots2/src/properties.c
+++ b/gnobots2/src/properties.c
@@ -27,9 +27,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "properties.h"
 #include "gameconfig.h"
 #include "gnobots.h"
@@ -40,6 +37,8 @@
 #include "menu.h"
 #include "games-file-list.h"
 #include "games-controls.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 
 
 /**********************************************************************/
diff --git a/gnobots2/src/statusbar.h b/gnobots2/src/statusbar.h
index 31f975a..6c8d1ce 100644
--- a/gnobots2/src/statusbar.h
+++ b/gnobots2/src/statusbar.h
@@ -1,6 +1,8 @@
 #ifndef STATUSBAR_H
 #define STATUSBAR_H
 
+#include <gtk/gtk.h>
+
 
 /**********************************************************************/
 /* Exported functions                                                 */
diff --git a/gnotski/src/Makefile.am b/gnotski/src/Makefile.am
index 739bc58..442f0a1 100644
--- a/gnotski/src/Makefile.am
+++ b/gnotski/src/Makefile.am
@@ -8,10 +8,24 @@ gnotski_SOURCES = \
 	games-gridframe.h	\
 	games-preimage.c	\
 	games-preimage.h	\
+	games-score.h			\
+	games-score.c			\
+	games-scores.c			\
+	games-scores.h			\
+	games-scores-dialog.c	\
+	games-scores-dialog.h	\
+	games-scores-backend.c	\
+	games-scores-backend.h	\
 	games-stock.c	\
 	games-stock.h	\
 	pieces.h
 
+if ENABLE_SETGID
+gnotski_SOURCES +=		\
+	games-setgid-io.c		\
+	games-setgid-io.h
+endif # ENABLE_SETGID
+
 gnotski_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
@@ -20,12 +34,12 @@ gnotski_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnotski\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
+	-DSCORESDIR="\"$(scoredir)\""				\
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(AM_CFLAGS)
 
 gnotski_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS)	\
 	$(RSVG_LIBS) \
 	$(INTLLIBS)
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index 2bc8f29..99486f3 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -29,13 +29,12 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "pieces.h"
 #include "games-preimage.h"
 #include "games-gridframe.h"
 #include "games-fullscreen-action.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 #include "games-stock.h"
 
 #define APPNAME "gnotski"
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
index dade419..59249cc 100644
--- a/gtali/src/Makefile.am
+++ b/gtali/src/Makefile.am
@@ -10,9 +10,23 @@ gtali_SOURCES =       \
 	setup.c          \
 	games-frame.c    \
 	games-frame.h    \
+	games-score.h			\
+	games-score.c			\
+	games-scores.c			\
+	games-scores.h			\
+	games-scores-dialog.c	\
+	games-scores-dialog.h	\
+	games-scores-backend.c	\
+	games-scores-backend.h	\
 	games-stock.c    \
 	games-stock.h
 
+if ENABLE_SETGID
+gtali_SOURCES +=		\
+	games-setgid-io.c		\
+	games-setgid-io.h
+endif # ENABLE_SETGID
+
 gtali_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(AM_CPPFLAGS)
@@ -21,12 +35,12 @@ gtali_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gtali\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
+	-DSCORESDIR="\"$(scoredir)\""				\
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(AM_CFLAGS)
 		
 gtali_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS)	\
 	$(RSVG_LIBS) \
 	$(INTLLIBS)
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index e53351a..d06407e 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -45,11 +45,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-scores.h>
-#include <libgames-support/games-scores-dialog.h>
-
 #include "yahtzee.h"
 #include "gyahtzee.h"
+#include "games-scores.h"
+#include "games-scores-dialog.h"
 #include "games-stock.h"
 
 #define DELAY_MS 600
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f81879a..f4e594c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,6 +26,7 @@ glines/data/glines.desktop.in.in
 [type: gettext/glade]glines/data/glines-preferences.ui
 [type: gettext/glade]glines/data/glines.ui
 glines/data/org.gnome.glines.gschema.xml.in
+glines/src/games-scores-dialog.c
 glines/src/games-stock.c
 glines/src/glines.c
 gnect/data/gnect.desktop.in.in
@@ -41,6 +42,7 @@ gnibbles/data/gnibbles.desktop.in.in
 gnibbles/data/org.gnome.gnibbles.gschema.xml.in
 gnibbles/src/board.c
 gnibbles/src/games-controls.c
+gnibbles/src/games-scores-dialog.c
 gnibbles/src/games-stock.c
 gnibbles/src/gnibbles.c
 gnibbles/src/main.c
@@ -50,6 +52,7 @@ gnobots2/data/gnobots2.desktop.in.in
 gnobots2/data/org.gnome.gnobots2.gschema.xml.in
 gnobots2/src/game.c
 gnobots2/src/games-controls.c
+gnobots2/src/games-scores-dialog.c
 gnobots2/src/games-stock.c
 gnobots2/src/gnobots.c
 gnobots2/src/graphics.c
@@ -101,11 +104,13 @@ gnotravex/src/puzzle-view.vala
 gnotravex/src/theme.vala
 gnotski/data/gnotski.desktop.in.in
 gnotski/data/org.gnome.gnotski.gschema.xml.in
+gnotski/src/games-scores-dialog.c
 gnotski/src/games-stock.c
 gnotski/src/gnotski.c
 gtali/data/gtali.desktop.in.in
 gtali/data/org.gnome.gtali.gschema.xml.in
 gtali/src/clist.c
+gtali/src/games-scores-dialog.c
 gtali/src/games-stock.c
 gtali/src/gyahtzee.c
 gtali/src/setup.c
@@ -117,7 +122,6 @@ iagno/src/computer-player.vala
 iagno/src/game.vala
 iagno/src/game-view.vala
 iagno/src/iagno.vala
-libgames-support/games-scores-dialog.c
 lightsoff/data/lightsoff.desktop.in.in
 lightsoff/data/org.gnome.lightsoff.gschema.xml.in
 lightsoff/src/board-view.vala
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]