[evolution-kolab/account-mgmt: 22/29] libcamelkolab depends on libekolab, not vice versa.

[Matthew Barnes <mbarnes src gnome org>]

commit 49f4aa5205b278288ac61f20617d6ff658a3d662
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jun 30 17:42:42 2012 -0400

    libcamelkolab depends on libekolab, not vice versa.
    
    libcamelkolab is a dlopen()'ed module not meant to be linked to.

 src/Makefile.am           |    2 +-
 src/camel/Makefile.am     |    3 ++-
 src/libekolab/Makefile.am |    2 --
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c438383..4d6934f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@
 SUBDIRS =		\
 	libekolabconv	\
 	libekolabutil	\
-	camel		\
 	libekolab	\
+	camel		\
 	addressbook	\
 	calendar	\
 	configuration	\
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 71f868d..18fba3a 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -46,7 +46,8 @@ libcamelkolab_la_LIBADD =			\
 	$(GLIB_LIBS)				\
 	$(EDS_LIBS)				\
 	$(NSS_LIBS)				\
-	$(KOLAB_LIB_EKOLABUTIL)
+	$(KOLAB_LIB_EKOLABUTIL)			\
+	$(KOLAB_LIB_EKOLAB)
 
 EXTRA_DIST = $(camel_provider_DATA)
 
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index fe59572..9156353 100644
--- a/src/libekolab/Makefile.am
+++ b/src/libekolab/Makefile.am
@@ -77,7 +77,6 @@ libekolab_la_CPPFLAGS =			\
 libekolab_la_LIBADD =			\
 	$(GLIB_LIBS)			\
 	$(CAMEL_LIBS)			\
-	$(KOLAB_LIB_CAMEL)		\
 	$(SOUP_LIBS)			\
 	$(EDS_LIBS)			\
 	$(CURL_LIBS)			\
@@ -109,7 +108,6 @@ libekolabbackend_la_LIBADD =			\
 	$(EDS_LIBS)				\
 	$(GLIB_LIBS)				\
 	$(ICAL_LIBS)				\
-	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLAB)			\
 	$(KOLAB_LIB_EKOLABUTIL)			\
 	$(KOLAB_LIB_EKOLABCONVEVOLUTION)	\