[evolution-data-server/openismus-work: 23/52] More fixing the build for new libebook/libebook-contacts split.

[Tristan Van Berkom <tvb src gnome org>]

commit f915c3acc3fd6d94ec8ce1c41434e4522077b0f1
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Mon Nov 5 19:46:16 2012 +0900

    More fixing the build for new libebook/libebook-contacts split.

 addressbook/libebook/libebook.h                 |    1 +
 calendar/backends/contacts/Makefile.am          |    1 +
 docs/reference/addressbook/libebook/Makefile.am |    1 +
 docs/reference/libedataserverui/Makefile.am     |    1 +
 libedataserverui/Makefile.am                    |    1 +
 tests/libebook/Makefile.am                      |    1 +
 tests/libebook/client/Makefile.am               |    1 +
 tests/libebook/vcard/Makefile.am                |    1 +
 tests/libedataserverui/Makefile.am              |    1 +
 9 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/addressbook/libebook/libebook.h b/addressbook/libebook/libebook.h
index e8524c1..bfc6127 100644
--- a/addressbook/libebook/libebook.h
+++ b/addressbook/libebook/libebook.h
@@ -22,6 +22,7 @@
 #define __LIBEBOOK_H_INSIDE__
 
 #include <libedataserver/libedataserver.h>
+#include <libebook-contacts/libebook-contacts.h>
 
 #include <libebook/e-book-client-view.h>
 #include <libebook/e-book-client.h>
diff --git a/calendar/backends/contacts/Makefile.am b/calendar/backends/contacts/Makefile.am
index 02acf51..9e7fa18 100644
--- a/calendar/backends/contacts/Makefile.am
+++ b/calendar/backends/contacts/Makefile.am
@@ -26,6 +26,7 @@ libecalbackendcontacts_la_LIBADD =					\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
 	$(top_builddir)/libebackend/libebackend-1.2.la			\
 	$(EVOLUTION_CALENDAR_LIBS)					\
diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index 804e101..8c9c6a7 100644
--- a/docs/reference/addressbook/libebook/Makefile.am
+++ b/docs/reference/addressbook/libebook/Makefile.am
@@ -31,6 +31,7 @@ GTKDOC_CFLAGS = \
 	$(CAMEL_CFLAGS)
 
 GTKDOC_LIBS = \
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am
index 657d0ee..8f4ca18 100644
--- a/docs/reference/libedataserverui/Makefile.am
+++ b/docs/reference/libedataserverui/Makefile.am
@@ -30,6 +30,7 @@ GTKDOC_CFLAGS  =					\
 GTKDOC_LIBS = 								\
 	$(top_builddir)/libedataserverui/libedataserverui-3.0.la	\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/libebackend/libebackend-1.2.la			\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index abecb12..d72c3a2 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -76,6 +76,7 @@ libedataserverui_3_0_la_SOURCES =	\
 	e-cell-renderer-color.c
 
 libedataserverui_3_0_la_LIBADD = 				\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
diff --git a/tests/libebook/Makefile.am b/tests/libebook/Makefile.am
index 543593e..011ea4a 100644
--- a/tests/libebook/Makefile.am
+++ b/tests/libebook/Makefile.am
@@ -14,6 +14,7 @@ TEST_CPPFLAGS =					\
 	$(NULL)
 
 TEST_LIBS =					\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(NULL)
diff --git a/tests/libebook/client/Makefile.am b/tests/libebook/client/Makefile.am
index 0679227..72c4b21 100644
--- a/tests/libebook/client/Makefile.am
+++ b/tests/libebook/client/Makefile.am
@@ -14,6 +14,7 @@ libclient_test_utils_la_CPPFLAGS =				\
 	$(NULL)
 
 libclient_test_utils_la_LIBADD = 				\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(CAMEL_LIBS)						\
diff --git a/tests/libebook/vcard/Makefile.am b/tests/libebook/vcard/Makefile.am
index bc20146..1f510bc 100644
--- a/tests/libebook/vcard/Makefile.am
+++ b/tests/libebook/vcard/Makefile.am
@@ -9,6 +9,7 @@ dump_vcard_CPPFLAGS = \
 	$(CAMEL_CFLAGS)
 
 dump_vcard_LDADD = 						\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
diff --git a/tests/libedataserverui/Makefile.am b/tests/libedataserverui/Makefile.am
index 8b0ed2e..bd105c8 100644
--- a/tests/libedataserverui/Makefile.am
+++ b/tests/libedataserverui/Makefile.am
@@ -20,6 +20,7 @@ TEST_EDATASERVERUI_CPPFLAGS=						\
 TEST_EDATASERVERUI_LDFLAGS =						\
 	$(top_builddir)/camel/libcamel-1.2.la				\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+	$(top_builddir)/addressbook/libebook-contacts/libebook-contacts-1.2.la		\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la		\
 	$(top_builddir)/libebackend/libebackend-1.2.la			\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\