aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-14 16:06:04 -0600
committerTed Gould <ted@gould.cx>2012-02-14 16:06:04 -0600
commit612662f401ef931eea0d5e8c25319c4326cd2c2d (patch)
tree50dc98d3423ebd0a527ead3a442c61b192752d2a
parentea4f2d84eb5a268462037868131e1d9e69b3a845 (diff)
downloadayatana-indicator-power-612662f401ef931eea0d5e8c25319c4326cd2c2d.tar.gz
ayatana-indicator-power-612662f401ef931eea0d5e8c25319c4326cd2c2d.tar.bz2
ayatana-indicator-power-612662f401ef931eea0d5e8c25319c4326cd2c2d.zip
Make data have it's own makefile so the GSettings rules work properly on distcheck
-rw-r--r--Makefile.am21
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am17
3 files changed, 21 insertions, 18 deletions
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)