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

[Robert Ancell <rancell src gnome org>]

commit b47722b730132c093b389e1434839ccc2c89193a
Author: Robert Ancell <robert ancell canonical com>
Date:   Sun Nov 20 14:58:56 2011 +1100

    gnotski: Relayout into src data directories

 configure.in                             |    4 +-
 gnotski/AUTHORS                          |    1 -
 gnotski/ChangeLog.old                    |  433 ------------------------------
 gnotski/Makefile.am                      |   88 +------
 gnotski/README                           |    9 -
 gnotski/data/Makefile.am                 |   42 +++
 gnotski/{ => data}/gnotski.6             |    0
 gnotski/{ => data}/gnotski.desktop.in.in |    0
 gnotski/{ => data}/gnotski.schemas.in    |    0
 gnotski/{ => data}/gnotski.svg           |    0
 gnotski/src/Makefile.am                  |   40 +++
 gnotski/{ => src}/gnotski.c              |    0
 gnotski/{ => src}/pieces.h               |    0
 13 files changed, 87 insertions(+), 530 deletions(-)
---
diff --git a/configure.in b/configure.in
index 482a48b..5e91901 100644
--- a/configure.in
+++ b/configure.in
@@ -871,6 +871,8 @@ gnotravex/data/gnotravex.desktop.in
 gnotravex/src/Makefile
 gnotravex/help/Makefile
 gnotski/Makefile
+gnotski/data/Makefile
+gnotski/src/Makefile
 gnotski/help/Makefile
 glines/Makefile
 glines/data/Makefile
@@ -910,7 +912,7 @@ swell-foop/src/Makefile
 quadrapassel/quadrapassel.desktop.in
 gnobots2/gnobots2.desktop.in
 gnibbles/gnibbles.desktop.in
-gnotski/gnotski.desktop.in
+gnotski/data/gnotski.desktop.in
 glchess/glchess.desktop.in
 mahjongg/data/mahjongg.desktop.in
 gtali/data/gtali.desktop.in
diff --git a/gnotski/Makefile.am b/gnotski/Makefile.am
index 9fab5f2..06c8655 100644
--- a/gnotski/Makefile.am
+++ b/gnotski/Makefile.am
@@ -1,86 +1,12 @@
-SUBDIRS =
+SUBDIRS = src data
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-NULL =
-
-bin_PROGRAMS = gnotski
-
-gnotski_SOURCES = \
-	gnotski.c	\
-	pieces.h	\
-	$(NULL)
-
-gnotski_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-gnotski_CFLAGS = \
-	$(GTK_CFLAGS)	\
-	$(AM_CFLAGS)
-		
-gnotski_LDADD = \
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GTK_LIBS)	\
-	$(INTLLIBS)	\
-	$(NULL)
-
-if HAVE_GNOME
-gnotski_CFLAGS += $(GNOME_CFLAGS)
-gnotski_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-gnotski_CFLAGS += $(RSVG_CFLAGS)
-gnotski_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-gnotski_CFLAGS += $(GHTREAD_CFLAGS)
-gnotski_LDADD += $(GTHREAD_LIBS)
-endif
-
-pixmapdir = $(pkgdatadir)/gnotski/pixmaps
-pixmap_DATA = \
-	gnotski.svg	\
-	$(NULL)
-
-schema_in_files = gnotski.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
-
-man_MANS = gnotski.6
-
-desktop_in_files = gnotski.desktop.in.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
-
 SCOREFILES = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
 
-EXTRA_DIST = \
-	README			\
-	$(pixmap_DATA)		\
-	$(schema_in_files)	\
-	$(man_MANS)		\
-	$(NULL)
-
-CLEANFILES = $(desktop_DATA) $(schema_DATA)
-DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
-
-install-schemas-local: $(schema_DATA)
-if GCONF_SCHEMAS_INSTALL
-	if test -z "$(DESTDIR)" ; then \
-		for p in $^ ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
-		done \
-	fi
-endif
-
-install-scorefiles-local:
+install-data-local:
 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
 	-for i in ${SCOREFILES} ; do \
 	  touch             $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
