[evolution-data-server/openismus-work-master: 10/11] Fixed GIR build and vala build for libebook

[Tristan Van Berkom <tvb src gnome org>]

commit 9519535e49e2b066edda7e365a1e7a7b4828d9bb
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Tue Dec 4 21:13:24 2012 +0900

    Fixed GIR build and vala build for libebook
    
    Some minor tweaks were needed in order to properly generate the .vapi
    for libebook after splitting up libebook and libebook-contacts.
    
    Conflicts:
    
    	addressbook/libebook/Makefile.am

 addressbook/libebook/Makefile.am |    1 +
 vala/Makefile.am                 |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 8c82194..93132cd 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -116,6 +116,7 @@ EBook_1_2_gir_CFLAGS = \
 	$(NULL)
 EBook_1_2_gir_SCANNERFLAGS = \
 	--include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir \
+	--include-uninstalled=$(top_builddir)/addressbook/libebook-contacts/EBookContacts-1.2.gir
 	$(NULL)
 EBook_1_2_gir_LIBS = \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 1588c62..16ebffc 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -71,10 +71,11 @@ libebook-1.2.vapi: $(top_builddir)/addressbook/libebook/EBook-1.2.gir libedatase
 		--vapidir=. \
 		--vapidir=$(srcdir) \
 		--girdir=$(top_builddir)/libedataserver \
+		--girdir=$(top_builddir)/addressbook/libebook-contacts \
 		--pkg libedataserver-1.2 \
+		--pkg libebook-contacts-1.2 \
 		--pkg gio-2.0 \
 		--pkg libxml-2.0 \
-		--pkg libebook-contacts-1.2 \
 		--library libebook-1.2 \
 		--metadatadir=$(srcdir) \
 		$< \