From 99b10244878a69b645aeaae552934e4876359a87 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Mon, 4 May 2009 21:47:40 -0400 Subject: [PATCH] Fix bindings distribution --- Makefile.am | 6 +----- bindings/python/Makefile.am | 2 ++ bindings/python/demos/Makefile.am | 2 ++ configure.ac | 30 ++++++++++++++---------------- demos/Makefile.am | 2 ++ 5 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 bindings/python/demos/Makefile.am diff --git a/Makefile.am b/Makefile.am index 25801cb..004e26a 100644 --- 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 eefcaad..b7256ef 100644 --- 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 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 eb57439..07795cb 100644 --- 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 2d539ce..51263c1 100644 --- 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 -- 2.39.5