From c83477345fa5dceb62b85efd0a76a54f94a78858 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 3 Dec 2004 03:36:57 +0000 Subject: 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 * 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 --- camel/providers/pop3/Makefile.am | 15 ++++----------- camel/providers/pop3/camel-pop3-engine.h | 2 +- camel/providers/pop3/camel-pop3-folder.c | 2 +- camel/providers/pop3/camel-pop3-store.c | 3 ++- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'camel/providers/pop3') diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am index 84f5477f97..49df41e230 100644 --- a/camel/providers/pop3/Makefile.am +++ b/camel/providers/pop3/Makefile.am @@ -1,20 +1,13 @@ ## Process this file with automake to produce Makefile.in -libcamelpop3includedir = $(privincludedir)/camel - camel_provider_LTLIBRARIES = libcamelpop3.la camel_provider_DATA = libcamelpop3.urls INCLUDES = \ - -I.. \ - -I$(srcdir)/.. \ - -I$(srcdir)/../../.. \ + -I$(top_srcdir) \ -I$(top_srcdir)/intl \ -I$(top_srcdir)/camel \ - -I$(top_srcdir)/e-util \ $(CAMEL_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ - $(GTK_INCLUDEDIR) \ -DG_LOG_DOMAIN=\"camel-pop3-provider\" libcamelpop3_la_SOURCES = \ @@ -24,15 +17,15 @@ libcamelpop3_la_SOURCES = \ camel-pop3-stream.c \ camel-pop3-store.c -libcamelpop3include_HEADERS = \ +noinst_HEADERS = \ camel-pop3-engine.h \ camel-pop3-folder.h \ camel-pop3-stream.h \ camel-pop3-store.h - libcamelpop3_la_LDFLAGS = -avoid-version -module -libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la +libcamelpop3_la_LIBADD = \ + $(top_builddir)/libedataserver/libedataserver-${BASE_VERSION}.la EXTRA_DIST = libcamelpop3.urls diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h index 3114980311..48938bbf48 100644 --- a/camel/providers/pop3/camel-pop3-engine.h +++ b/camel/providers/pop3/camel-pop3-engine.h @@ -22,7 +22,7 @@ #define _CAMEL_POP3_ENGINE_H #include -#include "e-util/e-msgport.h" +#include "libedataserver/e-msgport.h" #include "camel-pop3-stream.h" #define CAMEL_POP3_ENGINE(obj) CAMEL_CHECK_CAST (obj, camel_pop3_engine_get_type (), CamelPOP3Engine) diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c index 23a5bc7d88..e0d91f1eff 100644 --- a/camel/providers/pop3/camel-pop3-folder.c +++ b/camel/providers/pop3/camel-pop3-folder.c @@ -39,7 +39,7 @@ #include "camel-data-cache.h" #include "camel-i18n.h" -#include +#include #include #include diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index b9f07ec0e8..46a1fd3fe6 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -45,7 +45,7 @@ #include "camel-session.h" #include "camel-exception.h" #include "camel-url.h" -#include "e-util/md5-utils.h" +#include "libedataserver/md5-utils.h" #include "camel-pop3-engine.h" #include "camel-sasl.h" #include "camel-data-cache.h" @@ -55,6 +55,7 @@ #include "camel-tcp-stream-ssl.h" #endif #include "camel-i18n.h" +#include "camel-net-utils.h" /* Specified in RFC 1939 */ #define POP3_PORT "110" -- cgit v1.2.3