[gvfs/gdbus-core: 30/49] gdbus: Fix srcdir != builddir and make the build more quiet

[Tomas Bzatek <tbzatek src gnome org>]

commit 8702019ec946d3ade84efa4f7e42e39f73f7bf6a
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Fri Jul 20 16:12:19 2012 +0200

    gdbus: Fix srcdir != builddir and make the build more quiet

 client/Makefile.am   |    2 ++
 common/Makefile.am   |    4 ++--
 daemon/Makefile.am   |    1 +
 metadata/Makefile.am |    4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/client/Makefile.am b/client/Makefile.am
index ba7fea2..66ab130 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = -I$(top_srcdir) \
 	-I$(top_srcdir)/metadata \
 	-I$(top_builddir)/metadata \
 	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	$(GLIB_CFLAGS) $(DBUS_CFLAGS) \
 	-DG_LOG_DOMAIN=\"GVFS\" \
 	-DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"	\
@@ -74,6 +75,7 @@ gvfsd_fuse_SOURCES = \
 gvfsd_fuse_CFLAGS = \
 	-I$(top_srcdir) \
         -I$(top_srcdir)/common \
+        -I$(top_builddir)/common \
         $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
         -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
         -DDBUS_API_SUBJECT_TO_CHANGE
diff --git a/common/Makefile.am b/common/Makefile.am
index f780968..93e215f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -12,7 +12,7 @@ dbus_built_sources = gvfsdbus.c gvfsdbus.h
 BUILT_SOURCES = $(dbus_built_sources)
 
 $(dbus_built_sources) : Makefile.am dbus-interfaces.xml
-	gdbus-codegen					\
+	$(AM_V_GEN) gdbus-codegen			\
 		--interface-prefix org.gtk.vfs.		\
 		--c-namespace GVfsDBus			\
 		--generate-c-code gvfsdbus		\
@@ -22,7 +22,7 @@ $(dbus_built_sources) : Makefile.am dbus-interfaces.xml
 		  org.gtk.GDBus.C.UnixFD true		\
 		--annotate "org.gtk.vfs.Mount.OpenIconForRead()"	\
 		  org.gtk.GDBus.C.UnixFD true		\
-		dbus-interfaces.xml			\
+		$(srcdir)/dbus-interfaces.xml		\
 		$(NULL)
 
 libgvfscommon_la_SOURCES = 	\
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index bc9da0a..e455d66 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/common			\
 	-I$(top_builddir)			\
+	-I$(top_builddir)/common		\
 	$(GLIB_CFLAGS) $(DBUS_CFLAGS) 		\
 	$(OBEXFTP_CFLAGS) $(EXPAT_CFLAGS)	\
 	$(KEYRING_CFLAGS)			\
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index ee4896b..2557994 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -4,11 +4,11 @@ dbus_built_sources = metadata-dbus.c metadata-dbus.h
 BUILT_SOURCES = $(dbus_built_sources)
 
 $(dbus_built_sources) : Makefile.am dbus-interface.xml
-	gdbus-codegen						\
+	$(AM_V_GEN) gdbus-codegen				\
 		--interface-prefix org.gtk.vfs.			\
 		--c-namespace GVfs				\
 		--generate-c-code metadata-dbus			\
-		$(srcdir)/dbus-interface.xml				\
+		$(srcdir)/dbus-interface.xml			\
 		$(NULL)
 
 noinst_LTLIBRARIES=libmetadata.la