[libchamplain] Make introspection compilation work in other directory too

[Jiří Techet <jiritechet src gnome org>]

commit 0014f85bde1d72add50f618d4e8eb9ecbe4e51f8
Author: JiÅ?í Techet <techet gmail com>
Date:   Fri May 14 20:57:34 2010 +0200

    Make introspection compilation work in other directory too
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 Makefile.am               |    2 +-
 champlain-gtk/Makefile.am |   10 ++++++----
 champlain/Makefile.am     |    9 +++++----
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5db13fe..0a6bc2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ endif
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-python --enable-memphis --disable-introspection
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-python --enable-memphis
 
 EXTRA_DIST = \
 	champlain-gtk.pc.in \
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 01e6b88..926ae3b 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -42,16 +42,18 @@ if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/champlain
-INTROSPECTION_COMPILER_ARGS = 
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+introspection_sources = \
+	$(libchamplain_gtk_ CHAMPLAIN_API_VERSION@_la_SOURCES) \
+	$(libchamplain_include_HEADERS)
 
 GtkChamplain- CHAMPLAIN_API_VERSION@.gir: libchamplain-gtk- CHAMPLAIN_API_VERSION@.la
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk- CHAMPLAIN_API_VERSION@.la
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-2.0
-GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = \
-	$(libchamplain_gtk_ CHAMPLAIN_API_VERSION@_la_SOURCES) \
-	$(libchamplain_include_HEADERS)
+GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = --strip-prefix=GtkChamplain
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 Champlain- CHAMPLAIN_API_VERSION@
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 5673d47..349e1c1 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -161,8 +161,11 @@ if HAVE_INTROSPECTION
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = 
+INTROSPECTION_SCANNER_ARGS =
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+introspection_sources = \
+	$(libchamplain_ CHAMPLAIN_API_VERSION@_la_SOURCES) \
+	$(libchamplain_include_HEADERS)
 
 if ENABLE_MEMPHIS
 memphis_gir_include = Memphis-0.2
@@ -174,9 +177,7 @@ Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = --strip-prefix=Champla
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain- CHAMPLAIN_API_VERSION@.la
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-2.0
-Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = \
-	$(libchamplain_ CHAMPLAIN_API_VERSION@_la_SOURCES) \
-	$(libchamplain_include_HEADERS)
+Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 $(memphis_gir_include)
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
 	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(MEMPHIS_CFLAGS) \