have our own so we don't need to link with glib.

        * camel-lock-helper.c (g_strerror): have our own so we don't need
        to link with glib.

        * providers/*/Makefile.am: Do not install ANY provider header
        files.  No providers are subclassable.  No providers are directly
        linkable.

        * camel.pc.in: create package config file.

        * tests/lib/folders.c (test_folder_message_ops): updated counts for
        delete also marking unread.

        * tests/lib/camel-test.c (camel_test_provider_init): new api for
        initialising test system 'in-build'.

        * camel-provider.c: remove the assertions, init if we need to,k
        use pthread_once stuff to serialise it.

        * tests/folder/test3.c (main): remove gtk stuff (???).

        * tests/*: Fix all the makefiles.  Made make-check work 'in-build'.

        * tests/lib/folders.c (test_folder_counts): update for api changes.
        (test_message_info): similar.

        * providers/Makefile.am: removed groupwise from the build, this
        can't go in here anymore, not in its current state.

        * camel-net-utils.c (camel_gethostbyaddr_r)
        (camel_gethostbyname_r): the old e_gethost* calls from
        e-host-utils.c.

2004-11-15  Not Zed  <NotZed@Ximian.com>

        * providers/imap/camel-imap-utils.c (imap_path_to_physical):
        copied from e-path.c.
        (imap_path_find_folders): copied from e-path.c.

        * camel.h: remove the provider stuff from the header.

        * camel-provider.c: globalise provider_init variable, and asserton
        it in all functions that rely on it.

        * camel-service.c: removed getaddrinfo/etc.

        * camel-net-utils.[ch]: separate out camel_getaddrinfo etc.

        * Makefile.am: split camel into 2 libraries, libcamel and
        libcamel-store.

        * camel-multipart-signed.c (camel_multipart_signed_sign)
        (camel_multipart_signed_verify, prepare_sign): remove old
        deprecated api.

        * camel-multipart-encrypted.c (camel_multipart_encrypted_encrypt)
        (camel_multipart_encrypted_decrypt): remove old deprecated api.

svn path=/trunk/; revision=28046

2 files changed, 6 insertions, 13 deletions

diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index ad07472e85..fbf3199a8b 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -1,19 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-libcamellocalincludedir = $(privincludedir)/camel
-
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
 
-INCLUDES = -I.. \
-	-I$(srcdir)/..				\
+INCLUDES = \
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/e-util			\
 	-I$(top_srcdir)				\
 	$(CAMEL_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(GTK_INCLUDEDIR)			\
 	-DG_LOG_DOMAIN=\"camel-local-provider\"
 
 libcamellocal_la_SOURCES = 			\
@@ -34,7 +28,7 @@ libcamellocal_la_SOURCES = 			\
 	camel-spool-store.c			\
 	camel-spool-summary.c
 
-libcamellocalinclude_HEADERS =			\
+noinst_HEADERS =				\
 	camel-local-folder.h			\
 	camel-local-store.h			\
 	camel-local-summary.h			\
@@ -49,13 +43,12 @@ libcamellocalinclude_HEADERS =			\
 	camel-maildir-summary.h			\
 	camel-spool-folder.h			\
 	camel-spool-store.h			\
-	camel-spool-summary.h
-
-noinst_HEADERS =				\
+	camel-spool-summary.h			\
 	camel-local-private.h
 
 libcamellocal_la_LDFLAGS = -avoid-version -module
 
-libcamellocal_la_LIBADD = $(top_builddir)/e-util/libeutil.la
+libcamellocal_la_LIBADD = \
+	$(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la
 
 EXTRA_DIST = libcamellocal.urls
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 07183d2cb4..95b8bdc8c8 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -41,7 +41,7 @@
 #include <camel/camel-operation.h>
 
 #include "camel-private.h"
-#include "e-util/e-memory.h"
+#include "libedataserver/e-memory.h"
 #include "camel-i18n.h"
 
 #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/