From 6cc0ff8c6f108324dd2310569b870b8586930712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 4 Feb 2011 01:33:35 +0100
Subject: Vala bindings: add metadata as build dependencies, support for gtk3

---
 bindings/vala/Makefile.am                     | 9 ++++++---
 bindings/vala/examples/indicator-example.vala | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'bindings')

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 5a923a5..3c17075 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -1,6 +1,5 @@
 SUBDIRS = . examples
 
-
 #########################
 # VAPI Files
 #########################
@@ -9,8 +8,10 @@ if HAVE_INTROSPECTION
 
 if USE_GTK3
 GTKVAPI = gtk+-3.0
+VER=3
 else
 GTKVAPI = gtk+-2.0
+VER=
 endif
 
 vapidir = $(datadir)/vala/vapi
@@ -21,8 +22,10 @@ DEPS = $(GTKVAPI)
 $(vapiprefix).deps:
 	echo $(DEPS) > $@
 
-$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir $(vapiprefix).deps
-	$(VALA_API_GEN) --library=$(vapiprefix) \
+$(vapiprefix).vapi: $(top_builddir)/src/AppIndicator$(VER)-0.1.gir \
+                    $(top_builddir)/src/AppIndicator$(VER)-0.1.metadata \
+                    $(vapiprefix).deps
+	$(VALA_API_GEN) --library=$(vapiprefix) --girdir=$(srcdir)/src \
 	$<
 	
 
diff --git a/bindings/vala/examples/indicator-example.vala b/bindings/vala/examples/indicator-example.vala
index c91dfae..621c962 100644
--- a/bindings/vala/examples/indicator-example.vala
+++ b/bindings/vala/examples/indicator-example.vala
@@ -23,7 +23,7 @@ using AppIndicator;
 public class IndicatorExample {
 	public static int main(string[] args) {
 		Gtk.init(ref args);
-	
+
 		var win = new Window();
 		win.title = "Indicator Test";
 		win.resize(200, 200);
-- 
cgit v1.2.3