[libgdata/libgdata-0-6] Bug 616222 — libgdata fails to build from a remote directory

[Philip Withnall <pwithnall src gnome org>]

commit 83d32edd45c8d1244fd12c728f3af29ca67282ba
Author: Paul Smith <psmith gnu org>
Date:   Fri Apr 23 14:13:09 2010 +0100

    Bug 616222 â?? libgdata fails to build from a remote directory
    
    Be more strict in our use of top_[srcdir|builddir]. Closes: bgo#616222

 Makefile.am |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d9ad164..778b27b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,11 +9,11 @@ GDATA_MARSHAL_FILES = \
 	gdata/gdata-marshal.h
 
 gdata/gdata-marshal.h: $(top_srcdir)/gdata/gdata-marshal.list Makefile
-	$(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=gdata_marshal $(srcdir)/gdata/gdata-marshal.list --header > $@)
-gdata/gdata-marshal.c: $(top_srcdir)/gdata/gdata-marshal.h Makefile
-	$(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=gdata_marshal $(srcdir)/gdata/gdata-marshal.list --header --body > $@)
+	$(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=gdata_marshal $(top_srcdir)/gdata/gdata-marshal.list --header > $@)
+gdata/gdata-marshal.c: gdata/gdata-marshal.h Makefile
+	$(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=gdata_marshal $(top_srcdir)/gdata/gdata-marshal.list --header --body > $@)
 
-EXTRA_DIST = gdata/gdata-marshal.list
+EXTRA_DIST = $(top_srcdir)/gdata/gdata-marshal.list
 CLEANFILES = $(GDATA_MARSHAL_FILES)
 
 # Enums
@@ -334,14 +334,18 @@ gdata_libgdata_la_SOURCES = \
 
 # All but the first two -I flags here are to cope with compiling the enum files in a srcdir!=builddir environment
 gdata_libgdata_la_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdata		\
-	-I$(top_srcdir)/gdata/media	\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/gdata				\
+	-I$(top_srcdir)/gdata/media			\
 	-I$(top_srcdir)/gdata/services/documents	\
 	-I$(top_srcdir)/gdata/services/picasaweb	\
 	-I$(top_srcdir)/gdata/services/youtube		\
-	-DG_LOG_DOMAIN=\"libgdata\"	\
-	$(DISABLE_DEPRECATED)		\
+	-I$(top_builddir)/gdata				\
+	-I$(top_builddir)/gdata/media			\
+	-I$(top_builddir)/gdata/services/picasaweb	\
+	-I$(top_builddir)/gdata/services/youtube	\
+	-DG_LOG_DOMAIN=\"libgdata\"			\
+	$(DISABLE_DEPRECATED)				\
 	$(AM_CPPFLAGS)
 
 gdata_libgdata_la_CFLAGS = \