[libchamplain] Removed bindings directory and moved vala demos into demos directory.

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

commit 897efad5c19663ea28e9624c0b69dc405b40cde6
Author: Lorenzo Masini <rugginoso develer com>
Date:   Wed Mar 30 01:18:15 2011 +0200

    Removed bindings directory and moved vala demos into demos directory.

 Makefile.am                                        |    2 +-
 bindings/Makefile.am                               |    1 -
 bindings/vala/Makefile.am                          |   14 -
 bindings/vala/champlain-gtk/Makefile.am            |   12 -
 .../vala/champlain-gtk/champlain-gtk-0.10.deps     |    2 -
 .../vala/champlain-gtk/champlain-gtk-0.10.vapi     |   13 -
 .../champlain-gtk-0.10/champlain-gtk-0.10.defines  |    1 -
 .../champlain-gtk-0.10/champlain-gtk-0.10.files    |    2 -
 .../champlain-gtk-0.10/champlain-gtk-0.10.metadata |    1 -
 .../champlain-gtk-0.10.namespace                   |    1 -
 bindings/vala/champlain-gtk/create.sh.in           |    4 -
 bindings/vala/champlain-memphis/Makefile.am        |   12 -
 .../champlain-memphis/champlain-memphis-0.10.deps  |    2 -
 .../champlain-memphis/champlain-memphis-0.10.vapi  |   55 --
 .../champlain-memphis-0.10.defines                 |    1 -
 .../champlain-memphis-0.10.files                   |    3 -
 .../champlain-memphis-0.10.metadata                |    5 -
 .../champlain-memphis-0.10.namespace               |    1 -
 bindings/vala/champlain-memphis/create.sh.in       |    4 -
 bindings/vala/champlain/Makefile.am                |   12 -
 bindings/vala/champlain/champlain-0.10.deps        |    2 -
 bindings/vala/champlain/champlain-0.10.vapi        |  525 --------------------
 .../champlain-0.10/champlain-0.10.defines          |    1 -
 .../champlain/champlain-0.10/champlain-0.10.files  |   28 -
 .../champlain-0.10/champlain-0.10.metadata         |   21 -
 .../champlain-0.10/champlain-0.10.namespace        |    1 -
 bindings/vala/champlain/create.sh.in               |    4 -
 bindings/vala/demos/.gitignore                     |    2 -
 bindings/vala/demos/Makefile.am                    |   18 -
 configure.ac                                       |   15 +-
 demos/Makefile.am                                  |   11 +
 {bindings/vala/demos => demos}/launcher.vala       |    0
 {bindings/vala/demos => demos}/markers.vala        |    0
 33 files changed, 13 insertions(+), 763 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0c8d619..895c899 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ DISTCLEANFILES = $(pcfiles) $(other_pcfiles)
 all: $(other_pcfiles)
 
 # Have the demos build at the end as they depend on optional parts
-SUBDIRS += docs demos bindings
+SUBDIRS += docs demos
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
diff --git a/configure.ac b/configure.ac
index f1a9458..917e895 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,22 +244,9 @@ AC_CONFIG_FILES([build/Makefile
                  champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in
                  champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in
                  champlain-gtk/Makefile
-                 bindings/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-$CHAMPLAIN_API_VERSION.pc:champlain-memphis.pc.in
                  champlain-memphis-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-memphis-uninstalled.pc.in])
-AC_CONFIG_FILES([Makefile],
-                [chmod +x bindings/vala/champlain/create.sh
-                 chmod +x bindings/vala/champlain-gtk/create.sh
-                 chmod +x bindings/vala/champlain-memphis/create.sh
-                ])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 echo ""
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 2540250..aa5705d 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -46,5 +46,16 @@ local_rendering_LDADD = $(GTK_LIBS) $(MEMPHIS_LIBS) $(DEPS_LIBS) \
 endif
 endif
 
+if ENABLE_VALA_DEMOS
+noinst_PROGRAMS += launcher-vala
+launcher_vala_SOURCES = launcher.vala markers.vala
+VALAFLAGS = \
+  --vapidir=../champlain \
+  --pkg atk --pkg clutter-1.0 --pkg champlain- CHAMPLAIN_API_VERSION@
+launcher_vala_LDADD = \
+       $(DEPS_LIBS) \
+       $(top_builddir)/champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
+endif
+
 EXTRA_DIST = markers.h launcher.js minimal.py default-rules.xml high-contrast.xml las_palmas.osm schaffhausen.osm
 
diff --git a/bindings/vala/demos/launcher.vala b/demos/launcher.vala
similarity index 100%
rename from bindings/vala/demos/launcher.vala
rename to demos/launcher.vala
diff --git a/bindings/vala/demos/markers.vala b/demos/markers.vala
similarity index 100%
rename from bindings/vala/demos/markers.vala
rename to demos/markers.vala