Use automatic version generation for Vala bindings where possible

+ some minor cleanups

Signed-off-by: Jiří Techet <techet@gmail.com>

12 files changed, 32 insertions, 38 deletions

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 38b0301..76d852a 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -8,4 +8,3 @@ if ENABLE_MEMPHIS
   SUBDIRS += champlain-memphis
 endif
 
-DIST_SUBDIRS = champlain champlain-gtk champlain-memphis demos
diff --git a/bindings/vala/champlain-gtk/Makefile.am b/bindings/vala/champlain-gtk/Makefile.am
index 3238a83..bd3d8ce 100644
--- a/bindings/vala/champlain-gtk/Makefile.am
+++ b/bindings/vala/champlain-gtk/Makefile.am
@@ -6,8 +6,7 @@
 vapidir = $(datadir)/vala/vapi
 
 dist_vapi_DATA = \
-	champlain-gtk-0.6.vapi \
-	champlain-gtk-0.6.deps \
+	champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi \
+	champlain-gtk-@CHAMPLAIN_API_VERSION@.deps \
 	$(NULL)
 
-EXTRA_DIST = champlain-gtk-0.6.vapi
diff --git a/bindings/vala/champlain-gtk/create.sh b/bindings/vala/champlain-gtk/create.sh
deleted file mode 100644
index c2bda78..0000000
--- a/bindings/vala/champlain-gtk/create.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export PKG_CONFIG_PATH=$(readlink -f ../../../)
-echo $PKG_CONFIG_PATH
-vala-gen-introspect champlain-gtk-0.6 champlain-gtk-0.6
-vapigen --library champlain-gtk-0.6 --pkg clutter-gtk-0.10 --pkg gtk+-2.0 --pkg champlain-0.6 --vapidir=../champlain champlain-gtk-0.6/champlain-gtk-0.6.gi --metadata champlain-gtk-0.6/champlain-gtk-0.6.metadata
diff --git a/bindings/vala/champlain-gtk/create.sh.in b/bindings/vala/champlain-gtk/create.sh.in
new file mode 100644
index 0000000..3ef70cc
--- /dev/null
+++ b/bindings/vala/champlain-gtk/create.sh.in
@@ -0,0 +1,4 @@
+export PKG_CONFIG_PATH=$(readlink -f ../../../)
+
+vala-gen-introspect champlain-gtk-@CHAMPLAIN_API_VERSION@ champlain-gtk-@CHAMPLAIN_API_VERSION@
+vapigen --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-0.10 --pkg gtk+-2.0 --pkg champlain-@CHAMPLAIN_API_VERSION@ --vapidir=../champlain champlain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk-@CHAMPLAIN_API_VERSION@.gi --metadata champlain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk-@CHAMPLAIN_API_VERSION@.metadata
diff --git a/bindings/vala/champlain-memphis/Makefile.am b/bindings/vala/champlain-memphis/Makefile.am
index e3e4a32..0ae865e 100644
--- a/bindings/vala/champlain-memphis/Makefile.am
+++ b/bindings/vala/champlain-memphis/Makefile.am
@@ -6,8 +6,7 @@
 vapidir = $(datadir)/vala/vapi
 
 dist_vapi_DATA = \
-	champlain-memphis-0.6.vapi \
-	champlain-memphis-0.6.deps \
+	champlain-memphis-@CHAMPLAIN_API_VERSION@.vapi \
+	champlain-memphis-@CHAMPLAIN_API_VERSION@.deps \
 	$(NULL)
 
-EXTRA_DIST = champlain-memphis-0.6.vapi
diff --git a/bindings/vala/champlain-memphis/create.sh b/bindings/vala/champlain-memphis/create.sh
deleted file mode 100644
index eced563..0000000
--- a/bindings/vala/champlain-memphis/create.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export PKG_CONFIG_PATH=$(readlink -f ../../../)
-
-vala-gen-introspect champlain-memphis-0.6 champlain-memphis-0.6
-vapigen --library champlain-memphis-0.6 --pkg champlain-0.6 --vapidir=../champlain champlain-memphis-0.6/champlain-memphis-0.6.gi --metadata champlain-memphis-0.6/champlain-memphis-0.6.metadata
diff --git a/bindings/vala/champlain-memphis/create.sh.in b/bindings/vala/champlain-memphis/create.sh.in
new file mode 100644
index 0000000..a5b2dbc
--- /dev/null
+++ b/bindings/vala/champlain-memphis/create.sh.in
@@ -0,0 +1,4 @@
+export PKG_CONFIG_PATH=$(readlink -f ../../../)
+
+vala-gen-introspect champlain-memphis-@CHAMPLAIN_API_VERSION@ champlain-memphis-@CHAMPLAIN_API_VERSION@
+vapigen --library champlain-memphis-@CHAMPLAIN_API_VERSION@ --pkg champlain-@CHAMPLAIN_API_VERSION@ --vapidir=../champlain champlain-memphis-@CHAMPLAIN_API_VERSION@/champlain-memphis-@CHAMPLAIN_API_VERSION@.gi --metadata champlain-memphis-@CHAMPLAIN_API_VERSION@/champlain-memphis-@CHAMPLAIN_API_VERSION@.metadata
diff --git a/bindings/vala/champlain/Makefile.am b/bindings/vala/champlain/Makefile.am
index 7e5bc79..e559ad3 100644
--- a/bindings/vala/champlain/Makefile.am
+++ b/bindings/vala/champlain/Makefile.am
@@ -6,8 +6,7 @@
 vapidir = $(datadir)/vala/vapi
 
 dist_vapi_DATA = \
