From af582ad4697437ea7eb76889f2242e3928d06ead Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Tue, 11 Jan 2011 17:32:32 -0600
Subject: port to gdbus

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

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 23f5727..49a4d6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,11 +39,8 @@ libapplication_la_LDFLAGS = -module -avoid-version
 libexec_PROGRAMS = indicator-application-service
 
 BUILT_SOURCES += \
-	application-service-server.h \
 	application-service-marshal.h \
 	application-service-marshal.c \
-	dbus-properties-client.h \
-	notification-item-client.h \
 	notification-watcher-server.h
 
 indicator_application_service_SOURCES = \
@@ -53,6 +50,7 @@ indicator_application_service_SOURCES = \
 	application-service-marshal.c \
 	application-service-watcher.h \
 	application-service-watcher.c \
+	gen-application-service.xml.c \
 	app-indicator-enum-types.c \
 	dbus-shared.h \
 	generate-id.h \
@@ -81,11 +79,11 @@ DISTCLEANFILES += app-indicator-enum-types.c
 # DBus Specs
 ##################################
 
+GDBUS_SPECS = \
+	application-service.xml
+
 DBUS_SPECS = \
-	dbus-properties.xml \
-	application-service.xml \
 	notification-approver.xml \
-	notification-item.xml \
 	notification-watcher.xml
 
 %-client.h: %.xml
@@ -102,10 +100,22 @@ DBUS_SPECS = \
 		--output=$@ \
 		$<
 
+gen-%.xml.c: %.xml
+	@echo "Building $@ from $<"
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	@echo ";" >> $@
+
+gen-%.xml.h: %.xml
+	@echo "Building $@ from $<"
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+
 BUILT_SOURCES += \
 	$(DBUS_SPECS:.xml=-client.h) \
-	$(DBUS_SPECS:.xml=-server.h)
+	$(DBUS_SPECS:.xml=-server.h) \
+	gen-application-service.xml.c \
+	gen-application-service.xml.h
 
 CLEANFILES += $(BUILT_SOURCES)
 
-EXTRA_DIST += $(DBUS_SPECS)
+EXTRA_DIST += $(DBUS_SPECS) $(GDBUS_SPECS)
-- 
cgit v1.2.3


From 4b0e0720e7b2d0ace18dc6bffc7c073b59af5565 Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
Date: Wed, 12 Jan 2011 11:16:55 -0500
Subject: fix bug with gvariant string; port test

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

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 49a4d6a..35c40c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,10 +80,10 @@ DISTCLEANFILES += app-indicator-enum-types.c
 ##################################
 
 GDBUS_SPECS = \
-	application-service.xml
+	application-service.xml \
+	notification-approver.xml
 
 DBUS_SPECS = \
-	notification-approver.xml \
 	notification-watcher.xml
 
 %-client.h: %.xml
@@ -114,7 +114,9 @@ BUILT_SOURCES += \
 	$(DBUS_SPECS:.xml=-client.h) \
 	$(DBUS_SPECS:.xml=-server.h) \
 	gen-application-service.xml.c \
-	gen-application-service.xml.h
+	gen-application-service.xml.h \
+	gen-notification-approver.xml.c \
+	gen-notification-approver.xml.h
 
 CLEANFILES += $(BUILT_SOURCES)
 
-- 
cgit v1.2.3