Fix bindings distribution

diff --git a/Makefile.am b/Makefile.am
index 25801cbf3c42c3e9a9d9f2e318868020fca5fb82..004e26a8cabc5f662020ae1ef0be2f77aa6ede7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,10 +13,6 @@ champlain-gtk-@API_VERSION@.pc: champlain-gtk.pc
        @cp -f $< $@
 endif
 
-if ENABLE_PYTHON
-SUBDIRS += bindings/python
-endif
-
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -28,4 +24,4 @@ CLEANFILES = $(pcfiles)
 SUBDIRS += demos bindings
 
 ChangeLog: Makefile.am
-       git-log --pretty=short > ChangeLog
+       git log --pretty=short > ChangeLog

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index eefcaad2d5c8df3fe818fc66162c789cf8b00d72..b7256efa116b229272dc2a36d8ea1ebeddb7ed1f 100644 (file)
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -3,3 +3,5 @@ SUBDIRS = champlain
 if ENABLE_GTK
 SUBDIRS += champlain-gtk
 endif
+
+DIST_SUBDIRS= champlain champlain-gtk demos

diff --git a/bindings/python/demos/Makefile.am b/bindings/python/demos/Makefile.am
new file mode 100644 (file)
index 0000000..0068b3d
--- /dev/null
+++ b/bindings/python/demos/Makefile.am
@@ -0,0 +1,2 @@
+
+EXTRA_DIST= capitals.py animated-marker.py demomarkers.py launcher-gtk.py

diff --git a/configure.ac b/configure.ac
index eb574394d0deeccef08fb4ca3dd4099f55a2df38..07795cb5ac1daeb2c1dd734e61b25d82824de3d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -154,16 +154,6 @@ if test x$enable_managed = xyes; then
   AC_SUBST(CHAMPLAIN_GTK_APIVERSION)
 
   AC_CONFIG_FILES([
-    bindings/managed/Makefile
-    bindings/managed/champlain/Makefile
-    bindings/managed/champlain/AssemblyInfo.cs
-    bindings/managed/champlain/champlain-sharp.pc
-    bindings/managed/champlain/champlain-sharp.dll.config
-    bindings/managed/champlain-gtk/Makefile
-    bindings/managed/champlain-gtk/AssemblyInfo.cs
-    bindings/managed/champlain-gtk/champlain-gtk-sharp.pc
-    bindings/managed/champlain-gtk/champlain-gtk-sharp.dll.config
-    bindings/managed/samples/Makefile
   ])
 fi
 
@@ -189,12 +179,6 @@ if test x$enable_python = xyes; then
       gtk+-2.0
    ], have_python="yes", have_python="no")
 
-  AC_CONFIG_FILES([
-   bindings/python/Makefile
-   bindings/python/champlain/Makefile
-   bindings/python/champlain-gtk/Makefile
-  ])
-
   if test "x$have_python" = "xyes" ; then
     AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0])
     AM_CHECK_PYTHON_HEADERS(,have_python="no")
@@ -216,6 +200,20 @@ AC_CONFIG_FILES([Makefile
                  docs/reference/Makefile
                  docs/reference/version.xml
                  champlain.pc
+                 bindings/python/Makefile
+                 bindings/python/champlain/Makefile
+                 bindings/python/champlain-gtk/Makefile
+                 bindings/python/demos/Makefile
+                 bindings/managed/Makefile
+                 bindings/managed/champlain/Makefile
+                 bindings/managed/champlain/AssemblyInfo.cs
+                 bindings/managed/champlain/champlain-sharp.pc
+                 bindings/managed/champlain/champlain-sharp.dll.config
+                 bindings/managed/champlain-gtk/Makefile
+                 bindings/managed/champlain-gtk/AssemblyInfo.cs
+                 bindings/managed/champlain-gtk/champlain-gtk-sharp.pc
+                 bindings/managed/champlain-gtk/champlain-gtk-sharp.dll.config
+                 bindings/managed/samples/Makefile
                  bindings/Makefile])
 AC_OUTPUT
 

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 2d539ce8d5c0682f2e90bbc1e8f3ac09798bbd44..51263c174a43165a43d9c6065004b484cfeeee61 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -19,3 +19,5 @@ launcher_gtk_LDADD = $(GTK_DEPS_LIBS) $(DEPS_LIBS) \
                ../champlain-gtk/libchamplain-gtk-0.3.la \
                ../champlain/libchamplain-0.3.la
 endif
+
+EXTRA_DIST= markers.h