[evolution-kolab] Fix static linking.



commit db76ec1ffcde2f9f5d9b71892b7249313eb17404
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jul 4 14:08:14 2012 -0400

    Fix static linking.
    
    Linking to static libraries can be tricky.  Each library can only be
    linked to once, otherwise libtool complains about multiple definitions
    of symbols in the static libraries.  A clear hierarchy is required.

 src/camel/Makefile.am     |    3 +--
 src/libekolab/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 8cb7d52..d8b6eb7 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -29,8 +29,7 @@ libcamelkolab_la_LIBADD =			\
 	$(GLIB_LIBS)				\
 	$(EDS_LIBS)				\
 	$(NSS_LIBS)				\
-	$(KOLAB_LIB_EKOLABUTIL)			\
-	$(KOLAB_LIB_EKOLAB)
+	$(KOLAB_LIB_EKOLABBACKEND)
 
 EXTRA_DIST = $(camel_provider_DATA)
 
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index 24e0f94..902ef40 100644
--- a/src/libekolab/Makefile.am
+++ b/src/libekolab/Makefile.am
@@ -97,7 +97,8 @@ libekolab_la_LIBADD =			\
 	$(SOUP_LIBS)			\
 	$(EDS_LIBS)			\
 	$(CURL_LIBS)			\
-	$(EVOLUTION_LIBS)
+	$(EVOLUTION_LIBS)		\
+	$(KOLAB_LIB_EKOLABUTIL)
 
 ## --- libekolabbackend --------------------------------------------------------
 
@@ -126,7 +127,6 @@ libekolabbackend_la_LIBADD =			\
 	$(GLIB_LIBS)				\
 	$(ICAL_LIBS)				\
 	$(KOLAB_LIB_EKOLAB)			\
-	$(KOLAB_LIB_EKOLABUTIL)			\
 	$(KOLAB_LIB_EKOLABCONVEVOLUTION)	\
 	$(KOLAB_LIB_EKOLABCONVKOLAB)		\
 	$(KOLAB_LIB_EKOLABCONVSTRUCTS)		\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]