[rhythmbox/gobject-introspection: 15/34] generate vapi from gir files. doesn't work yet.

[Jonathan Matthew <jmatthew src gnome org>]

commit 7ae142a916da6cc6353789db53daf9ec9149d5fd
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jul 13 11:21:19 2010 +1000

    generate vapi from gir files.  doesn't work yet.

 bindings/Makefile.am        |    5 +-
 bindings/vala/Makefile.am   |   16 +++++--
 bindings/vala/rb.deps       |    3 +
 bindings/vala/rb.vapi       |   93 -------------------------------------------
 bindings/vala/rhythmdb.deps |    3 +
 bindings/vala/rhythmdb.vapi |    3 -
 configure.ac                |    2 +
 7 files changed, 22 insertions(+), 103 deletions(-)
---
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index e3f9159..7e1a372 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,9 +1,10 @@
 SUBDIRS = 
 
+if HAVE_INTROSPECTION
+SUBDIRS += gi
+
 if ENABLE_VALA
 SUBDIRS += vala
 endif
 
-if HAVE_INTROSPECTION
-SUBDIRS += gi
 endif
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 579ac4f..6ecd748 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -1,11 +1,17 @@
 vapidir = $(VAPIDIR)
 
-vapi_VAPI = 			\
+vapi_DATA = 			\
+	rb.deps			\
 	rb.vapi			\
+	rhythmdb.deps		\
 	rhythmdb.vapi
 
-dist_noinst_DATA = 		\
-	rb.deps			\
-	rhythmdb.deps
+VAPIGEN_PKG = --pkg atk --pkg gtk+-2.0 --pkg gdk-pixbuf-2.0 --pkg gstreamer-0.10 --pkg libxml-2.0
+
+rhythmdb.vapi: $(top_builddir)/bindings/gi/RhythmDB-0.13.gir
+	$(VAPIGEN) $(VAPIGEN_PKG) --library rhythmdb $<
+
+rb.vapi: $(top_builddir)/bindings/gi/RB-0.13.gir rhythmdb.vapi
+	$(VAPIGEN) $(VAPIGEN_PKG) --vapidir $(top_builddir)/bindings/vala --library rb $<
 
-EXTRA_DIST = $(vapi_VAPI)
+CLEANFILES = rb.vapi rhythmdb.vapi
diff --git a/bindings/vala/rb.deps b/bindings/vala/rb.deps
index 9775fd6..4ea28fe 100644
--- a/bindings/vala/rb.deps
+++ b/bindings/vala/rb.deps
@@ -1,2 +1,5 @@
 gtk+-2.0
+gdk-pixbuf-2.0
+libxml-2.0
+glib-2.0
 rhythmdb
diff --git a/bindings/vala/rhythmdb.deps b/bindings/vala/rhythmdb.deps
index 24a2237..79ca8c5 100644
--- a/bindings/vala/rhythmdb.deps
+++ b/bindings/vala/rhythmdb.deps
@@ -1 +1,4 @@
 gtk+-2.0
+gdk-pixbuf-2.0
+libxml-2.0
+glib-2.0
diff --git a/configure.ac b/configure.ac
index 6087537..1615024 100644
--- a/configure.ac
+++ b/configure.ac
@@ -739,8 +739,10 @@ if test "x$enable_vala" = "xyes"; then
 	if test "x$with_vala" = "xyes"; then
 		VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
 		VAPIDIR="`pkg-config --variable=vapidir vala-1.0`"
+		VAPIGEN="`pkg-config --variable=vapigen vala-1.0`"
 		AC_SUBST([VALAC])
 		AC_SUBST([VAPIDIR])
+		AC_SUBST([VAPIGEN])
 	elif test "x$enable_vala" = "xyes"; then
 		AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
 	fi