@@ -88,14 +14,4 @@ install-scorefiles-local:
 	  chmod 664         $(DESTDIR)$(scoredir)/gnotski.$$i.scores; \
 	done
 
-install-data-local: install-schemas-local install-scorefiles-local
-
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotski && chmod 2555 $(DESTDIR)$(bindir)/gnotski ;\
-	fi
-
- INTLTOOL_SCHEMAS_RULE@
- INTLTOOL_DESKTOP_RULE@
-
 -include $(top_srcdir)/git.mk
diff --git a/gnotski/data/Makefile.am b/gnotski/data/Makefile.am
new file mode 100644
index 0000000..5622dfb
--- /dev/null
+++ b/gnotski/data/Makefile.am
@@ -0,0 +1,42 @@
+pixmapdir = $(pkgdatadir)/gnotski/pixmaps
+pixmap_DATA = \
+	gnotski.svg	\
+	$(NULL)
+
+schema_in_files = gnotski.schemas.in
+if HAVE_GNOME
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+endif
+
+man_MANS = gnotski.6
+
+desktop_in_files = gnotski.desktop.in.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+
+SCOREFILES = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
+
+EXTRA_DIST = \
+	$(pixmap_DATA)		\
+	$(schema_in_files)	\
+	$(man_MANS)
+
+CLEANFILES = $(desktop_DATA) $(schema_DATA)
+DISTCLEANFILES = $(desktop_DATA) $(schema_DATA)
+
+install-schemas-local: $(schema_DATA)
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+		for p in $^ ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
+		done \
+	fi
+endif
+
+install-data-local: install-schemas-local
+
+ INTLTOOL_SCHEMAS_RULE@
+ INTLTOOL_DESKTOP_RULE@
+
+-include $(top_srcdir)/git.mk
diff --git a/gnotski/gnotski.6 b/gnotski/data/gnotski.6
similarity index 100%
rename from gnotski/gnotski.6
rename to gnotski/data/gnotski.6
diff --git a/gnotski/gnotski.desktop.in.in b/gnotski/data/gnotski.desktop.in.in
similarity index 100%
rename from gnotski/gnotski.desktop.in.in
rename to gnotski/data/gnotski.desktop.in.in
diff --git a/gnotski/gnotski.schemas.in b/gnotski/data/gnotski.schemas.in
similarity index 100%
rename from gnotski/gnotski.schemas.in
rename to gnotski/data/gnotski.schemas.in
diff --git a/gnotski/gnotski.svg b/gnotski/data/gnotski.svg
similarity index 100%
rename from gnotski/gnotski.svg
rename to gnotski/data/gnotski.svg
diff --git a/gnotski/src/Makefile.am b/gnotski/src/Makefile.am
new file mode 100644
index 0000000..32c3b7f
--- /dev/null
+++ b/gnotski/src/Makefile.am
@@ -0,0 +1,40 @@
+bin_PROGRAMS = gnotski
+
+gnotski_SOURCES = \
+	gnotski.c	\
+	pieces.h
+
+gnotski_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+gnotski_CFLAGS = \
+	$(GTK_CFLAGS)	\
+	$(AM_CFLAGS)
+		
+gnotski_LDADD = \
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GTK_LIBS)	\
+	$(INTLLIBS)
+
+if HAVE_GNOME
+gnotski_CFLAGS += $(GNOME_CFLAGS)
+gnotski_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnotski_CFLAGS += $(RSVG_CFLAGS)
+gnotski_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnotski_CFLAGS += $(GHTREAD_CFLAGS)
+gnotski_LDADD += $(GTHREAD_LIBS)
+endif
+
+install-exec-hook:
+	-if test "$(setgid)" = "true"; then \
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotski && chmod 2555 $(DESTDIR)$(bindir)/gnotski ;\
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/gnotski/gnotski.c b/gnotski/src/gnotski.c
similarity index 100%
rename from gnotski/gnotski.c
rename to gnotski/src/gnotski.c
diff --git a/gnotski/pieces.h b/gnotski/src/pieces.h
similarity index 100%
rename from gnotski/pieces.h
rename to gnotski/src/pieces.h