[evolution-data-server/openismus-work-master: 8/23] Adjusted vala build for library splitup of libebook & libebook-contacts

[Tristan Van Berkom <tvb src gnome org>]

commit 0cbe4a291000313995bdd5728631c5bb876c94fe
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Tue Dec 4 18:31:11 2012 +0900

    Adjusted vala build for library splitup of libebook & libebook-contacts
    
    Conflicts:
    
    	vala/libebook-1.2.deps

 vala/EBook-1.2.metadata                            |   23 ------------
 vala/EBookContacts-1.2.metadata                    |   23 ++++++++++++
 vala/Makefile.am                                   |   38 ++++++++++++++++++--
 vala/libebook-1.2.deps                             |    2 +-
 ...stom.vala => libebook-contacts-1.2-custom.vala} |    0
 vala/libebook-contacts-1.2.deps                    |    3 ++
 6 files changed, 62 insertions(+), 27 deletions(-)
---
diff --git a/vala/EBook-1.2.metadata b/vala/EBook-1.2.metadata
index 8e0106c..69015ed 100644
--- a/vala/EBook-1.2.metadata
+++ b/vala/EBook-1.2.metadata
@@ -1,26 +1,3 @@
 BookClientView.objects_added#signal.object type="GLib.List<weak void*>"
 BookClientView.objects_removed#signal.object type="GLib.List<weak void*>"
 BookClientView.objects_modified#signal.object type="GLib.List<weak void*>"
-Contact.get skip
-Contact.get_const skip
-Contact.set skip
-ContactName.family unowned=false
-ContactName.given unowned=false
-ContactName.additional unowned=false
-ContactName.prefixes unowned=false
-ContactName.suffixes unowned=false
-ContactAddress.address_format unowned=false
-ContactAddress.code unowned=false
-ContactAddress.country unowned=false
-ContactAddress.ext unowned=false
-ContactAddress.locality unowned=false
-ContactAddress.po unowned=false
-ContactAddress.region unowned=false
-ContactAddress.street unowned=false
-ContactPhoto.get_inlined nullable=true
-ContactPhoto.get_mime_type nullable=true
-ContactPhoto.get_uri nullable=true
-VCard.get_attribute nullable=true
-VCard.get_attribute_if_parsed nullable=true
-VCardAttribute.get_group nullable=true
-VCardAttribute.get_value nullable=true
diff --git a/vala/EBookContacts-1.2.metadata b/vala/EBookContacts-1.2.metadata
new file mode 100644
index 0000000..7b30232
--- /dev/null
+++ b/vala/EBookContacts-1.2.metadata
@@ -0,0 +1,23 @@
+Contact.get skip
+Contact.get_const skip
+Contact.set skip
+ContactName.family unowned=false
+ContactName.given unowned=false
+ContactName.additional unowned=false
+ContactName.prefixes unowned=false
+ContactName.suffixes unowned=false
+ContactAddress.address_format unowned=false
+ContactAddress.code unowned=false
+ContactAddress.country unowned=false
+ContactAddress.ext unowned=false
+ContactAddress.locality unowned=false
+ContactAddress.po unowned=false
+ContactAddress.region unowned=false
+ContactAddress.street unowned=false
+ContactPhoto.get_inlined nullable=true
+ContactPhoto.get_mime_type nullable=true
+ContactPhoto.get_uri nullable=true
+VCard.get_attribute nullable=true
+VCard.get_attribute_if_parsed nullable=true
+VCardAttribute.get_group nullable=true
+VCardAttribute.get_value nullable=true
diff --git a/vala/Makefile.am b/vala/Makefile.am
index dd08d45..1588c62 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -2,14 +2,20 @@ vapidir = $(datarootdir)/vala/vapi
 vapi_DATA = \
 	libedataserver-1.2.vapi \
 	libebook-1.2.vapi \
+	libebook-contacts-1.2.vapi \
+	libecalendar-1.2.vapi \
 	$(NULL)
 dist_vapi_DATA = \
 	libebook-1.2.deps \
+	libebook-contacts-1.2.deps \
+	libecalendar-1.2.deps \
 	$(NULL)
 
 EXTRA_DIST = \
 	EBook-1.2.metadata \
-	libebook-1.2-custom.vala \
+	EBookContacts-1.2.metadata \
+	libebook-contacts-1.2-custom.vala \
+	ECalendar-1.2.metadata \
 	EDataServer-1.2.metadata \
 	$(NULL)
 
@@ -34,7 +40,33 @@ libedataserver-1.2.vapi: $(top_builddir)/libedataserver/EDataServer-1.2.gir
 		< 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
+libecalendar-1.2.vapi: $(top_builddir)/calendar/libecal/ECalendar-1.2.gir libedataserver-1.2.vapi
+	$(VAPIGEN_V)$(VAPIGEN) \
+		--vapidir=. \
+		--girdir=$(top_builddir)/libedataserver \
+		--pkg libedataserver-1.2 \
+		--pkg gio-2.0 \
+		--pkg libxml-2.0 \
+		--library libecalendar-1.2 \
+		--metadatadir=$(srcdir) \
+		$< \
+		$(NULL)
+
+libebook-contacts-1.2.vapi: $(top_builddir)/addressbook/libebook-contacts/EBookContacts-1.2.gir libedataserver-1.2.vapi libebook-contacts-1.2-custom.vala
+	$(VAPIGEN_V)$(VAPIGEN) \
+		--vapidir=. \
+		--vapidir=$(srcdir) \
+		--girdir=$(top_builddir)/libedataserver \
+		--pkg libedataserver-1.2 \
+		--pkg gio-2.0 \
+		--pkg libxml-2.0 \
+		--library libebook-contacts-1.2 \
+		--metadatadir=$(srcdir) \
+		$< \
+		$(srcdir)/libebook-contacts-1.2-custom.vala \
+		$(NULL)
+
+libebook-1.2.vapi: $(top_builddir)/addressbook/libebook/EBook-1.2.gir libedataserver-1.2.vapi libebook-contacts-1.2.vapi
 	$(VAPIGEN_V)$(VAPIGEN) \
 		--vapidir=. \
 		--vapidir=$(srcdir) \
@@ -42,10 +74,10 @@ libebook-1.2.vapi: $(top_builddir)/addressbook/libebook/EBook-1.2.gir libedatase
 		--pkg libedataserver-1.2 \
 		--pkg gio-2.0 \
 		--pkg libxml-2.0 \
+		--pkg libebook-contacts-1.2 \
 		--library libebook-1.2 \
 		--metadatadir=$(srcdir) \
 		$< \
-		$(srcdir)/libebook-1.2-custom.vala \
 		$(NULL)
 
 CLEANFILES = \
diff --git a/vala/libebook-1.2.deps b/vala/libebook-1.2.deps
index ef26377..dd769f0 100644
--- a/vala/libebook-1.2.deps
+++ b/vala/libebook-1.2.deps
@@ -1,3 +1,3 @@
-libedataserver-1.2
+libebook-contacts-1.2
 libxml-2.0
 gio-2.0
diff --git a/vala/libebook-1.2-custom.vala b/vala/libebook-contacts-1.2-custom.vala
similarity index 100%
rename from vala/libebook-1.2-custom.vala
rename to vala/libebook-contacts-1.2-custom.vala
diff --git a/vala/libebook-contacts-1.2.deps b/vala/libebook-contacts-1.2.deps
new file mode 100644
index 0000000..ef26377
--- /dev/null
+++ b/vala/libebook-contacts-1.2.deps
@@ -0,0 +1,3 @@
+libedataserver-1.2
+libxml-2.0
+gio-2.0