[libchamplain] Some build fixes

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

commit f626336e726bbb7ee64ea11db64ea2a0fba94bd7
Author: JiÅ?í Techet <techet gmail com>
Date:   Sat May 8 15:20:14 2010 +0200

    Some build fixes
    
    make distcheck should work now
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 Makefile.am                 |   19 +++++++++++++++----
 bindings/python/Makefile.am |    3 +--
 champlain-gtk/Makefile.am   |    2 +-
 champlain/Makefile.am       |    8 ++++++--
 configure.ac                |   37 +++++++++++++++++--------------------
 5 files changed, 40 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b1abb73..ae7b47f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tidy champlain docs/reference
+SUBDIRS = tidy champlain
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -10,7 +10,7 @@ champlain- CHAMPLAIN_API_VERSION@-uninstalled.pc: champlain-uninstalled.pc
 	@cp -f $< $@
 
 if ENABLE_GTK
-SUBDIRS += champlain-gtk docs/reference-gtk
+SUBDIRS += champlain-gtk
 pcfiles += champlain-gtk- CHAMPLAIN_API_VERSION@.pc
 champlain-gtk- CHAMPLAIN_API_VERSION@.pc: champlain-gtk.pc
 	@cp -f $< $@
@@ -31,13 +31,24 @@ endif
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --disable-python --disable-introspection
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-python --enable-memphis --disable-introspection
+
+EXTRA_DIST = \
+	champlain-gtk.pc.in \
+	champlain-gtk-uninstalled.pc.in \
+	champlain-memphis.pc.in \
+	champlain-memphis-uninstalled.pc.in \
+	champlain.pc.in \
+	champlain-uninstalled.pc.in
 
 CLEANFILES = $(pcfiles) $(other_pcfiles)
+
 all: $(other_pcfiles)
 
 # Have the demos build at the end as they depend on optional parts
-SUBDIRS += demos bindings
+SUBDIRS += docs demos bindings
+
+DIST_SUBDIRS = tidy champlain champlain-gtk docs demos bindings
 
 ChangeLog: Makefile.am
 	git log --pretty=short > ChangeLog
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 9eb2262..902d48f 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,7 +1,6 @@
-SUBDIRS = champlain
+SUBDIRS = champlain demos
 
 if ENABLE_GTK
 SUBDIRS += champlain-gtk
 endif
 
-DIST_SUBDIRS = champlain champlain-gtk demos
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index e7a7d2d..2c4e8c9 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -71,7 +71,7 @@ gir_DATA = $(BUILT_GIRSOURCES)
 typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
+GtkChamplain- CHAMPLAIN_API_VERSION@.typelib: GtkChamplain- CHAMPLAIN_API_VERSION@.gir $(INTROSPECTION_COMPILER)
 	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. --includedir=$(top_builddir)/champlain $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index b8e00ba..d37ef07 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -5,7 +5,11 @@ BUILT_SOURCES = \
 	champlain-enum-types.h \
 	champlain-enum-types.c \
 	stamp-enum-types \
-	champlain-version.h
+	champlain-version.h \
+	champlain-features.h
+
+champlain-features.h:
+	cd $(top_builddir) && ./config.status src/$@
 
 CLEANFILES = $(BUILT_SOURCES)
 
@@ -218,7 +222,7 @@ gir_DATA = $(BUILT_GIRSOURCES)
 typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
+Champlain- CHAMPLAIN_API_VERSION@.typelib: Champlain- CHAMPLAIN_API_VERSION@.gir $(INTROSPECTION_COMPILER)
 	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/configure.ac b/configure.ac
index 0ce2a25..3c4a4c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,12 +121,6 @@ if test x$enable_gtk = xyes; then
   )
   AC_SUBST(GTK_CFLAGS)
   AC_SUBST(GTK_LIBS)
-
-  AC_CONFIG_FILES([champlain-gtk/Makefile
-                   docs/reference-gtk/Makefile
-                   docs/reference-gtk/version.xml
-                   champlain-gtk.pc
-                   champlain-gtk-uninstalled.pc])
 fi
 
 AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
@@ -145,12 +139,8 @@ elif test "x$enable_memphis" = "xyes"; then
   PKG_CHECK_MODULES(MEMPHIS, [memphis-0.2 >= 0.2.1])
 fi
 
-if test "x$enable_memphis" = "xyes"; then
-  AC_CONFIG_FILES([champlain-memphis.pc
-                   champlain-memphis-uninstalled.pc])
-  AC_SUBST(MEMPHIS_CFLAGS)
-  AC_SUBST(MEMPHIS_LIBS)
-fi
+AC_SUBST(MEMPHIS_CFLAGS)
+AC_SUBST(MEMPHIS_LIBS)
 
 AM_CONDITIONAL(ENABLE_MEMPHIS, test "x$enable_memphis" = "xyes")
 
@@ -186,13 +176,6 @@ if test x$enable_python = xyes; then
   fi
 
   AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(Could not find python headers)])
-
-  AC_CONFIG_FILES([bindings/python/Makefile
-                   bindings/python/update-binding.sh
-                   bindings/python/champlain/Makefile
-                   bindings/python/champlain-gtk/Makefile
-                   bindings/python/demos/Makefile],
-                  [chmod +x bindings/python/update-binding.sh])
 fi
 
 AM_CONDITIONAL(ENABLE_PYTHON, test "x$enable_python" = "xyes")
@@ -229,11 +212,25 @@ AC_CONFIG_FILES([Makefile
                  champlain/champlain-version.h
                  demos/Makefile
                  tidy/Makefile
+                 docs/Makefile
                  docs/reference/Makefile
                  docs/reference/version.xml
+                 docs/reference-gtk/Makefile
+                 docs/reference-gtk/version.xml
                  champlain.pc
                  champlain-uninstalled.pc
-                 bindings/Makefile])
+                 champlain-gtk.pc
+                 champlain-gtk-uninstalled.pc
+                 champlain-gtk/Makefile
+                 bindings/Makefile
+                 bindings/python/Makefile
+                 bindings/python/champlain/Makefile
+                 bindings/python/champlain-gtk/Makefile
+                 bindings/python/demos/Makefile
+                 champlain-memphis.pc
+                 champlain-memphis-uninstalled.pc])
+AC_CONFIG_FILES([bindings/python/update-binding.sh],
+                [chmod +x bindings/python/update-binding.sh])
 AC_OUTPUT
 
 echo ""