[baobab] Fix srcdir != builddir

[Giovanni Campagna <gcampagna src gnome org>]

commit 1f2a72e8263c2d26931f1f70a2a60b5cfc14a1d4
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed Jan 2 01:39:15 2013 +0100

    Fix srcdir != builddir
    
    Includes an update of libgd to current master for a similar fix.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=690974

 libgd           |    2 +-
 src/Makefile.am |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libgd b/libgd
index f5cc816..1de58d4 160000
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit f5cc816c2de4bf1f077b0e0b03c68b81a9f35fca
+Subproject commit 1de58d47f4e28e3c2b19402e54ecab1dd6f749fd
diff --git a/src/Makefile.am b/src/Makefile.am
index 89d842c..bbd6930 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = baobab
 BUILT_SOURCES = baobab-resources.c
 
 baobab_VALAFLAGS = \
-	--vapidir=$(top_srcdir)/libgd	\
+	--vapidir=$(top_builddir)/libgd	\
 	--pkg gtk+-3.0		\
 	--pkg gio-2.0		\
 	--pkg gio-unix-2.0	\
@@ -46,8 +46,8 @@ baobab_SOURCES = \
 	egg-list-box.c			\
 	$(BUILT_SOURCES)
 
-baobab-resources.c: baobab.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies baobab.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source baobab.gresource.xml
+baobab-resources.c: baobab.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/baobab.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 AM_CFLAGS = \
 	$(BAOBAB_CFLAGS)		\