diff options
author | Not Zed <NotZed@Ximian.com> | 2004-12-03 11:36:57 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2004-12-03 11:36:57 +0800 |
commit | c83477345fa5dceb62b85efd0a76a54f94a78858 (patch) | |
tree | aaea668a8d4f768b96174ad81aca864983addd0c /camel/Makefile.am | |
parent | 300ec3f74d9f2ea59503ad267c927723ea59fd3e (diff) | |
download | gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.tar gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.tar.gz gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.tar.bz2 gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.tar.lz gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.tar.xz gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.tar.zst gsoc2013-evolution-c83477345fa5dceb62b85efd0a76a54f94a78858.zip |
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
Diffstat (limited to 'camel/Makefile.am')
-rw-r--r-- | camel/Makefile.am | 233 |
1 files changed, 126 insertions, 107 deletions
diff --git a/camel/Makefile.am b/camel/Makefile.am index f835bbf741..a068c77b40 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -2,40 +2,35 @@ SUBDIRS = . providers tests +%-$(BASE_VERSION).pc: %.pc + cp $< $@ + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = camel-$(BASE_VERSION).pc + libcamelincludedir = $(privincludedir)/camel +libcamel_providerincludedir = $(privincludedir)/camel -camellibexecdir = $(privlibexecdir)/camel +camellibexecdir = $(libexecdir)/camel/$(BASE_VERSION) camellibexec_PROGRAMS = camel-lock-helper camel-index-control -privlib_LTLIBRARIES = libcamel.la +lib_LTLIBRARIES = libcamel-1.2.la libcamel-provider-1.2.la INCLUDES = -I.. -I$(srcdir)/.. \ -I$(top_srcdir)/intl \ - -I$(top_srcdir)/e-util \ -DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \ -DG_LOG_DOMAIN=\"camel\" \ $(CAMEL_CFLAGS) -libcamel_la_SOURCES = \ - broken-date-parser.c \ - camel-address.c \ - camel-arg.c \ - camel-block-file.c \ - camel-certdb.c \ - camel-charset-map.c \ +libcamel_provider_1_2_la_SOURCES = \ camel-cipher-context.c \ - camel-data-cache.c \ - camel-data-wrapper.c \ - camel-debug.c \ camel-digest-folder.c \ camel-digest-store.c \ camel-digest-summary.c \ camel-disco-diary.c \ camel-disco-folder.c \ camel-disco-store.c \ - camel-exception.c \ - camel-file-utils.c \ camel-filter-driver.c \ camel-filter-search.c \ camel-folder-search.c \ @@ -43,27 +38,119 @@ libcamel_la_SOURCES = \ camel-folder-thread.c \ camel-folder.c \ camel-gpg-context.c \ - camel-html-parser.c \ camel-http-stream.c \ + camel-movemail.c \ + camel-provider.c \ + camel-sasl-anonymous.c \ + camel-sasl-cram-md5.c \ + camel-sasl-digest-md5.c \ + camel-sasl-gssapi.c \ + camel-sasl-kerberos4.c \ + camel-sasl-login.c \ + camel-sasl-ntlm.c \ + camel-sasl-plain.c \ + camel-sasl-popb4smtp.c \ + camel-sasl.c \ + camel-search-private.c \ + camel-service.c \ + camel-session.c \ + camel-smime-context.c \ + camel-store-summary.c \ + camel-store.c \ + camel-tcp-stream-openssl.c \ + camel-tcp-stream-raw.c \ + camel-tcp-stream-ssl.c \ + camel-tcp-stream.c \ + camel-transport.c \ + camel-uid-cache.c \ + camel-vee-folder.c \ + camel-vee-store.c \ + camel-vee-summary.c \ + camel-vtrash-folder.c + +libcamel_providerinclude_HEADERS = \ + camel-cipher-context.h \ + camel-digest-folder.h \ + camel-digest-store.h \ + camel-digest-summary.h \ + camel-disco-diary.h \ + camel-disco-folder.h \ + camel-disco-store.h \ + camel-filter-driver.h \ + camel-filter-search.h \ + camel-folder-search.h \ + camel-folder-summary.h \ + camel-folder-thread.h \ + camel-folder.h \ + camel-gpg-context.h \ + camel-http-stream.h \ + camel-movemail.h \ + camel-provider.h \ + camel-sasl-anonymous.h \ + camel-sasl-cram-md5.h \ + camel-sasl-digest-md5.h \ + camel-sasl-gssapi.h \ + camel-sasl-kerberos4.h \ + camel-sasl-login.h \ + camel-sasl-ntlm.h \ + camel-sasl-plain.h \ + camel-sasl-popb4smtp.h \ + camel-sasl.h \ + camel-service.h \ + camel-session.h \ + camel-smime-context.h \ + camel-store-summary.h \ + camel-store.h \ + camel-tcp-stream-raw.h \ + camel-tcp-stream-ssl.h \ + camel-tcp-stream.h \ + camel-transport.h \ + camel-uid-cache.h \ + camel-vee-folder.h \ + camel-vee-store.h \ + camel-vee-summary.h \ + camel-vtrash-folder.h + +libcamel_provider_1_2_la_LDFLAGS = -version-info $(LIBCAMEL_CURRENT):$(LIBCAMEL_REVISION):$(LIBCAMEL_AGE) + +libcamel_provider_1_2_la_LIBADD = \ + $(top_builddir)/libedataserver/libedataserver-$(BASE_VERSION).la \ + libcamel-$(BASE_VERSION).la \ + $(CAMEL_LIBS) + +libcamel_1_2_la_SOURCES = \ + broken-date-parser.c \ + camel-address.c \ + camel-arg.c \ + camel-block-file.c \ + camel-certdb.c \ + camel-charset-map.c \ + camel-data-cache.c \ + camel-data-wrapper.c \ + camel-debug.c \ + camel-exception.c \ + camel-file-utils.c \ + camel-html-parser.c \ camel-index.c \ camel-internet-address.c \ camel-junk-plugin.c \ - camel-lock.c \ + camel-list-utils.c \ camel-lock-client.c \ + camel-lock.c \ camel-medium.c \ - camel-mime-filter-bestenc.c \ camel-mime-filter-basic.c \ - camel-mime-filter-charset.c \ + camel-mime-filter-bestenc.c \ camel-mime-filter-canon.c \ + camel-mime-filter-charset.c \ camel-mime-filter-crlf.c \ camel-mime-filter-enriched.c \ camel-mime-filter-from.c \ camel-mime-filter-gzip.c \ camel-mime-filter-html.c \ - camel-mime-filter-tohtml.c \ camel-mime-filter-index.c \ camel-mime-filter-linewrap.c \ camel-mime-filter-save.c \ + camel-mime-filter-tohtml.c \ camel-mime-filter-windows.c \ camel-mime-filter-yenc.c \ camel-mime-filter.c \ @@ -72,33 +159,15 @@ libcamel_la_SOURCES = \ camel-mime-part-utils.c \ camel-mime-part.c \ camel-mime-utils.c \ - camel-movemail.c \ - camel-multipart.c \ camel-multipart-encrypted.c \ camel-multipart-signed.c \ - camel-list-utils.c \ + camel-multipart.c \ + camel-net-utils.c \ camel-object.c \ camel-operation.c \ camel-partition-table.c \ - camel-provider.c \ - camel-sasl.c \ - camel-sasl-anonymous.c \ - camel-sasl-cram-md5.c \ - camel-sasl-digest-md5.c \ - camel-sasl-gssapi.c \ - camel-sasl-kerberos4.c \ - camel-sasl-login.c \ - camel-sasl-ntlm.c \ - camel-sasl-plain.c \ - camel-sasl-popb4smtp.c \ - camel-search-private.c \ camel-seekable-stream.c \ camel-seekable-substream.c \ - camel-service.c \ - camel-session.c \ - camel-smime-context.c \ - camel-store.c \ - camel-store-summary.c \ camel-stream-buffer.c \ camel-stream-filter.c \ camel-stream-fs.c \ @@ -108,69 +177,44 @@ libcamel_la_SOURCES = \ camel-stream.c \ camel-string-utils.c \ camel-text-index.c \ - camel-tcp-stream-raw.c \ - camel-tcp-stream-ssl.c \ - camel-tcp-stream-openssl.c \ - camel-tcp-stream.c \ - camel-transport.c \ - camel-uid-cache.c \ - camel-url.c \ camel-url-scanner.c \ + camel-url.c \ camel-utf8.c \ - camel-vee-folder.c \ - camel-vee-store.c \ - camel-vee-summary.c \ - camel-vtrash-folder.c \ camel.c libcamelinclude_HEADERS = \ - broken-date-parser.h \ camel-address.h \ camel-arg.h \ camel-block-file.h \ camel-certdb.h \ camel-charset-map.h \ - camel-cipher-context.h \ camel-data-cache.h \ camel-data-wrapper.h \ camel-debug.h \ - camel-digest-folder.h \ - camel-digest-store.h \ - camel-digest-summary.h \ - camel-disco-diary.h \ - camel-disco-folder.h \ - camel-disco-store.h \ camel-exception-list.def \ camel-exception.h \ camel-file-utils.h \ - camel-filter-driver.h \ - camel-filter-search.h \ - camel-folder-search.h \ - camel-folder-summary.h \ - camel-folder-thread.h \ - camel-folder.h \ - camel-gpg-context.h \ - camel-http-stream.h \ + camel-i18n.h \ camel-index.h \ camel-internet-address.h \ - camel-i18n.h \ camel-junk-plugin.h \ - camel-lock.h \ + camel-list-utils.h \ camel-lock-client.h \ + camel-lock.h \ camel-medium.h \ - camel-mime-filter-bestenc.h \ camel-mime-filter-basic.h \ - camel-mime-filter-charset.h \ + camel-mime-filter-bestenc.h \ camel-mime-filter-canon.h \ + camel-mime-filter-charset.h \ camel-mime-filter-crlf.h \ camel-mime-filter-enriched.h \ camel-mime-filter-from.h \ camel-mime-filter-gzip.h \ camel-mime-filter-html.h \ - camel-mime-filter-tohtml.h \ camel-mime-filter-index.h \ camel-mime-filter-linewrap.h \ camel-mime-filter-save.h \ + camel-mime-filter-tohtml.h \ camel-mime-filter-windows.h \ camel-mime-filter-yenc.h \ camel-mime-filter.h \ @@ -179,32 +223,15 @@ libcamelinclude_HEADERS = \ camel-mime-part-utils.h \ camel-mime-part.h \ camel-mime-utils.h \ - camel-movemail.h \ - camel-multipart.h \ camel-multipart-encrypted.h \ camel-multipart-signed.h \ - camel-list-utils.h \ + camel-multipart.h \ + camel-net-utils.h \ camel-object.h \ camel-operation.h \ camel-partition-table.h \ - camel-provider.h \ - camel-sasl.h \ - camel-sasl-anonymous.h \ - camel-sasl-cram-md5.h \ - camel-sasl-digest-md5.h \ - camel-sasl-gssapi.h \ - camel-sasl-kerberos4.h \ - camel-sasl-login.h \ - camel-sasl-ntlm.h \ - camel-sasl-plain.h \ - camel-sasl-popb4smtp.h \ camel-seekable-stream.h \ camel-seekable-substream.h \ - camel-service.h \ - camel-session.h \ - camel-smime-context.h \ - camel-store.h \ - camel-store-summary.h \ camel-stream-buffer.h \ camel-stream-filter.h \ camel-stream-fs.h \ @@ -214,25 +241,16 @@ libcamelinclude_HEADERS = \ camel-stream.h \ camel-string-utils.h \ camel-text-index.h \ - camel-tcp-stream-raw.h \ - camel-tcp-stream-ssl.h \ - camel-tcp-stream.h \ - camel-transport.h \ camel-types.h \ - camel-uid-cache.h \ - camel-url.h \ camel-url-scanner.h \ + camel-url.h \ camel-utf8.h \ - camel-vee-folder.h \ - camel-vee-store.h \ - camel-vee-summary.h \ - camel-vtrash-folder.h \ camel.h -libcamel_la_LDFLAGS = -version-info 0:0:0 +libcamel_1_2_la_LDFLAGS = -version-info $(LIBCAMEL_CURRENT):$(LIBCAMEL_REVISION):$(LIBCAMEL_AGE) -libcamel_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ +libcamel_1_2_la_LIBADD = \ + $(top_builddir)/libedataserver/libedataserver-$(BASE_VERSION).la \ $(CAMEL_LIBS) camel_lock_helper_SOURCES = \ @@ -249,9 +267,8 @@ camel_index_control_SOURCES = \ camel-index-control.c camel_index_control_LDADD = \ - $(libcamel_la_LIBADD) \ - libcamel.la -# $(EVOLUTION_MAIL_LIBS) + libcamel-$(BASE_VERSION).la \ + $(libcamel_la_LIBADD) install-exec-hook: @if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \ @@ -286,11 +303,13 @@ install-exec-hook: fi noinst_HEADERS = \ + broken-date-parser.h \ camel-charset-map-private.h \ camel-private.h \ camel-search-private.h \ camel-html-parser.h EXTRA_DIST = \ + $(pkgconfig_DATA:.pc=.pc.in) \ ChangeLog.pre-1-4 \ README |