[glib/glib-2-32] Dist gio/dbus-daemon.xml and fix dependency for builddir != srcdir

[Ryan Lortie <ryanl src gnome org>]

commit b6031518d051160d36aef4bc24b4a0b3fad7c5ca
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Apr 26 10:05:41 2012 +0200

    Dist gio/dbus-daemon.xml and fix dependency for builddir != srcdir

 gio/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/Makefile.am b/gio/Makefile.am
index a8abaaf..d4f0e88 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -96,12 +96,12 @@ gdbus_sources = 							\
 	$(NULL)
 
 # These are not built into the library yet
-EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h
+EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h dbus-daemon.xml
 
-gdbus-daemon-generated.h gdbus-daemon-generated.c : dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in
+gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in
 	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
 		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-		$(PYTHON) $(top_srcdir)/gio/gdbus-2.0/codegen/gdbus-codegen.in \
+		$(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
 		--interface-prefix org. \
 		--generate-c-code gdbus-daemon-generated \
 		--c-namespace _G \