[libchamplain] Fix some introspection build problems

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

commit 1910e8c6745b4cea7c4d1b8b4d14b31ab391c9cd
Author: JiÅ?í Techet <techet gmail com>
Date:   Sat May 8 00:20:26 2010 +0200

    Fix some introspection build problems
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 champlain-gtk/Makefile.am |    1 +
 champlain/Makefile.am     |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index f1ff8fe..e7a7d2d 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -47,6 +47,7 @@ GtkChamplain- CHAMPLAIN_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libchamplain-
 	$(SOUP_CFLAGS) \
 	-I$(top_srcdir)			\
 	-DCHAMPLAIN_COMPILATION 	\
+	-DCHAMPLAIN_GTK_COMPILATION 	\
 	--add-include-path=$(top_builddir)/champlain \
 	--c-include="$(libchamplain_include_HEADERS)" \
 	--include=Champlain-0.5 \
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index bdaa33e..b8e00ba 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -5,7 +5,7 @@ BUILT_SOURCES = \
 	champlain-enum-types.h \
 	champlain-enum-types.c \
 	stamp-enum-types \
-	champlain-version.h 
+	champlain-version.h
 
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -108,7 +108,7 @@ libchamplain_include_HEADERS = \
 	champlain-marker.h		\
 	champlain-polygon.h		\
 	champlain-version.h		\
-	champlain-features.h		
+	champlain-features.h
 
 libchamplain_ CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) $(MEMPHIS_LIBS) ../tidy/libtidy-1.0.la
 
@@ -191,6 +191,7 @@ Champlain- CHAMPLAIN_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libchamplain- CH
 	--strip-prefix=Champlain \
 	$(DEPS_CFLAGS) \
 	$(SOUP_CFLAGS) \
+	$(MEMPHIS_CFLAGS) \
 	-I$(top_srcdir)/tidy		\
 	-I$(top_srcdir)			\
 	-DCHAMPLAIN_COMPILATION 	\