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

[Tristan Van Berkom <tvb src gnome org>]

commit 9fdaf7ddbd90d0e5b62aeb12367d3fcfdb94b007
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.

 addressbook/libebook/Makefile.am |    5 ++++-
 vala/Makefile.am                 |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 22d21c7..6c2eb3f 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -110,7 +110,10 @@ EBook_1_2_gir_CFLAGS = $(INCLUDES) \
 		       $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 		       $(CAMEL_CFLAGS) \
 			$(NULL)
-EBook_1_2_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir
+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
+
 EBook_1_2_gir_LIBS = \
 	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la \
 	libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-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) \
 		$< \