Mercurial > dovecot > original-hg > dovecot-1.2

changeset 8376:2d24b8b46308 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
$STORAGE_LIBS now contains all the libraries that libstorage needs. There's no point in listing the same required libraries everywhere.
author Timo Sirainen <tss@iki.fi>
date Sat, 01 Nov 2008 16:46:16 +0200
parents 4aafdbe62680
children a76540e6d773
files configure.in src/deliver/Makefile.am src/imap/Makefile.am src/plugins/convert/Makefile.am src/plugins/expire/Makefile.am src/plugins/fts-squat/Makefile.am src/pop3/Makefile.am
diffstat 7 files changed, 16 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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 = \
--- 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 = \
--- 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) \
--- 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) \
--- 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) \
--- 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 = \