From ef6b3b8daaef62a502c60e0faa22c3a4b10c0399 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 13 Nov 2012 13:32:15 +0100
Subject: Move service .xml into a common directory

Both the service (in src/) and the client library (in libmessaging-menu/) need
access to the dbus interface description file.  Until now, it resided in src,
with both Makefiles calling gdbus-codegen on it.

This patch moves the file to common/ and builds a convenience library that
contains only the generated code.
---
 libmessaging-menu/Makefile.am | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'libmessaging-menu')

diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am
index 15d0c9b..411f7ff 100644
--- a/libmessaging-menu/Makefile.am
+++ b/libmessaging-menu/Makefile.am
@@ -7,36 +7,24 @@ libmessaging_menu_la_SOURCES = \
 	messaging-menu-app.c \
 	messaging-menu-message.c \
 	gtupleaction.c \
-	gtupleaction.h \
-	$(BUILT_SOURCES)
+	gtupleaction.h
 
 libmessaging_menu_la_HEADERS = \
 	messaging-menu-app.h \
 	messaging-menu.h \
 	messaging-menu-message.h
 
-libmessaging_menu_la_LIBADD = $(GIO_LIBS)
+libmessaging_menu_la_LIBADD = \
+	$(GIO_LIBS) \
+	$(top_builddir)/common/libmessaging-common.la
 
 libmessaging_menu_la_CFLAGS = \
+	-I$(top_builddir)/common \
 	$(GIO_CFLAGS) \
 	-Wall
 
 libmessaging_menu_la_LDFLAGS = -export-symbols-regex "^messaging_menu_.*"
 
-BUILT_SOURCES = \
-	indicator-messages-service.c \
-	indicator-messages-service.h
-
-CLEANFILES = $(BUILT_SOURCES)
-
-indicator-messages-service.c: $(top_srcdir)/src/messages-service.xml
-	$(AM_V_GEN) gdbus-codegen \
-	    --interface-prefix com.canonical.indicator.messages. \
-	    --generate-c-code indicator-messages-service \
-	    --c-namespace IndicatorMessages \
-	    $^
-indicator-messages-service.h: indicator-messages-service.c
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = messaging-menu.pc
 
@@ -69,5 +57,5 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES +=$(gir_DATA) $(typelib_DATA)
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
 endif
-- 
cgit v1.2.3