[evolution-data-server] Bug 690158 - libedataserver: Vala binding updates

[Matthew Barnes <mbarnes src gnome org>]

commit 0eeb603f557dcb47d6f98a8a2479c280b8d5a0e6
Author: Alban Browaeys <prahal yahoo com>
Date:   Tue Jan 8 10:57:39 2013 -0500

    Bug 690158 - libedataserver: Vala binding updates

 vala/EDataServer-1.2.metadata |    3 +++
 vala/Makefile.am              |   18 ++++++++----------
 vala/libedataserver-1.2.deps  |    2 ++
 3 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/vala/EDataServer-1.2.metadata b/vala/EDataServer-1.2.metadata
index e69de29..82bc914 100644
--- a/vala/EDataServer-1.2.metadata
+++ b/vala/EDataServer-1.2.metadata
@@ -0,0 +1,3 @@
+NamedParameters type="GLib.PtrArray"
+// libxml2: replace xml.NodePtr by xml.Node* used by Vala bindings
+xml_save_file.doc type="Xml.Doc*"
diff --git a/vala/Makefile.am b/vala/Makefile.am
index dd08d45..44913da 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -4,6 +4,7 @@ vapi_DATA = \
 	libebook-1.2.vapi \
 	$(NULL)
 dist_vapi_DATA = \
+	libedataserver-1.2.deps \
 	libebook-1.2.deps \
 	$(NULL)
 
@@ -19,22 +20,19 @@ BUILT_SOURCES = \
 
 pkgconfigdir = ${libdir}/pkgconfig
 
-libedataserver-1.2.vapi: $(top_builddir)/libedataserver/EDataServer-1.2.gir
+libedataserver-1.2.vapi: $(top_builddir)/libedataserver/EDataServer-1.2.gir  libedataserver-1.2.deps
 	$(VAPIGEN_V)$(VAPIGEN) \
+		--vapidir=. \
+		--vapidir=$(srcdir) \
+		--girdir=$(top_builddir)/libedataserver \
 		--pkg gio-2.0 \
+		--pkg libxml-2.0 \
 		--library libedataserver-1.2 \
 		--metadatadir=$(srcdir) \
 		$< \
 		$(NULL)
-	@mv $@ libedataserver-1.2.vapi.tmp
-	$(AM_V_GEN)sed \
-		'-e s/xml\.NodePtr/Xml\.Node/' \
-		'-e s/xml\.DocPtr/Xml\.Doc/' \
-		'-e s/xml\.Doc /Xml\.Doc /' \
-		< libedataserver-1.2.vapi.tmp > $@
-	@rm  libedataserver-1.2.vapi.tmp
-
-libebook-1.2.vapi: $(top_builddir)/addressbook/libebook/EBook-1.2.gir libedataserver-1.2.vapi libebook-1.2-custom.vala
+
+libebook-1.2.vapi: $(top_builddir)/addressbook/libebook/EBook-1.2.gir libedataserver-1.2.vapi libebook-1.2-custom.vala libebook-1.2.deps
 	$(VAPIGEN_V)$(VAPIGEN) \
 		--vapidir=. \
 		--vapidir=$(srcdir) \
diff --git a/vala/libedataserver-1.2.deps b/vala/libedataserver-1.2.deps
new file mode 100644
index 0000000..4478fb0
--- /dev/null
+++ b/vala/libedataserver-1.2.deps
@@ -0,0 +1,2 @@
+libxml-2.0
+gio-2.0