Camel no longer depends on libedataserver.

Camel is now the lowest layer of E-D-S, built first.

diff --git a/Makefile.am b/Makefile.am
index cd5a844..583967b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ if ENABLE_CALENDAR
 CALENDAR_DIR = calendar
 endif
 
-SUBDIRS = libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui services tests docs art po
-DIST_SUBDIRS = libedataserver libebackend camel addressbook calendar libedataserverui services tests docs art po vala
+SUBDIRS = camel libedataserver libebackend addressbook $(CALENDAR_DIR) libedataserverui services tests docs art po
+DIST_SUBDIRS = camel libedataserver libebackend addressbook calendar libedataserverui services tests docs art po vala
 
 if HAVE_INTROSPECTION
 if HAVE_VALA

diff --git a/camel/Makefile.am b/camel/Makefile.am
index 79700c8..04d84f1 100644 (file)
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -298,10 +298,9 @@ libcamelinclude_HEADERS =                  \
 libcamel_1_2_la_LDFLAGS = -version-info $(LIBCAMEL_CURRENT):$(LIBCAMEL_REVISION):$(LIBCAMEL_AGE) $(NO_UNDEFINED)
 
 libcamel_1_2_la_LIBADD =                               \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(CAMEL_LIBS)                                                   \
-       $(SOCKET_LIBS)                                                  \
-       $(ICONV_LIBS)                                                   \
+       $(CAMEL_LIBS)                                   \
+       $(SOCKET_LIBS)                                  \
+       $(ICONV_LIBS)                                   \
        $(REGEX_LIBS)
 
 camel_lock_helper_1_2_CPPFLAGS = \

diff --git a/camel/camel.pc.in b/camel/camel.pc.in
index 24172b3..9e51e3e 100644 (file)
--- a/camel/camel.pc.in
+++ b/camel/camel.pc.in
@@ -10,6 +10,6 @@ privincludedir=@privincludedir@
 Name: camel
 Description: the Evolution MIME message handling library
 Version: @VERSION@
-Requires: gio-2.0 libedataserver-@API_VERSION@ sqlite3 @mozilla_nss@ @mozilla_nspr@
+Requires: gio-2.0 sqlite3 @mozilla_nss@ @mozilla_nspr@
 Libs: -L${libdir} -lcamel-@API_VERSION@ @MANUAL_NSS_LIBS@
 Cflags: -I${privincludedir} @MANUAL_NSS_CFLAGS@

diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 9c46932..3b400e3 100644 (file)
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -43,8 +43,7 @@ noinst_HEADERS =                      \
 libcamelimap_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libcamelimap_la_LIBADD = \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/libcamel-1.2.la                           \
+       $(top_builddir)/camel/libcamel-1.2.la   \
        $(CAMEL_LIBS)
 
 EXTRA_DIST = libcamelimap.urls

diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
index e4c4d98..00b3508 100644 (file)
--- a/camel/providers/imapx/Makefile.am
+++ b/camel/providers/imapx/Makefile.am
@@ -37,8 +37,7 @@ 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)/libedataserver/libedataserver-${API_VERSION}.la        \
-        $(top_builddir)/camel/libcamel-1.2.la                          \
+        $(top_builddir)/camel/libcamel-1.2.la  \
         $(CAMEL_LIBS)
 
 libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
@@ -54,8 +53,8 @@ test_imapx_CPPFLAGS = \
        $(CAMEL_CFLAGS)                         \
        -DG_LOG_DOMAIN=\"camel-imapx\"
 test_imapx_SOURCES = test-imapx.c
-test_imapx_LDADD =                                                     \
-       $(CAMEL_LIBS)                                                   \
+test_imapx_LDADD =                             \
+       $(CAMEL_LIBS)                           \
        $(top_builddir)/camel/libcamel-1.2.la
 
 BUILT_SOURCES = camel-imapx-tokenise.h

diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index 676b47b..41e83a1 100644 (file)
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -59,8 +59,7 @@ noinst_HEADERS =                              \
 libcamellocal_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libcamellocal_la_LIBADD = \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/libcamel-1.2.la                           \
+       $(top_builddir)/camel/libcamel-1.2.la   \
        $(CAMEL_LIBS)
 
 EXTRA_DIST = libcamellocal.urls

diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index 8f4d23f..fe08475 100644 (file)
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -34,8 +34,7 @@ noinst_HEADERS =                              \
 libcamelnntp_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libcamelnntp_la_LIBADD = \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/libcamel-1.2.la                           \
+       $(top_builddir)/camel/libcamel-1.2.la   \
        $(CAMEL_LIBS)
 
 EXTRA_DIST = libcamelnntp.urls

diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index 30a2f2c..71f9879 100644 (file)
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -26,8 +26,7 @@ noinst_HEADERS =                      \
 libcamelpop3_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libcamelpop3_la_LIBADD = \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/libcamel-1.2.la                           \
+       $(top_builddir)/camel/libcamel-1.2.la   \
        $(CAMEL_LIBS)
 
 EXTRA_DIST = libcamelpop3.urls

diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 9f5ec52..338a735 100644 (file)
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -14,14 +14,13 @@ libcamelsmtp_la_SOURCES =                   \
        camel-smtp-settings.h                   \
        camel-smtp-transport.c
 
