[evolution-kolab/ek-wip-porting-imapx: 4/12] IMAPX: get the upstream 3.3.2 sources building in our tree

[Christian Hilberg <chilberg src gnome org>]

commit e836e58fa90650924d1afbcfe701829d65122055
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Nov 24 18:51:42 2011 +0100

    IMAPX: get the upstream 3.3.2 sources building in our tree
    
    * removed the no-longer-needed camel-private.h file from
      src/camel/Makefile.am
    * let libcamelimapx.la be a static module (linked into
      the kolab2 provider dynamic module later on)
    * prevent the imapx urls file from being installed
      (kolab2 provider has one on its own)
    * removed the dependency to a local libcamel
      (use the system-wide one instead, we have the
      luxury of E-D-S already being installed)

 src/camel/Makefile.am                 |    5 ++---
 src/camel/providers/imapx/Makefile.am |    8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index fde5096..84ff024 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -12,7 +12,7 @@ libcamelkolab_la_SOURCES = \
 	camel-kolab-imapx-folder.c \
 	camel-kolab-session.c \
 	camel-kolab-imapx-metadata.c \
-	camel-kolab-imapx-metadata-db.c 
+	camel-kolab-imapx-metadata-db.c
 
 libcamelkolab_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
@@ -66,8 +66,7 @@ noinst_HEADERS = \
 	camel-kolab-imapx-folder.h \
 	camel-kolab-session.h \
 	camel-kolab-imapx-metadata.h \
-	camel-kolab-imapx-metadata-db.h \
-	camel-private.h
+	camel-kolab-imapx-metadata-db.h
 
 noinstdir = \
 	$(pkgincludedir)
diff --git a/src/camel/providers/imapx/Makefile.am b/src/camel/providers/imapx/Makefile.am
index 00b3508..6315ce4 100644
--- a/src/camel/providers/imapx/Makefile.am
+++ b/src/camel/providers/imapx/Makefile.am
@@ -1,5 +1,5 @@
 camel_provider_LTLIBRARIES = libcamelimapx.la
-camel_provider_DATA = libcamelimapx.urls
+#camel_provider_DATA = libcamelimapx.urls
 
 libcamelimapx_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)				\
@@ -37,10 +37,9 @@ camel-imapx-tokenise.h: camel-imapx-tokens.txt
 	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
 
 libcamelimapx_la_LIBADD = \
-        $(top_builddir)/camel/libcamel-1.2.la	\
         $(CAMEL_LIBS)
 
-libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libcamelimapx_la_LDFLAGS = -avoid-version -static $(NO_UNDEFINED)
 
 noinst_PROGRAMS = test-imapx
 
@@ -54,8 +53,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
+	$(CAMEL_LIBS)
 
 BUILT_SOURCES = camel-imapx-tokenise.h
 CLEANFILES = $(BUILT_SOURCES)