[#1220] Explicitly generate glue files before building the library

sflphone-client-gnome/src/dbus/Makefile.am

 include ../../globals.mak
 
-GENHEADERS= \
+noinst_LTLIBRARIES=libdbus.la
+
+BUILD_SOURCES=                      \
     callmanager-glue.h              \
     configurationmanager-glue.h     \
-	instance-glue.h
-
-MARSHALLER_SOURCES= \
+    instance-glue.h                 \
     marshaller.c                    \
     marshaller.h
 
-EXTRA_DIST=marshaller.list  
-
-CLEANFILES= \
-	$(GENHEADERS) \
-	$(MARSHALLER_SOURCES)
-
 # Rule to generate the binding headers
 %-glue.h: ../../../src/dbus/%-introspec.xml Makefile.am
 	dbus-binding-tool --mode=glib-client $<  > $@
 
-# Create the necessary marshallers for the signals implemented by the
-# library
-
-marshaller.h: marshaller.list Makefile.am
-	glib-genmarshal --header --g-fatal-warnings $< > $@
-
+# Create the necessary marshallers for the signals implemented by the library
 marshaller.c: marshaller.list
 	glib-genmarshal --body --g-fatal-warnings $< > $@
 
-noinst_LTLIBRARIES = libdbus.la
-libdbus_la_SOURCES = dbus.c \
-	$(MARSHALLER_SOURCES) \
-	$(GENHEADERS)
+marshaller.h: marshaller.list
+	glib-genmarshal --header --g-fatal-warnings $< > $@
+
+libdbus_la_SOURCES=     \
+    dbus.c              \
+    $(BUILD_SOURCES)
 
 libdbus_la_LDFLAGS= @DEPS_LDFLAGS@
 libdbus_la_CFLAGS= @DEPS_CFLAGS@
+
+EXTRA_DIST= \
+    marshaller.list
+
+CLEANFILES= \
+    $(BUILD_SOURCES)

src/dbus/Makefile.am

 include $(top_srcdir)/globals.mak
 
-EXTRA_DIST = *.xml README
+noinst_LTLIBRARIES = libdbus.la
 
-GENHEADERS= \
+BUILD_SOURCES=                      \
     callmanager-glue.h              \
     configurationmanager-glue.h     \
     instance-glue.h
 
-CLEANFILES= \
-	$(GENHEADERS)
-
 # Rule to generate the binding headers
 %-glue.h: %-introspec.xml Makefile.am
 	dbusxx-xml2cpp $< --adaptor=$@
 
-noinst_LTLIBRARIES = libdbus.la
-
 libdbus_la_SOURCES = \
     callmanager.cpp \
     configurationmanager.cpp  \
@@ -27,12 +22,12 @@ libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphon
 libdbus_la_LIBADD = $(top_srcdir)/libs/dbus-c++/src/libdbus-c++-1.la
 
 noinst_HEADERS =            \
-	$(GENHEADERS) \
     callmanager.h           \
     configurationmanager.h  \
     instance.h              \
     dbusmanager.h           \
-	dbusmanagerimpl.h
+    dbusmanagerimpl.h       \
+    $(BUILD_SOURCES)
 
 # Dbus service file
 servicedir = $(DBUS_SERVICES_DIR)
@@ -42,3 +37,8 @@ service_DATA = $(service_in_files:.service.in=.service)
 # Rule to make the service file with bindir expanded
 $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|bindir|$(prefix)/bin|" $<> $@
+
+EXTRA_DIST = *.xml README
+
+CLEANFILES= \
+    $(BUILD_SOURCES)