[evolution-kolab/account-mgmt: 23/29] Move CamelKolabStream to libekolabutil.

[Matthew Barnes <mbarnes src gnome org>]

commit 8e7450030f4a705ff1fd67da84d4502855a16b0c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 1 10:24:10 2012 -0400

    Move CamelKolabStream to libekolabutil.
    
    libekolabutil uses CamelKolabStream, and libcamelkolab.la is a
    dlopen()'ed module not meant to be linked to.

 src/camel/Makefile.am                              |    6 ++----
 src/libekolabutil/Makefile.am                      |    4 +++-
 src/{camel => libekolabutil}/camel-kolab-stream.c  |    0
 src/{camel => libekolabutil}/camel-kolab-stream.h  |    0
 src/libekolabutil/kolab-util-http.c                |    3 +--
 src/tests/integration/libekolab/Makefile.am        |    4 ----
 .../libekolab/test-kolab-util-cal-freebusy.c       |    2 +-
 .../integration/libekolab/test-kolab-util-http.c   |    2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 18fba3a..738d365 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -11,8 +11,7 @@ libcamelkolab_la_SOURCES =			\
 	camel-kolab-imapx-metadata.c		\
 	camel-kolab-imapx-provider.c		\
 	camel-kolab-imapx-store.c		\
-	camel-kolab-session.c			\
-	camel-kolab-stream.c
+	camel-kolab-session.c
 
 noinst_HEADERS =				\
 	camel-imapx-extd-server.h		\
@@ -23,8 +22,7 @@ noinst_HEADERS =				\
 	camel-kolab-imapx-metadata.h		\
 	camel-kolab-imapx-provider.h		\
 	camel-kolab-imapx-store.h		\
-	camel-kolab-session.h			\
-	camel-kolab-stream.h
+	camel-kolab-session.h
 
 AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"camel-kolab\"		\
diff --git a/src/libekolabutil/Makefile.am b/src/libekolabutil/Makefile.am
index a5a2cbc..0183767 100644
--- a/src/libekolabutil/Makefile.am
+++ b/src/libekolabutil/Makefile.am
@@ -27,7 +27,8 @@ libekolabutil_la_SOURCES =		\
 	kolab-util-error.c		\
 	kolab-util-folder.c		\
 	kolab-util-kconv.c		\
-	kolab-util-sqlite.c
+	kolab-util-sqlite.c		\
+	camel-kolab-stream.c
 
 noinst_HEADERS =			\
 	kolab-util-cal-freebusy.h	\
@@ -39,6 +40,7 @@ noinst_HEADERS =			\
 	kolab-util-folder.h		\
 	kolab-util-kconv.h		\
 	kolab-util-sqlite.h		\
+	camel-kolab-stream.h		\
 	camel-system-headers.h
 
 libekolabutil_la_LIBADD =		\
diff --git a/src/camel/camel-kolab-stream.c b/src/libekolabutil/camel-kolab-stream.c
similarity index 100%
rename from src/camel/camel-kolab-stream.c
rename to src/libekolabutil/camel-kolab-stream.c
diff --git a/src/camel/camel-kolab-stream.h b/src/libekolabutil/camel-kolab-stream.h
similarity index 100%
rename from src/camel/camel-kolab-stream.h
rename to src/libekolabutil/camel-kolab-stream.h
diff --git a/src/libekolabutil/kolab-util-http.c b/src/libekolabutil/kolab-util-http.c
index f5f24fb..47d3d79 100644
--- a/src/libekolabutil/kolab-util-http.c
+++ b/src/libekolabutil/kolab-util-http.c
@@ -55,12 +55,11 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <camel/camel-kolab-stream.h>
-
 /* HTTP lib specifics */
 #include <libsoup/soup-gnome.h>
 #include <curl/curl.h>
 
+#include "camel-kolab-stream.h"
 #include "camel-system-headers.h"
 #include "kolab-util-http.h"
 
diff --git a/src/tests/integration/libekolab/Makefile.am b/src/tests/integration/libekolab/Makefile.am
index 1b6fb1f..974fe09 100644
--- a/src/tests/integration/libekolab/Makefile.am
+++ b/src/tests/integration/libekolab/Makefile.am
@@ -25,7 +25,6 @@ test_kolab_mail_access_LDADD =			\
 	$(EDS_LIBS)				\
 	$(GLIB_LIBS)				\
 	$(ICAL_LIBS)				\
-	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLAB)			\
 	$(KOLAB_LIB_EKOLABBACKEND)		\
 	$(KOLAB_LIB_EKOLABUTIL)			\
@@ -40,7 +39,6 @@ test_kolab_util_ldap_SOURCES =			\
 test_kolab_util_ldap_LDADD =			\
 	$(CAMEL_LIBS)				\
 	$(GLIB_LIBS)				\
-	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLABUTIL)
 
 test_kolab_util_cal_freebusy_SOURCES =		\
@@ -50,7 +48,6 @@ test_kolab_util_cal_freebusy_LDADD =		\
 	$(CAMEL_LIBS)				\
 	$(EDS_LIBS)				\
 	$(GLIB_LIBS)				\
-	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLABUTIL)
 
 test_kolab_util_http_SOURCES =			\
@@ -59,7 +56,6 @@ test_kolab_util_http_SOURCES =			\
 test_kolab_util_http_LDADD =			\
 	$(GLIB_LIBS)				\
 	$(CAMEL_LIBS)				\
-	$(KOLAB_LIB_CAMEL)			\
 	$(KOLAB_LIB_EKOLABUTIL)
 
 EXTRA_DIST =					\
diff --git a/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c b/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
index 598154a..f3f1d98 100644
--- a/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
+++ b/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
@@ -34,11 +34,11 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include <camel/camel-kolab-stream.h>
 #include <camel/camel-kolab-session.h>
 
 #include <libecal/libecal.h>
 
+#include <libekolabutil/camel-kolab-stream.h>
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>
 #include <libekolabutil/kolab-util-http.h>
diff --git a/src/tests/integration/libekolab/test-kolab-util-http.c b/src/tests/integration/libekolab/test-kolab-util-http.c
index 01e01fd..009ae70 100644
--- a/src/tests/integration/libekolab/test-kolab-util-http.c
+++ b/src/tests/integration/libekolab/test-kolab-util-http.c
@@ -34,9 +34,9 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include <camel/camel-kolab-stream.h>
 #include <camel/camel-kolab-session.h>
 
+#include <libekolabutil/camel-kolab-stream.h>
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>
 #include <libekolabutil/kolab-util-http.h>