[evolution-data-server] Bug 635572 - Various linking failures

[Matthew Barnes <mbarnes src gnome org>]

commit cb5bbd4f6a9f2e66d62d8f441c7c303c4e4c5251
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Mon Nov 22 20:02:16 2010 -0500

    Bug 635572 - Various linking failures
    
    On Debian sid, using binutils-gold, a couple missing links are discovered.

 addressbook/libedata-book/Makefile.am |    1 +
 calendar/libedata-cal/Makefile.am     |    2 ++
 camel/providers/imapx/Makefile.am     |    1 +
 libedataserverui/Makefile.am          |    4 ++++
 4 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 12db8f8..997c727 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -82,6 +82,7 @@ e_addressbook_factory_SOURCES = \
 
 e_addressbook_factory_LDADD =					\
 	libedata-book-1.2.la					\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)				\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(top_builddir)/libebackend/libebackend-1.2.la
 
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index c9dc25b..91d9757 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -111,6 +111,7 @@ e_calendar_factory_CPPFLAGS = \
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
 e_calendar_factory_LDADD =						\
+	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
 	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la		\
 	libedata-cal-1.2.la						\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la 		\
@@ -131,6 +132,7 @@ test_e_sexp_LDADD = \
 	libedata-cal-1.2.la					\
 	$(top_builddir)/calendar/libecal/libecal-1.2.la 	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
+	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(E_DATA_SERVER_LIBS)
 
 test_intervaltree_SOURCES = test-intervaltree.c e-cal-backend-intervaltree.c
diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
index 1e7a0a3..a8ae7be 100644
--- a/camel/providers/imapx/Makefile.am
+++ b/camel/providers/imapx/Makefile.am
@@ -54,6 +54,7 @@ test_imapx_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"camel-imapx\"
 test_imapx_SOURCES = test-imapx.c
 test_imapx_LDADD =							\
+	$(CAMEL_LIBS)							\
 	$(top_builddir)/camel/libcamel-1.2.la				\
 	$(top_builddir)/camel/libcamel-provider-1.2.la
 
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index af2155a..b14d9b5 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -98,11 +98,15 @@ TEST_EDATASERVERUI_CPPFLAGS= \
 if ENABLE_GTK3
 TEST_EDATASERVERUI_LDFLAGS = \
 	libedataserverui-3.0.la 				\
+	$(top_builddir)/camel/libcamel-1.2.la			\
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(E_DATA_SERVER_UI_LIBS)
 else
 TEST_EDATASERVERUI_LDFLAGS = \
 	libedataserverui-1.2.la 				\
+	$(top_builddir)/camel/libcamel-1.2.la			\
+	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(E_DATA_SERVER_UI_LIBS)
 endif