GNOME.org
 

[gnome-games] gnobots2: Relayout into src data directories

commit 3198e6c9206217132c0011c6d6f2f5c491cba83c
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 9 13:57:11 2011 +1100

    gnobots2: Relayout into src data directories

 configure.in              |    4 +-
 gnobots2/Makefile.am      |  135 +--------------------------------------------
 gnobots2/data/Makefile.am |   95 +-------------------------------
 gnobots2/src/Makefile.am  |   85 +---------------------------
 gnobots2/src/menu.c       |    3 +
 5 files changed, 11 insertions(+), 311 deletions(-)
---
diff --git a/configure.in b/configure.in
index f6f0f9b..a5dc6bc 100644
--- a/configure.in
+++ b/configure.in
@@ -883,7 +883,9 @@ quadrapassel/data/Makefile
 quadrapassel/help/Makefile
 quadrapassel/src/Makefile
 gnobots2/Makefile
+gnobots2/data/Makefile
 gnobots2/help/Makefile
+gnobots2/src/Makefile
 gnibbles/Makefile
 gnibbles/data/Makefile
 gnibbles/data/levels/Makefile
@@ -914,7 +916,7 @@ swell-foop/data/themes/shapesandcolors/Makefile
 swell-foop/swell-foop.desktop.in
 swell-foop/src/Makefile
 quadrapassel/data/quadrapassel.desktop.in
-gnobots2/gnobots2.desktop.in
+gnobots2/data/gnobots2.desktop.in
 gnibbles/data/gnibbles.desktop.in
 gnotski/data/gnotski.desktop.in
 glchess/glchess.desktop.in
diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
index 2cb0545..2effef4 100644
--- a/gnobots2/Makefile.am
+++ b/gnobots2/Makefile.am
@@ -1,136 +1,10 @@
-SUBDIRS =
+SUBDIRS = data src
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-NULL =
-
-schema_in_files = gnobots2.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
-
- INTLTOOL_SCHEMAS_RULE@
-
-man_MANS = gnobots2.6
-
-bin_PROGRAMS = gnobots2
-
-gnobots2_SOURCES = \
-	gnobots.c \
-	gnobots.h \
-	statusbar.c \
-	statusbar.h \
-	gameconfig.c \
-	gameconfig.h \
-	menu.c \
-	menu.h \
-	properties.c \
-	properties.h \
-	graphics.c \
-	graphics.h \
-	keyboard.c \
-	keyboard.h \
-	game.c \
-	game.h \
-	sound.c \
-	sound.h \
-	cursors.c \
-	cursors.h \
-	gbdefs.h \
-	find-file.c \
-	find-file.h \
-	cursor-down.h \
-	cursor-down-left.h \
-	cursor-down-right.h \
-	cursor-hold.h \
-	cursor-left.h \
-	cursor-right.h \
-	cursor-up.h \
-	cursor-up-left.h \
-	cursor-up-right.h \
-	$(NULL)
-
-gnobots2_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-gnobots2_CFLAGS = \
-	$(GTK_CFLAGS) \
-	$(AM_CFLAGS)
-
-gnobots2_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GTK_LIBS) \
-	$(INTLLIBS) \
-	-lm \
-	$(NULL)
-
-if HAVE_GNOME
-gnobots2_CFLAGS += $(GNOME_CFLAGS)
-gnobots2_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-gnobots2_CFLAGS += $(RSVG_CFLAGS)
-gnobots2_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-gnobots2_CFLAGS += $(GHTREAD_CFLAGS)
-gnobots2_LDADD += $(GTHREAD_LIBS)
-endif
-
-cursor_files = \
-	cursor-down-left.png	\
-	cursor-down.png		\
-	cursor-down-right.png	\
-	cursor-hold.png		\
-	cursor-left.png		\
-	cursor-right.png	\
-	cursor-up-left.png	\
-	cursor-up.png		\
-	cursor-up-right.png	\
-	$(NULL)
-
-pixmapdir = $(pkgdatadir)/gnobots2/pixmaps
-pixmap_DATA = yahoo.png \
-              aieee.png \
-              splat.png
-
-themedir = $(pkgdatadir)/gnobots2/themes
-theme_DATA = gnomes.png \
-             robots.svg \
-             boo.svg \
-             ufo.svg
-
-configdir = $(pkgdatadir)/gnobots2/games
-config_DATA = robots2.cfg \
-              robots2_easy.cfg \
-              classic_robots.cfg \
-              robots_with_safe_teleport.cfg \
-              nightmare.cfg
-
-Gamesdir = $(datadir)/applications
-Games_in_files = gnobots2.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST = AUTHORS \
-	     $(cursor_files) \
-             $(pixmap_DATA) \
-             $(theme_DATA) \
-             $(Games_DATA) \
-             $(config_DATA) \
-             $(schema_in_files) \
-             $(man_MANS)
-
 install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)
