From 612662f401ef931eea0d5e8c25319c4326cd2c2d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 14 Feb 2012 16:06:04 -0600
Subject: Make data have it's own makefile so the GSettings rules work properly
 on distcheck

---
 Makefile.am      | 21 +++------------------
 configure.ac     |  1 +
 data/Makefile.am | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 data/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fbd9e6b..0ef4362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = po
-
-gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-@GSETTINGS_RULES@
+SUBDIRS = \
+	po \
+	data
 
 ###################
 # Indicator Stuff
@@ -36,16 +31,6 @@ libpower_la_LDFLAGS = \
 dist_noinst_SCRIPTS = \
 	autogen.sh
 
-dist_noinst_DATA = \
-	data/com.canonical.indicator.power.gschema.xml \
-	$(gsettings_in_file)
-
-CLEANFILES = \
-	$(gsettings_SCHEMAS)
-
-MAINTAINERCLEANFILES = \
-	$(gsettings_SCHEMAS:.xml=.valid)
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
 ############################################################
diff --git a/configure.ac b/configure.ac
index 0177f3b..2d519d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,6 +115,7 @@ AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package nam
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
+data/Makefile
 ])
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..375c7ca
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,17 @@
+
+gsettings_in_file = com.canonical.indicator.power.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+dist_noinst_DATA = \
+	com.canonical.indicator.power.gschema.xml \
+	$(gsettings_in_file)
+
+CLEANFILES = \
+	$(gsettings_SCHEMAS)
+
+MAINTAINERCLEANFILES = \
+	$(gsettings_SCHEMAS:.xml=.valid)
-- 
cgit v1.2.3