aboutsummaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-12-14 16:41:10 +0000
committerConor Curran <conor.curran@canonical.com>2010-12-14 16:41:10 +0000
commit8396e05ce716296377f2e4550e0c929dca30518e (patch)
tree0d718fe2e9c09c068a8b6f10559ad8f4956eec84 /data/Makefile.am
parent2a35f9b78b75cd95090142b891c401a46eec9bf3 (diff)
downloadayatana-indicator-sound-8396e05ce716296377f2e4550e0c929dca30518e.tar.gz
ayatana-indicator-sound-8396e05ce716296377f2e4550e0c929dca30518e.tar.bz2
ayatana-indicator-sound-8396e05ce716296377f2e4550e0c929dca30518e.zip
gsettings all the way
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am41
1 files changed, 12 insertions, 29 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index aaa6ca4..730f166 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,39 +5,22 @@ service_in_files = indicator-sound.service.in
dbus_services_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
##############################
-# GConf Schema
+# GSettings Schema
##############################
-schemadir = \
- $(GCONF_SCHEMA_FILE_DIR)
+gsettings_SCHEMAS = \
+ com.canonical.indicators.sound.gschema.xml
+@GSETTINGS_RULES@
-schema_in_files = \
- indicator-sound.schemas.in
-
-schema_DATA = \
- $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-
-#$(dbus_services_DATA): $(service_in_files) Makefile
-# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-EXTRA_DIST = \
- $(service_in_files) \
- $(schema_in_files)
+##############################
-CLEANFILES = \
- $(dbus_services_DATA) \
- $(schema_DATA)
+EXTRA_DIST = \
+ $(service_in_files) \
+ $(gsettings_SCHEMAS)
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
- gconftool-2 --makefile-install-rule $(schema_DATA)
-else
-install-data-local:
-endif
+CLEANFILES = \
+ $(dbus_services_DATA)
+ \ No newline at end of file