-	champlain-0.6.vapi \
-	champlain-0.6.deps \
+	champlain-@CHAMPLAIN_API_VERSION@.vapi \
+	champlain-@CHAMPLAIN_API_VERSION@.deps \
 	$(NULL)
 
-EXTRA_DIST = champlain-0.6.vapi
diff --git a/bindings/vala/champlain/create.sh b/bindings/vala/champlain/create.sh
deleted file mode 100644
index 84f5dc9..0000000
--- a/bindings/vala/champlain/create.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export PKG_CONFIG_PATH=$(readlink -f ../../../)
-
-vala-gen-introspect champlain-0.6 champlain-0.6
-vapigen --library champlain-0.6 --pkg clutter-1.0 champlain-0.6/champlain-0.6.gi --metadata champlain-0.6/champlain-0.6.metadata
diff --git a/bindings/vala/champlain/create.sh.in b/bindings/vala/champlain/create.sh.in
new file mode 100644
index 0000000..86a9c89
--- /dev/null
+++ b/bindings/vala/champlain/create.sh.in
@@ -0,0 +1,4 @@
+export PKG_CONFIG_PATH=$(readlink -f ../../../)
+
+vala-gen-introspect champlain-@CHAMPLAIN_API_VERSION@ champlain-@CHAMPLAIN_API_VERSION@
+vapigen --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 champlain-@CHAMPLAIN_API_VERSION@/champlain-@CHAMPLAIN_API_VERSION@.gi --metadata champlain-@CHAMPLAIN_API_VERSION@/champlain-@CHAMPLAIN_API_VERSION@.metadata
diff --git a/bindings/vala/demos/Makefile.am b/bindings/vala/demos/Makefile.am
index d67b77b..40d112d 100644
--- a/bindings/vala/demos/Makefile.am
+++ b/bindings/vala/demos/Makefile.am
@@ -6,12 +6,12 @@ launcher_SOURCES = \
 
 INCLUDES = \
 	-I$(top_srcdir) \
-	$(LAUNCHER_CFLAGS)
+	$(DEPS_CFLAGS)
 
 VALAFLAGS = \
 	--vapidir=$(srcdir)/../champlain \
-	$(LAUNCHER_PACKAGES)
+	--pkg clutter-1.0 --pkg champlain-@CHAMPLAIN_API_VERSION@
 
 launcher_LDADD = \
-	$(LAUNCHER_LIBS) \
-	$(top_builddir)/champlain/libchamplain-0.6.la
+	$(DEPS_LIBS) \
+	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
diff --git a/configure.ac b/configure.ac
index 984bf83..747e74b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,22 +203,12 @@ AC_ARG_ENABLE(vala,
   AC_HELP_STRING([--enable-vala],[Include vala champlain (and champlain-gtk)]),
     enable_vala=$enableval, enable_vala=no )
 
-if test x$enable_vala = xyes; then
+if test "x$enable_vala" = "xyes"; then
   AM_PROG_VALAC([0.8.0])
 
   if test "x$VALAC" = "x" ; then
     AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
   fi
-
-  LAUNCHER_PACKAGES="--pkg clutter-1.0 --pkg champlain-0.6"
-  PKG_CHECK_MODULES(LAUNCHER,
-  [
-    glib-2.0,
-    clutter-1.0
-  ])
-  AC_SUBST(LAUNCHER_CFLAGS)
-  AC_SUBST(LAUNCHER_LIBS)
-  AC_SUBST(LAUNCHER_PACKAGES)
 fi
 
 AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" = "xyes")
@@ -271,13 +261,21 @@ AC_CONFIG_FILES([Makefile
                  bindings/python/demos/Makefile
                  bindings/vala/Makefile
                  bindings/vala/champlain/Makefile
+                 bindings/vala/champlain/create.sh
                  bindings/vala/champlain-memphis/Makefile
+                 bindings/vala/champlain-memphis/create.sh
                  bindings/vala/champlain-gtk/Makefile
+                 bindings/vala/champlain-gtk/create.sh
                  bindings/vala/demos/Makefile
                  champlain-memphis.pc
                  champlain-memphis-uninstalled.pc])
 AC_CONFIG_FILES([bindings/python/update-binding.sh],
-                [chmod +x bindings/python/update-binding.sh])
+                [
+                 chmod +x bindings/python/update-binding.sh
+                 chmod +x bindings/vala/champlain/create.sh
+                 chmod +x bindings/vala/champlain-gtk/create.sh
+                 chmod +x bindings/vala/champlain-memphis/create.sh
+                ])
 AC_OUTPUT
 
 echo ""