From e102f3b357c8ee39efde7406d7abfed5c0d16998 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 10 Jan 2011 12:57:35 +0000
Subject: porting in progress

---
 src/Makefile.am | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 7fe7e0f..8303183 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,8 +18,7 @@ libsoundmenu_la_SOURCES = \
             title-widget.h \
             volume-widget.c \
             volume-widget.h \
-            dbus-shared-names.h \
-            sound-service-client.h 
+            dbus-shared-names.h
 
 libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -DG_LOG_DOMAIN=\"Indicator-Sound\"
 libsoundmenu_la_LIBADD = $(APPLET_LIBS)
@@ -29,27 +28,11 @@ checkxml: $(srcdir)/sound-service.xml
 	@xmllint -valid -noout $<
 	@echo $< checks out ok
 
-sound-service-client.h: $(srcdir)/sound-service.xml
-	dbus-binding-tool \
-		--prefix=_sound_service_client \
-		--mode=glib-client \
-		--output=sound-service-client.h \
-		$(srcdir)/sound-service.xml
-
 
 ####################################################################
 # Sound Service 
 ####################################################################
 
-#################
-# dbus interface
-#################
-sound-service-server.h: $(srcdir)/sound-service.xml
-	dbus-binding-tool \
-		--prefix=_sound_service_server \
-		--mode=glib-server \
-		--output=sound-service-server.h \
-		$(srcdir)/sound-service.xml
 
 #####################
 # libsoundmenu vala
@@ -78,7 +61,7 @@ music_bridge_VALAFLAGS = \
   --vapidir=./ \
   --thread \
   --pkg gee-1.0 \
-  --pkg Dbusmenu-Glib-0.2 \
+  --pkg Dbusmenu-Glib-0.4 \
   --pkg common-defs \
 	--pkg gio-2.0 \
 	--pkg gio-unix-2.0 \
@@ -108,7 +91,6 @@ indicator_sound_service_SOURCES = \
   pulse-manager.c \
   sound-service-dbus.h \
   sound-service-dbus.c \
-  sound-service-server.h \
   slider-menu-item.h \
   slider-menu-item.c \
   $(music_bridge_VALASOURCES:.vala=.c)
@@ -117,9 +99,24 @@ indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(G
 indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
 
 #########################
-# Extra stuff to package
+# Service xml compilation
 #########################
-EXTRA_DIST = \
+DBUS_SPECS = \
+	sound-service.xml
+
+gen-%.xml.h: %.xml
+	@echo "Building $@ from $<"
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+
+gen-%.xml.c: %.xml
+	@echo "Building $@ from $<"
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	@echo ";" >> $@
+
+
+EXTRA_DIST += \
+  $(DBUS_SPECS)
   sound-service.xml \
   sound-service.list \
   $(music_bridge_APIFILES) \
@@ -133,6 +130,8 @@ BUILT_SOURCES = \
 	sound-service-client.h \
   sound-service-server.h \
   $(music_bridge_APIFILES) \
+	gen-indicator-service.xml.h \
+	gen-indicator-service.xml.c \
   $(music_bridge_VALASOURCES:.vala=.c)
 
 CLEANFILES = \
-- 
cgit v1.2.3


From 6bf8f172ef969f5d0a5fa2a2da1497b8b84c42bb Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 10 Jan 2011 13:12:39 +0000
Subject: autofoo fixes

---
 src/Makefile.am | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 8303183..b45da22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,13 +115,12 @@ gen-%.xml.c: %.xml
 	@echo ";" >> $@
 
 
-EXTRA_DIST += \
-  $(DBUS_SPECS)
+EXTRA_DIST = \
+  $(DBUS_SPECS) \
   sound-service.xml \
-  sound-service.list \
   $(music_bridge_APIFILES) \
   $(music_bridge_VALASOURCES)
-
+  
 #######################
 # Stuff to clean Stuff
 #######################
@@ -130,10 +129,9 @@ BUILT_SOURCES = \
 	sound-service-client.h \
   sound-service-server.h \
   $(music_bridge_APIFILES) \
-	gen-indicator-service.xml.h \
-	gen-indicator-service.xml.c \
+	gen-sound-service.xml.h \
+	gen-sound-service.xml.c \
   $(music_bridge_VALASOURCES:.vala=.c)
-
+  
 CLEANFILES = \
 	$(BUILT_SOURCES)
-
-- 
cgit v1.2.3


From 82425f25064d97b0feb2c0c5cdc839558bf5f51f Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 10 Jan 2011 20:25:36 +0000
Subject: getting there

---
 src/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index b45da22..0443029 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,8 +126,6 @@ EXTRA_DIST = \
 #######################
 BUILT_SOURCES = \
 	music_bridge_vala.stamp \
-	sound-service-client.h \
-  sound-service-server.h \
   $(music_bridge_APIFILES) \
 	gen-sound-service.xml.h \
 	gen-sound-service.xml.c \
-- 
cgit v1.2.3


From 9452f0262c608fc1ee6509078b3538f68b5f0993 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 10 Jan 2011 16:47:20 -0600
Subject: now building

---
 src/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 0443029..99a00c0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,6 +93,8 @@ indicator_sound_service_SOURCES = \
   sound-service-dbus.c \
   slider-menu-item.h \
   slider-menu-item.c \
+  gen-sound-service.xml.h \  
+  gen-sound-service.xml.c \
   $(music_bridge_VALASOURCES:.vala=.c)
 
 indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall
-- 
cgit v1.2.3


From 590a3ad4a7bf384a7023365c85e127a42cd4b5b2 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 11 Jan 2011 03:57:41 -0600
Subject: more warnings sorted

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

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 99a00c0..22f88d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ libsoundmenu_la_SOURCES = \
             volume-widget.h \
             dbus-shared-names.h
 
-libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -DG_LOG_DOMAIN=\"Indicator-Sound\"
+libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
 libsoundmenu_la_LIBADD = $(APPLET_LIBS)
 libsoundmenu_la_LDFLAGS = -module -avoid-version
 
-- 
cgit v1.2.3


From 81b77951c81a3086f7c4e5849cfd061e3dcb8ef3 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Tue, 11 Jan 2011 04:41:33 -0600
Subject: silly me

---
 src/Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 22f88d7..32b6928 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,8 @@ libsoundmenu_la_SOURCES = \
             title-widget.h \
             volume-widget.c \
             volume-widget.h \
+            gen-sound-service.xml.h \
+            gen-sound-service.xml.c \
             dbus-shared-names.h
 
 libsoundmenu_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
@@ -35,7 +37,7 @@ checkxml: $(srcdir)/sound-service.xml
 
 
 #####################
-# libsoundmenu vala
+# Sound service vala
 #####################
 music_bridge_VALASOURCES = \
 	music-player-bridge.vala \
@@ -79,7 +81,7 @@ music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
 	touch music_bridge_vala.stamp
 
 ###############################
-# libsoundmenu C
+# Sound Service C
 ###############################
 indicator_sound_service_SOURCES = \
 	common-defs.h \
-- 
cgit v1.2.3