From: Timo Sirainen Date: Sat, 1 Nov 2008 14:46:16 +0000 (+0200) Subject: $STORAGE_LIBS now contains all the libraries that libstorage needs. X-Git-Tag: 1.2.alpha4~113 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88604ff42d91266ac8cae7837057127db57e229b;p=thirdparty%2Fdovecot%2Fcore.git $STORAGE_LIBS now contains all the libraries that libstorage needs. There's no point in listing the same required libraries everywhere. --HG-- branch : HEAD --- diff --git a/configure.in b/configure.in index 77c83f56d4..69c82cc3bf 100644 --- a/configure.in +++ b/configure.in @@ -2261,7 +2261,18 @@ dbox_libs='$(top_builddir)/src/lib-storage/index/dbox/libstorage_dbox.a' 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 @@ for storage in $mail_storages; do 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 --git a/src/deliver/Makefile.am b/src/deliver/Makefile.am index 9625d2a499..988cd676d1 100644 --- a/src/deliver/Makefile.am +++ b/src/deliver/Makefile.am @@ -24,15 +24,8 @@ unused_objects = \ ../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 --git a/src/imap/Makefile.am b/src/imap/Makefile.am index 6069a086a8..1bcb1da7bd 100644 --- a/src/imap/Makefile.am +++ b/src/imap/Makefile.am @@ -19,15 +19,8 @@ unused_objects = \ ../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 --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am index 6c67808c7b..d779db76d8 100644 --- a/src/plugins/convert/Makefile.am +++ b/src/plugins/convert/Makefile.am @@ -28,15 +28,7 @@ convert_tool_SOURCES = \ 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 --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am index 4487923997..05f3338fe9 100644 --- a/src/plugins/expire/Makefile.am +++ b/src/plugins/expire/Makefile.am @@ -32,16 +32,8 @@ expire_tool_SOURCES = \ 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 --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am index ac1fc738e1..33d2e2a8fc 100644 --- a/src/plugins/fts-squat/Makefile.am +++ b/src/plugins/fts-squat/Makefile.am @@ -31,15 +31,7 @@ common_objects = \ 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 --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am index 0408b89b58..ae6cf985ec 100644 --- a/src/pop3/Makefile.am +++ b/src/pop3/Makefile.am @@ -17,15 +17,8 @@ unused_objects = \ ../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 = \