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

[Robert Ancell <rancell src gnome org>]

commit 0d7ac8b4af21e2dcf8d9b4667ca56e3a0c2aa772
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Nov 14 10:02:20 2011 +1100

    gnotravex: Relayout into src data directories

 configure.in                                       |    4 +-
 gnotravex/Makefile.am                              |   62 +-------------------
 gnotravex/data/Makefile.am                         |   20 ++++++
 gnotravex/{ => data}/gnotravex.6                   |    0
 gnotravex/{ => data}/gnotravex.desktop.in.in       |    0
 .../{ => data}/org.gnome.gnotravex.gschema.xml.in  |    0
 gnotravex/src/Makefile.am                          |   39 ++++++++++++
 gnotravex/{ => src}/gnotravex.c                    |    0
 8 files changed, 63 insertions(+), 62 deletions(-)
---
diff --git a/configure.in b/configure.in
index f68186f..65fe620 100644
--- a/configure.in
+++ b/configure.in
@@ -865,7 +865,9 @@ iagno/data/Makefile
 iagno/help/Makefile
 iagno/src/Makefile
 gnotravex/Makefile
-gnotravex/gnotravex.desktop.in
+gnotravex/data/Makefile
+gnotravex/data/gnotravex.desktop.in
+gnotravex/src/Makefile
 gnotravex/help/Makefile
 gnotravex/pixmaps/Makefile
 gnotski/Makefile
diff --git a/gnotravex/Makefile.am b/gnotravex/Makefile.am
index b0c65ff..5d298e2 100644
--- a/gnotravex/Makefile.am
+++ b/gnotravex/Makefile.am
@@ -4,63 +4,8 @@ if BUILD_HELP
 SUBDIRS += help
 endif
 
-NULL =
-
-bin_PROGRAMS = gnotravex
-
-gnotravex_SOURCES = \
-	gnotravex.c \
-	$(NULL)
-
-gnotravex_CPPFLAGS = \
-	-I$(top_srcdir) \
-	$(AM_CPPFLAGS)
-
-gnotravex_CFLAGS = \
-	$(GTK_CFLAGS)	\
-	$(AM_CFLAGS)
-
-gnotravex_LDADD =	\
-	$(top_builddir)/libgames-support/libgames-support.la \
-	$(GTK_LIBS)	\
-	$(INTLLIBS)	\
-	$(NULL)
-
-if HAVE_GNOME
-gnotravex_CFLAGS += $(GNOME_CFLAGS)
-gnotravex_LDADD += $(GNOME_LIBS)
-endif
-
-if HAVE_RSVG
-gnotravex_CFLAGS += $(RSVG_CFLAGS)
-gnotravex_LDADD += $(RSVG_LIBS)
-endif
-
-if WITH_GTHREAD
-gnotravex_CFLAGS += $(GHTREAD_CFLAGS)
-gnotravex_LDADD += $(GTHREAD_LIBS)
-endif
-
-desktop_in_files = gnotravex.desktop.in.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
-gsettings_in_file = org.gnome.gnotravex.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
-man_MANS = gnotravex.6
-
 EXTRA_DIST = \
-	README \
-	$(gsettings_in_file) \
-	$(man_MANS) \
-	$(NULL)
-
-CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
+	README
 
 SCOREFILES = 2 3 4 5 6
 
@@ -72,11 +17,6 @@ install-scorefiles-local:
 	   chmod 664 $(DESTDIR)$(scoredir)/gnotravex."$$i"x"$$i".scores; \
 	 done
 
-install-exec-hook:
-	-if test "$(setgid)" = "true"; then \
-	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotravex && chmod 2555 $(DESTDIR)$(bindir)/gnotravex ;\
-	fi
-
 install-data-local: install-scorefiles-local
 
 -include $(top_srcdir)/git.mk
diff --git a/gnotravex/data/Makefile.am b/gnotravex/data/Makefile.am
new file mode 100644
index 0000000..2589d05
--- /dev/null
+++ b/gnotravex/data/Makefile.am
@@ -0,0 +1,20 @@
+desktop_in_files = gnotravex.desktop.in.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+gsettings_in_file = org.gnome.gnotravex.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+man_MANS = gnotravex.6
+
+EXTRA_DIST = \
+	$(gsettings_in_file) \
+	$(man_MANS)
+    
+CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnotravex/gnotravex.6 b/gnotravex/data/gnotravex.6
similarity index 100%
rename from gnotravex/gnotravex.6
rename to gnotravex/data/gnotravex.6
diff --git a/gnotravex/gnotravex.desktop.in.in b/gnotravex/data/gnotravex.desktop.in.in
similarity index 100%
rename from gnotravex/gnotravex.desktop.in.in
rename to gnotravex/data/gnotravex.desktop.in.in
diff --git a/gnotravex/org.gnome.gnotravex.gschema.xml.in b/gnotravex/data/org.gnome.gnotravex.gschema.xml.in
similarity index 100%
rename from gnotravex/org.gnome.gnotravex.gschema.xml.in
rename to gnotravex/data/org.gnome.gnotravex.gschema.xml.in
diff --git a/gnotravex/src/Makefile.am b/gnotravex/src/Makefile.am
new file mode 100644
index 0000000..8b938cf
--- /dev/null
+++ b/gnotravex/src/Makefile.am
@@ -0,0 +1,39 @@
+bin_PROGRAMS = gnotravex
+
+gnotravex_SOURCES = \
+	gnotravex.c
+
+gnotravex_CPPFLAGS = \
+	-I$(top_srcdir) \
+	$(AM_CPPFLAGS)
+
+gnotravex_CFLAGS = \
+	$(GTK_CFLAGS)	\
+	$(AM_CFLAGS)
+
+gnotravex_LDADD =	\
+	$(top_builddir)/libgames-support/libgames-support.la \
+	$(GTK_LIBS)	\
+	$(INTLLIBS)
+
+if HAVE_GNOME
+gnotravex_CFLAGS += $(GNOME_CFLAGS)
+gnotravex_LDADD += $(GNOME_LIBS)
+endif
+
+if HAVE_RSVG
+gnotravex_CFLAGS += $(RSVG_CFLAGS)
+gnotravex_LDADD += $(RSVG_LIBS)
+endif
+
+if WITH_GTHREAD
+gnotravex_CFLAGS += $(GHTREAD_CFLAGS)
+gnotravex_LDADD += $(GTHREAD_LIBS)
+endif
+
+install-exec-hook:
+	-if test "$(setgid)" = "true"; then \
+	  chgrp $(scores_group) $(DESTDIR)$(bindir)/gnotravex && chmod 2555 $(DESTDIR)$(bindir)/gnotravex ;\
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/gnotravex/gnotravex.c b/gnotravex/src/gnotravex.c
similarity index 100%
rename from gnotravex/gnotravex.c
rename to gnotravex/src/gnotravex.c