[evolution-kolab/ek-wip-porting] libcamelkolab: statically link-in sub-lib

[Christian Hilberg <chilberg src gnome org>]

commit 4f4d7c023deae99338222939a5e0dd6fd01bcf11
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 16 16:17:36 2012 +0100

    libcamelkolab: statically link-in sub-lib
    
    * link the extended libcamelimapx
      sub-library statically into libcamelkolab
    * do not install sub-lib

 src/camel/providers/imapx/Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/camel/providers/imapx/Makefile.am b/src/camel/providers/imapx/Makefile.am
index 69d28ba..1bae8db 100644
--- a/src/camel/providers/imapx/Makefile.am
+++ b/src/camel/providers/imapx/Makefile.am
@@ -1,4 +1,4 @@
-camel_provider_LTLIBRARIES = libcamelimapx.la
+noinst_LTLIBRARIES = libcamelimapx.la
 #camel_provider_DATA = libcamelimapx.urls
 
 libcamelimapx_la_CPPFLAGS = \
@@ -7,7 +7,7 @@ libcamelimapx_la_CPPFLAGS = \
 	$(SQLITE_CFLAGS)			\
 	$(GLIB_CFLAGS)				\
 	$(KOLAB_INCLUDE)			\
-	-DG_LOG_DOMAIN=\"camel-imapx\"
+	-DG_LOG_DOMAIN=\"camel-imapx-extd\"
 
 libcamelimapx_la_CFLAGS = \
 	$(CFLAGS)				\
@@ -62,7 +62,10 @@ libcamelimapx_la_LIBADD = \
 	$(GLIB_LIBS)				\
         $(KOLAB_LIB_EKOLABUTIL)
 
-libcamelimapx_la_LDFLAGS = -avoid-version -static $(NO_UNDEFINED)
+libcamelimapx_la_LDFLAGS =			\
+	-avoid-version				\
+	-static					\
+	$(NO_UNDEFINED)
 
 noinst_PROGRAMS = test-imapx
 
@@ -90,6 +93,6 @@ test_imapx_LDADD =				\
 BUILT_SOURCES = camel-imapx-tokenise.h
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = libcamelimapx.urls camel-imapx-tokens.txt
+# EXTRA_DIST = libcamelimapx.urls camel-imapx-tokens.txt
 
 -include $(top_srcdir)/git.mk