# HG changeset patch # User Timo Sirainen # Date 1225550776 -7200 # Node ID 2d24b8b4630842637973414cbba44b5ed71ce70a # Parent 4aafdbe62680592be0dce0b8906ae59b5396f881 $STORAGE_LIBS now contains all the libraries that libstorage needs. There's no point in listing the same required libraries everywhere. diff -r 4aafdbe62680 -r 2d24b8b46308 configure.in --- a/configure.in Sat Nov 01 16:05:19 2008 +0200 +++ b/configure.in Sat Nov 01 16:46:16 2008 +0200 @@ -2261,7 +2261,18 @@ cydir_libs='$(top_builddir)/src/lib-storage/index/cydir/libstorage_cydir.a' raw_libs='$(top_builddir)/src/lib-storage/index/raw/libstorage_raw.a' shared_libs='$(top_builddir)/src/lib-storage/index/shared/libstorage_shared.a' -CORE_LIBS='$(top_builddir)/src/lib-storage/index/libstorage_index.a $(top_builddir)/src/lib-storage/libstorage.a $(top_builddir)/src/lib-index/libindex.a' + +REGISTER_LIBS='$(top_builddir)/src/lib-storage/register/libstorage-register.a '\ +'$(top_builddir)/src/lib-storage/list/libstorage_list.a' + +CORE_LIBS='$(top_builddir)/src/lib-storage/index/libstorage_index.a '\ +'$(top_builddir)/src/lib-storage/libstorage.a '\ +'$(top_builddir)/src/lib-index/libindex.a '\ +'$(top_builddir)/src/lib-imap/libimap.a '\ +'$(top_builddir)/src/lib-mail/libmail.a '\ +'$(top_builddir)/src/lib-auth/libauth.a '\ +'$(top_builddir)/src/lib-charset/libcharset.a '\ +'$(top_builddir)/src/lib/liblib.a' deliver_storage="raw" STORAGE_LIBS= @@ -2271,7 +2282,7 @@ fi STORAGE_LIBS="$STORAGE_LIBS `eval echo \\$${storage}_libs`" done -STORAGE_LIBS="$STORAGE_LIBS $CORE_LIBS" +STORAGE_LIBS="$REGISTER_LIBS $STORAGE_LIBS $CORE_LIBS" AC_SUBST(STORAGE_LIBS) AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages) diff -r 4aafdbe62680 -r 2d24b8b46308 src/deliver/Makefile.am --- a/src/deliver/Makefile.am Sat Nov 01 16:05:19 2008 +0200 +++ b/src/deliver/Makefile.am Sat Nov 01 16:46:16 2008 +0200 @@ -24,15 +24,8 @@ ../lib/mountpoint.o libs = \ - ../lib-storage/register/libstorage-register.a \ - ../lib-storage/list/libstorage_list.a \ $(STORAGE_LIBS) \ - ../lib-imap/libimap.a \ - ../lib-mail/libmail.a \ ../lib-dict/libdict.a \ - ../lib-charset/libcharset.a \ - ../lib-auth/libauth.a \ - ../lib/liblib.a \ $(unused_objects) deliver_LDADD = \ diff -r 4aafdbe62680 -r 2d24b8b46308 src/imap/Makefile.am --- a/src/imap/Makefile.am Sat Nov 01 16:05:19 2008 +0200 +++ b/src/imap/Makefile.am Sat Nov 01 16:46:16 2008 +0200 @@ -19,15 +19,8 @@ ../lib/mountpoint.o libs = \ - ../lib-storage/register/libstorage-register.a \ - ../lib-storage/list/libstorage_list.a \ $(STORAGE_LIBS) \ - ../lib-imap/libimap.a \ - ../lib-mail/libmail.a \ - ../lib-auth/libauth.a \ ../lib-dict/libdict.a \ - ../lib-charset/libcharset.a \ - ../lib/liblib.a \ $(unused_objects) imap_LDADD = \ diff -r 4aafdbe62680 -r 2d24b8b46308 src/plugins/convert/Makefile.am --- a/src/plugins/convert/Makefile.am Sat Nov 01 16:05:19 2008 +0200 +++ b/src/plugins/convert/Makefile.am Sat Nov 01 16:46:16 2008 +0200 @@ -28,15 +28,7 @@ common_objects = \ convert-storage.lo -libs = \ - $(top_builddir)/src/lib-storage/register/libstorage-register.a \ - $(top_builddir)/src/lib-storage/list/libstorage_list.a \ - $(STORAGE_LIBS) \ - $(top_builddir)/src/lib-imap/libimap.a \ - $(top_builddir)/src/lib-mail/libmail.a \ - $(top_builddir)/src/lib-auth/libauth.a \ - $(top_builddir)/src/lib-charset/libcharset.a \ - $(top_builddir)/src/lib/liblib.a +libs = $(STORAGE_LIBS) convert_tool_LDADD = \ $(common_objects) \ diff -r 4aafdbe62680 -r 2d24b8b46308 src/plugins/expire/Makefile.am --- a/src/plugins/expire/Makefile.am Sat Nov 01 16:05:19 2008 +0200 +++ b/src/plugins/expire/Makefile.am Sat Nov 01 16:46:16 2008 +0200 @@ -32,16 +32,8 @@ expire-tool.c libs = \ - $(top_builddir)/src/lib-storage/register/libstorage-register.a \ - $(top_builddir)/src/lib-storage/list/libstorage_list.a \ $(STORAGE_LIBS) \ - $(top_builddir)/src/lib-imap/libimap.a \ - $(top_builddir)/src/lib-mail/libmail.a \ - $(top_builddir)/src/lib-auth/libauth.a \ - $(top_builddir)/src/lib-dict/libdict.a \ - $(top_builddir)/src/lib-auth/libauth.a \ - $(top_builddir)/src/lib-charset/libcharset.a \ - $(top_builddir)/src/lib/liblib.a + $(top_builddir)/src/lib-dict/libdict.a expire_tool_LDADD = \ $(libs) \ diff -r 4aafdbe62680 -r 2d24b8b46308 src/plugins/fts-squat/Makefile.am --- a/src/plugins/fts-squat/Makefile.am Sat Nov 01 16:05:19 2008 +0200 +++ b/src/plugins/fts-squat/Makefile.am Sat Nov 01 16:46:16 2008 +0200 @@ -31,15 +31,7 @@ squat-trie.lo \ squat-uidlist.lo -libs = \ - $(top_builddir)/src/lib-storage/register/libstorage-register.a \ - $(STORAGE_LIBS) \ - $(top_builddir)/src/lib-storage/list/libstorage_list.a \ - $(top_builddir)/src/lib-imap/libimap.a \ - $(top_builddir)/src/lib-mail/libmail.a \ - $(top_builddir)/src/lib-auth/libauth.a \ - $(top_builddir)/src/lib-charset/libcharset.a \ - $(top_builddir)/src/lib/liblib.a +libs = $(STORAGE_LIBS) squat_test_LDADD = \ $(common_objects) \ diff -r 4aafdbe62680 -r 2d24b8b46308 src/pop3/Makefile.am --- a/src/pop3/Makefile.am Sat Nov 01 16:05:19 2008 +0200 +++ b/src/pop3/Makefile.am Sat Nov 01 16:46:16 2008 +0200 @@ -17,15 +17,8 @@ ../lib/mountpoint.o libs = \ - ../lib-storage/register/libstorage-register.a \ - ../lib-storage/list/libstorage_list.a \ $(STORAGE_LIBS) \ - ../lib-imap/libimap.a \ - ../lib-mail/libmail.a \ - ../lib-auth/libauth.a \ ../lib-dict/libdict.a \ - ../lib-charset/libcharset.a \ - ../lib/liblib.a \ $(unused_objects) pop3_LDADD = \