-endif
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-for cfn in $(config_DATA); do \
 	    cfn2=`echo $$cfn | sed -e 's/\.cfg//'`; \
@@ -142,11 +16,4 @@ endif
 	    touch $$fname3; chmod 664 $$fname3; chown $(scores_user):$(scores_group) $$fname3; \
 	    done
 
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ;\
-	fi
-
-DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnobots2/data/Makefile.am b/gnobots2/data/Makefile.am
index 2cb0545..d40f104 100644
--- a/gnobots2/data/Makefile.am
+++ b/gnobots2/data/Makefile.am
@@ -1,11 +1,3 @@
-SUBDIRS =
-
-if BUILD_HELP
-SUBDIRS += help
-endif
-
-NULL =
-
 schema_in_files = gnobots2.schemas.in
 if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
@@ -16,73 +8,6 @@ endif
 
 man_MANS = gnobots2.6
 
-bin_PROGRAMS = gnobots2
-
-gnobots2_SOURCES = \
-	gnobots.c \
-	gnobots.h \
-	statusbar.c \
-	statusbar.h \
-	gameconfig.c \
-	gameconfig.h \
-	menu.c \
-	menu.h \
-	properties.c \
-	properties.h \
-	graphics.c \
-	graphics.h \
-	keyboard.c \
-	keyboard.h \
-	game.c \
-	game.h \
-	sound.c \
-	sound.h \
-	cursors.c \
-	cursors.h \
-	gbdefs.h \
-	find-file.c \
-	find-file.h \
-	cursor-down.h \
-	cursor-down-left.h \
-	cursor-down-right.h \
-	cursor-hold.h \
-	cursor-left.h \
-	cursor-right.h \
-	cursor-up.h \
-	cursor-up-left.h \
-	cursor-up-right.h \
-	$(NULL)
-
-gnobots2_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-gnobots2_CFLAGS = \
-	$(GTK_CFLAGS) \
-	$(AM_CFLAGS)
-
-gnobots2_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GTK_LIBS) \
-	$(INTLLIBS) \
-	-lm \
-	$(NULL)
-
-if HAVE_GNOME
-gnobots2_CFLAGS += $(GNOME_CFLAGS)
-gnobots2_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-gnobots2_CFLAGS += $(RSVG_CFLAGS)
-gnobots2_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-gnobots2_CFLAGS += $(GHTREAD_CFLAGS)
-gnobots2_LDADD += $(GTHREAD_LIBS)
-endif
-
 cursor_files = \
 	cursor-down-left.png	\
 	cursor-down.png		\
@@ -92,8 +17,7 @@ cursor_files = \
 	cursor-right.png	\
 	cursor-up-left.png	\
 	cursor-up.png		\
-	cursor-up-right.png	\
-	$(NULL)
+	cursor-up-right.png
 
 pixmapdir = $(pkgdatadir)/gnobots2/pixmaps
 pixmap_DATA = yahoo.png \
@@ -129,23 +53,8 @@ EXTRA_DIST = AUTHORS \
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/data/$(schema_DATA)
 endif
-	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-	-for cfn in $(config_DATA); do \
-	    cfn2=`echo $$cfn | sed -e 's/\.cfg//'`; \
-            fname1=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2.scores; \
-            fname2=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2-safe.scores; \
-            fname3=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2-super-safe.scores; \
-	    touch $$fname1; chmod 664 $$fname1; chown $(scores_user):$(scores_group) $$fname1; \
-	    touch $$fname2; chmod 664 $$fname2; chown $(scores_user):$(scores_group) $$fname2; \
-	    touch $$fname3; chmod 664 $$fname3; chown $(scores_user):$(scores_group) $$fname3; \
-	    done
-
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ;\
-	fi
 
 DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
 
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index 2cb0545..5307d53 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -1,21 +1,3 @@
-SUBDIRS =
-
-if BUILD_HELP
-SUBDIRS += help
-endif
-
-NULL =
-
-schema_in_files = gnobots2.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
-
- INTLTOOL_SCHEMAS_RULE@
-
-man_MANS = gnobots2.6
-
 bin_PROGRAMS = gnobots2
 
 gnobots2_SOURCES = \
