[gnome-games] swell-foop: Split data/Makefile.am out of Makefile.am

[Robert Ancell <rancell src gnome org>]

commit 0617346c22b62cf865d0a37952842f9b147227ec
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 17:01:45 2011 +1100

    swell-foop: Split data/Makefile.am out of Makefile.am

 configure.ac                |   13 ++++++-----
 swell-foop/Makefile.am      |   41 +--------------------------------------
 swell-foop/data/Makefile.am |   44 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d659e9f..3197121 100644
--- a/configure.ac
+++ b/configure.ac
@@ -787,7 +787,14 @@ gnomine/data/gnomine.desktop.in
 gnomine/help/Makefile
 gnomine/src/Makefile
 swell-foop/Makefile
+swell-foop/data/Makefile
+swell-foop/data/icons/Makefile
+swell-foop/data/themes/Makefile
+swell-foop/data/themes/colors/Makefile
+swell-foop/data/themes/shapesandcolors/Makefile
+swell-foop/data/swell-foop.desktop.in
 swell-foop/help/Makefile
+swell-foop/src/Makefile
 mahjongg/Makefile
 mahjongg/data/Makefile
 mahjongg/data/icons/Makefile
@@ -869,12 +876,6 @@ gnome-sudoku/data/Makefile
 gnome-sudoku/data/icons/Makefile
 gnome-sudoku/data/gnome-sudoku.desktop.in
 gnome-sudoku/help/Makefile
-swell-foop/data/icons/Makefile
-swell-foop/data/themes/Makefile
-swell-foop/data/themes/colors/Makefile
-swell-foop/data/themes/shapesandcolors/Makefile
-swell-foop/data/swell-foop.desktop.in
-swell-foop/src/Makefile
 ])
 AC_OUTPUT
 
diff --git a/swell-foop/Makefile.am b/swell-foop/Makefile.am
index 2c92599..a559860 100644
--- a/swell-foop/Makefile.am
+++ b/swell-foop/Makefile.am
@@ -1,58 +1,21 @@
-SUBDIRS = data/icons data/themes src
+SUBDIRS = data src
 
 if BUILD_HELP
 SUBDIRS += help
 endif
 
-swelldir=$(pkgdatadir)/swell-foop
-
-swell_DATA = \
-    data/swell-foop.ui \
-    data/settings.ui
-
 bin_SCRIPTS = swell-foop
 
 swell-foop: swell-foop.in Makefile
 	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" $< > $@
 
-schema_in_files = data/swell-foop.schemas.in
-if HAVE_GNOME
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-endif
-
-desktop_in_files = data/swell-foop.desktop.in.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
 EXTRA_DIST = \
-    swell-foop.in \
-    data/swell-foop.ui \
-    data/settings.ui \
-    $(schema_in_files)
-
-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
+    swell-foop.in
 
 CLEANFILES = \
-	$(desktop_DATA)	\
-	$(schema_DATA)	\
 	swell-foop
 
 DISTCLEANFILES = \
-	$(desktop_DATA)	\
-	$(schema_DATA)	\
 	swell-foop
 
- INTLTOOL_SCHEMAS_RULE@
-
 -include $(top_srcdir)/git.mk
diff --git a/swell-foop/data/Makefile.am b/swell-foop/data/Makefile.am
new file mode 100644
index 0000000..e9450ee
--- /dev/null
+++ b/swell-foop/data/Makefile.am
@@ -0,0 +1,44 @@
+SUBDIRS = icons themes
+
+swelldir=$(pkgdatadir)/swell-foop
+swell_DATA = \
+    swell-foop.ui \
+    settings.ui
+
+schema_in_files = swell-foop.schemas.in
+if HAVE_GNOME
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+endif
+
+desktop_in_files = swell-foop.desktop.in.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+EXTRA_DIST = \
+    $(swell_DATA) \
+    $(schema_in_files)
+
+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
+
+CLEANFILES = \
+	$(desktop_DATA)	\
+	$(schema_DATA)
+
+DISTCLEANFILES = \
+	$(desktop_DATA)	\
+	$(schema_DATA)
+
+ INTLTOOL_SCHEMAS_RULE@
+
+-include $(top_srcdir)/git.mk