-noinst_HEADERS =                       \
+noinst_HEADERS = \
        camel-smtp-transport.h
 
 libcamelsmtp_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 libcamelsmtp_la_LIBADD = \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/libcamel-1.2.la                           \
+       $(top_builddir)/camel/libcamel-1.2.la   \
        $(CAMEL_LIBS)
 
 EXTRA_DIST = libcamelsmtp.urls

diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
index 1d40eb3..6bcd9f5 100644 (file)
--- a/camel/tests/folder/Makefile.am
+++ b/camel/tests/folder/Makefile.am
@@ -10,8 +10,7 @@ FOLDER_TESTS_CPPFLAGS= \
 FOLDER_TESTS_LDADD= \
        $(top_builddir)/camel/tests/lib/libcameltest.a  \
        $(top_builddir)/camel/tests/lib/libcameltest-provider.a \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la        \
        $(INTLLIBS)
 
 check_PROGRAMS =       \

diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am
index 9d2f42f..e775244 100644 (file)
--- a/camel/tests/lib/Makefile.am
+++ b/camel/tests/lib/Makefile.am
@@ -9,10 +9,10 @@ libcameltest_a_SOURCES = \
        address-data.h
 
 libcameltest_provider_a_CPPFLAGS = \
-       $(AM_CPPFLAGS)                                                          \
-       -I$(includedir)                                                         \
-       -I$(top_srcdir)                                                         \
-       -I$(top_srcdir)/camel                                           \
+       $(AM_CPPFLAGS)                                  \
+       -I$(includedir)                                 \
+       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/camel                           \
        -DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\"     \
        $(CAMEL_CFLAGS)
 
@@ -20,19 +20,17 @@ libcameltest_provider_a_SOURCES = \
        camel-test-provider.c camel-test-provider.h
 
 libcameltest_a_CPPFLAGS = \
-       $(AM_CPPFLAGS)                                                          \
-       -I$(includedir)                                                         \
-       -I$(top_srcdir)                                                         \
-       -I$(top_srcdir)/camel                                           \
+       $(AM_CPPFLAGS)                                  \
+       -I$(includedir)                                 \
+       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/camel                           \
        -DCAMEL_BUILD_DIR=\"$(top_builddir)/camel\"     \
        $(CAMEL_CFLAGS)
 
-libcameltest_a_LIBADD =                                \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la
+libcameltest_a_LIBADD =         \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la
 
-libcameltest_provider_a_LIBADD =                               \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la
+libcameltest_provider_a_LIBADD = \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la
 
 -include $(top_srcdir)/git.mk

diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am
index 129e3fc..6264465 100644 (file)
--- a/camel/tests/message/Makefile.am
+++ b/camel/tests/message/Makefile.am
@@ -8,9 +8,8 @@ MESSAGE_TESTS_CPPFLAGS= \
        $(CAMEL_CFLAGS)
 
 MESSAGE_TESTS_LDADD= \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/tests/lib/libcameltest.a                  \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
+       $(top_builddir)/camel/tests/lib/libcameltest.a          \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la        \
        $(INTLLIBS)
 
 check_PROGRAMS = \

diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am
index 028b7da..e976a79 100644 (file)
--- a/camel/tests/mime-filter/Makefile.am
+++ b/camel/tests/mime-filter/Makefile.am
@@ -5,13 +5,12 @@ MIMEFILTER_TESTS_CPPFLAGS= \
        -I$(top_srcdir)/camel                           \
        -I$(top_srcdir)/camel/tests/lib                 \
        -DG_LOG_DOMAIN=\"evolution-tests\"              \
-       -DSOURCEDIR=\"$(srcdir)\"                               \
+       -DSOURCEDIR=\"$(srcdir)\"                       \
        $(CAMEL_CFLAGS)
 
 MIMEFILTER_TESTS_LDADD= \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/tests/lib/libcameltest.a  \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la        \
+       $(top_builddir)/camel/tests/lib/libcameltest.a          \
        $(INTLLIBS)
 
 EXTRA_DIST =                           \

diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am
index 6264d60..4f9b77c 100644 (file)
--- a/camel/tests/misc/Makefile.am
+++ b/camel/tests/misc/Makefile.am
@@ -8,9 +8,8 @@ MISC_TESTS_CPPFLAGS= \
        $(CAMEL_CFLAGS)
 
 MISC_TESTS_LDADD= \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/tests/lib/libcameltest.a  \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la        \
+       $(top_builddir)/camel/tests/lib/libcameltest.a          \
        $(INTLLIBS)
 
 check_PROGRAMS =       \

diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
index f74103f..63f6ac6 100644 (file)
--- a/camel/tests/smime/Makefile.am
+++ b/camel/tests/smime/Makefile.am
@@ -9,9 +9,8 @@ SMIME_TESTS_CPPFLAGS= \
        $(CAMEL_CFLAGS)
 
 SMIME_TESTS_LDADD= \
-       $(top_builddir)/libedataserver/libedataserver-${API_VERSION}.la \
-       $(top_builddir)/camel/tests/lib/libcameltest.a                  \
-       $(top_builddir)/camel/libcamel-${API_VERSION}.la                \
+       $(top_builddir)/camel/tests/lib/libcameltest.a          \
+       $(top_builddir)/camel/libcamel-${API_VERSION}.la        \
        $(INTLLIBS)
 
 check_PROGRAMS =       \