From 8396e05ce716296377f2e4550e0c929dca30518e Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 14 Dec 2010 16:41:10 +0000
Subject: gsettings all the way

---
 data/Makefile.am | 41 ++++++++++++-----------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'data/Makefile.am')

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
-- 
cgit v1.2.3


From 7ef502c18c6ccf850c83fabebfb1884c458320b4 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 14 Dec 2010 17:04:46 +0000
Subject: autofoo in order for gsettings

---
 data/Makefile.am | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 730f166..3f54f64 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,26 +1,20 @@
 SUBDIRS = icons
 
+gsettings_SCHEMAS = \
+  com.canonical.indicators.sound.gschema.xml
+@GSETTINGS_RULES@
+
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  indicator-sound.service.in 
-dbus_services_DATA = $(service_in_files:.service.in=.service)
+dbus_services_DATA = indicator-sound.service
 
 %.service: %.service.in
   sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-##############################
-# GSettings Schema
-##############################
-
-gsettings_SCHEMAS = \
-  com.canonical.indicators.sound.gschema.xml
-@GSETTINGS_RULES@
-
-##############################
 
-EXTRA_DIST =          \
-  $(service_in_files)     \
-  $(gsettings_SCHEMAS) 
+EXTRA_DIST = \
+  $(gsettings_SCHEMAS) \
+  indicator-sound.service.in
 
-CLEANFILES =          \
+CLEANFILES = \
   $(dbus_services_DATA)
   
\ No newline at end of file
-- 
cgit v1.2.3


From 37eb76fbc08dad63341a4deff3bcaf433e1082ab Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 14 Dec 2010 17:29:49 +0000
Subject:  added glib macro necessaries to configure.ac

---
 data/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 3f54f64..6f2ac61 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,7 +10,6 @@ dbus_services_DATA = indicator-sound.service
 %.service: %.service.in
   sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-
 EXTRA_DIST = \
   $(gsettings_SCHEMAS) \
   indicator-sound.service.in
-- 
cgit v1.2.3


From 02b6109a523fdf2236788628447186682a9adf1b Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 14 Dec 2010 18:00:36 +0000
Subject: fixed annoying autofoo issues

---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 6f2ac61..f33b470 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,7 +8,7 @@ dbus_servicesdir = $(DBUSSERVICEDIR)
 dbus_services_DATA = indicator-sound.service
 
 %.service: %.service.in
-  sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST = \
   $(gsettings_SCHEMAS) \
-- 
cgit v1.2.3