@@ -50,8 +32,7 @@ gnobots2_SOURCES = \
 	cursor-right.h \
 	cursor-up.h \
 	cursor-up-left.h \
-	cursor-up-right.h \
-	$(NULL)
+	cursor-up-right.h
 
 gnobots2_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -65,8 +46,7 @@ gnobots2_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
 	$(GTK_LIBS) \
 	$(INTLLIBS) \
-	-lm \
-	$(NULL)
+	-lm
 
 if HAVE_GNOME
 gnobots2_CFLAGS += $(GNOME_CFLAGS)
@@ -83,70 +63,9 @@ gnobots2_CFLAGS += $(GHTREAD_CFLAGS)
 gnobots2_LDADD += $(GTHREAD_LIBS)
 endif
 
-cursor_files = \
-	cursor-down-left.png	\
-	cursor-down.png		\
-	cursor-down-right.png	\
-	cursor-hold.png		\
-	cursor-left.png		\
-	cursor-right.png	\
-	cursor-up-left.png	\
-	cursor-up.png		\
-	cursor-up-right.png	\
-	$(NULL)
-
-pixmapdir = $(pkgdatadir)/gnobots2/pixmaps
-pixmap_DATA = yahoo.png \
-              aieee.png \
-              splat.png
-
-themedir = $(pkgdatadir)/gnobots2/themes
-theme_DATA = gnomes.png \
-             robots.svg \
-             boo.svg \
-             ufo.svg
-
-configdir = $(pkgdatadir)/gnobots2/games
-config_DATA = robots2.cfg \
-              robots2_easy.cfg \
-              classic_robots.cfg \
-              robots_with_safe_teleport.cfg \
-              nightmare.cfg
-
-Gamesdir = $(datadir)/applications
-Games_in_files = gnobots2.desktop.in.in
-Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST = AUTHORS \
-	     $(cursor_files) \
-             $(pixmap_DATA) \
-             $(theme_DATA) \
-             $(Games_DATA) \
-             $(config_DATA) \
-             $(schema_in_files) \
-             $(man_MANS)
-
-install-data-local:
-if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnobots2/$(schema_DATA)
-endif
-	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
-	-for cfn in $(config_DATA); do \
-	    cfn2=`echo $$cfn | sed -e 's/\.cfg//'`; \
-            fname1=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2.scores; \
-            fname2=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2-safe.scores; \
-            fname3=$(DESTDIR)$(scoredir)/gnobots2.$$cfn2-super-safe.scores; \
-	    touch $$fname1; chmod 664 $$fname1; chown $(scores_user):$(scores_group) $$fname1; \
-	    touch $$fname2; chmod 664 $$fname2; chown $(scores_user):$(scores_group) $$fname2; \
-	    touch $$fname3; chmod 664 $$fname3; chown $(scores_user):$(scores_group) $$fname3; \
-	    done
-
 install-exec-hook:
 	-if test "$(setgid)" = "true"; then \
 	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnobots2 && chmod 2555 $(DESTDIR)$(bindir)/gnobots2 ;\
 	fi
 
-DISTCLEANFILES = $(Games_DATA) $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnobots2/src/menu.c b/gnobots2/src/menu.c
index 5620795..16721f3 100644
--- a/gnobots2/src/menu.c
+++ b/gnobots2/src/menu.c
@@ -250,6 +250,8 @@ about_cb (GtkAction * action, gpointer data)
 {
   const gchar *authors[] = { "Mark Rae <m rae inpharmatica co uk>", NULL };
 
+  const gchar *artists[] = { "Kirstie Opstad - <K Opstad ed ac uk>", NULL };
+
   const gchar *documenters[] =
     { "Patanjali Somayaji", "Mark Rae <m rae inpharmatica co uk>", NULL };
 
@@ -263,6 +265,7 @@ about_cb (GtkAction * action, gpointer data)
 		         "website-label", _("GNOME Games web site"),
 			 "comments", _("Based on classic BSD Robots.\n\nRobots is a part of GNOME Games."),
 			 "authors", authors,
+			 "artists", artists,
 			 "documenters", documenters,
 			 "translator-credits", _("translator-credits"),
 			 "logo-icon-name", "gnome-robots",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]