dovecot-1.3: Build libdovecot.so and libdovecot-storage.so.
dovecot at dovecot.org
dovecot at dovecot.org
Sat Apr 4 02:48:14 EEST 2009
details: http://hg.dovecot.org/dovecot-1.3/rev/1b586a2fee8b
changeset: 9017:1b586a2fee8b
user: Timo Sirainen <tss at iki.fi>
date: Fri Apr 03 19:47:59 2009 -0400
description:
Build libdovecot.so and libdovecot-storage.so.
Based on patch by Stephan Bosch.
diffstat:
38 files changed, 132 insertions(+), 141 deletions(-)
.hgignore | 1
configure.in | 35 ++++++++++-------------------
src/Makefile.am | 3 +-
src/auth/Makefile.am | 7 ++---
src/config/Makefile.am | 3 --
src/deliver/Makefile.am | 12 +--------
src/dict/Makefile.am | 6 +---
src/imap-login/Makefile.am | 8 +-----
src/imap/Makefile.am | 11 +--------
src/lib-auth/Makefile.am | 4 +--
src/lib-charset/Makefile.am | 4 +--
src/lib-dict/Makefile.am | 5 ++--
src/lib-dovecot/Makefile.am | 21 +++++++++++++++++
src/lib-imap/Makefile.am | 4 +--
src/lib-index/Makefile.am | 4 +--
src/lib-mail/Makefile.am | 4 +--
src/lib-settings/Makefile.am | 4 +--
src/lib-sql/Makefile.am | 4 +--
src/lib-storage/Makefile.am | 14 +++++++++--
src/lib-storage/index/Makefile.am | 7 ++++-
src/lib-storage/index/cydir/Makefile.am | 4 +--
src/lib-storage/index/dbox/Makefile.am | 4 +--
src/lib-storage/index/maildir/Makefile.am | 4 +--
src/lib-storage/index/mbox/Makefile.am | 4 +--
src/lib-storage/index/raw/Makefile.am | 4 +--
src/lib-storage/index/shared/Makefile.am | 4 +--
src/lib-storage/list/Makefile.am | 4 +--
src/lib-storage/register/Makefile.am | 4 +--
src/lib/Makefile.am | 4 +--
src/login-common/Makefile.am | 7 ++++-
src/master/Makefile.am | 5 +---
src/plugins/convert/Makefile.am | 5 ++--
src/plugins/expire/Makefile.am | 5 +---
src/plugins/fts-squat/Makefile.am | 4 ++-
src/pop3-login/Makefile.am | 7 +----
src/pop3/Makefile.am | 12 +--------
src/tests/Makefile.am | 11 ++-------
src/util/Makefile.am | 20 +++++++---------
diffs (truncated from 821 to 300 lines):
diff -r fdcb1629ddcc -r 1b586a2fee8b .hgignore
--- a/.hgignore Fri Apr 03 19:04:43 2009 -0400
+++ b/.hgignore Fri Apr 03 19:47:59 2009 -0400
@@ -47,6 +47,7 @@ Makefile.in
**/Makefile
**/Makefile.in
**/Info.plist
+**/.libs
doc/wiki/*.txt
doc/wiki/Makefile.am
diff -r fdcb1629ddcc -r 1b586a2fee8b configure.in
--- a/configure.in Fri Apr 03 19:04:43 2009 -0400
+++ b/configure.in Fri Apr 03 19:47:59 2009 -0400
@@ -2210,35 +2210,25 @@ dnl ** storage classes
dnl ** storage classes
dnl **
-maildir_libs='$(top_builddir)/src/lib-storage/index/maildir/libstorage_maildir.a'
-mbox_libs='$(top_builddir)/src/lib-storage/index/mbox/libstorage_mbox.a'
-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'
-
-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'
+maildir_libs='$(top_builddir)/src/lib-storage/index/maildir/libstorage_maildir.la'
+mbox_libs='$(top_builddir)/src/lib-storage/index/mbox/libstorage_mbox.la'
+dbox_libs='$(top_builddir)/src/lib-storage/index/dbox/libstorage_dbox.la'
+cydir_libs='$(top_builddir)/src/lib-storage/index/cydir/libstorage_cydir.la'
+raw_libs='$(top_builddir)/src/lib-storage/index/raw/libstorage_raw.la'
+shared_libs='$(top_builddir)/src/lib-storage/index/shared/libstorage_shared.la'
+
+CORE_LIBS='$(top_builddir)/src/lib-dovecot/libdovecot.la'
+STORAGE_LIB='$(top_builddir)/src/lib-storage/libdovecot-storage.la'
deliver_storage="raw"
-STORAGE_LIBS=
+LINKED_STORAGE_LIBS=
for storage in $mail_storages; do
if test "$storage" = "$deliver_storage"; then
deliver_storage=""
fi
- STORAGE_LIBS="$STORAGE_LIBS `eval echo \\$${storage}_libs`"
+ LINKED_STORAGE_LIBS="$LINKED_STORAGE_LIBS `eval echo \\$${storage}_libs`"
done
-STORAGE_LIBS="$REGISTER_LIBS $STORAGE_LIBS $CORE_LIBS"
-AC_SUBST(STORAGE_LIBS)
+AC_SUBST(LINKED_STORAGE_LIBS)
AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages)
if test -n "$deliver_storage" && test "$want_deliver" != no; then
@@ -2392,6 +2382,7 @@ src/lib-mail/Makefile
src/lib-mail/Makefile
src/lib-ntlm/Makefile
src/lib-otp/Makefile
+src/lib-dovecot/Makefile
src/lib-settings/Makefile
src/lib-storage/Makefile
src/lib-storage/list/Makefile
diff -r fdcb1629ddcc -r 1b586a2fee8b src/Makefile.am
--- a/src/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -8,6 +8,7 @@ endif
SUBDIRS = \
lib \
+ lib-auth \
lib-dict \
lib-sql \
lib-ntlm \
@@ -17,8 +18,8 @@ SUBDIRS = \
lib-mail \
lib-imap \
lib-index \
+ lib-dovecot \
lib-storage \
- lib-auth \
auth \
config \
dict \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/auth/Makefile.am
--- a/src/auth/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/auth/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -39,11 +39,10 @@ libpassword_a_SOURCES = \
dovecot_auth_LDADD = \
libpassword.a \
- ../lib-settings/libsettings.a \
../lib-ntlm/libntlm.a \
../lib-otp/libotp.a \
- ../lib-sql/libsql.a \
- ../lib/liblib.a \
+ ../lib-sql/libsql.la \
+ ../lib-dovecot/libdovecot.la \
$(AUTH_LIBS) \
$(MODULE_LIBS)
@@ -158,7 +157,7 @@ endif
endif
checkpassword_reply_LDADD = \
- ../lib/liblib.a
+ ../lib-dovecot/libdovecot.la
checkpassword_reply_sources = \
checkpassword-reply.c
diff -r fdcb1629ddcc -r 1b586a2fee8b src/config/Makefile.am
--- a/src/config/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/config/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
-DSSLDIR=\""$(ssldir)\""
doveconf_LDADD = \
- ../lib-settings/libsettings.a \
- ../lib/liblib.a \
+ ../lib-dovecot/libdovecot.la \
$(RAND_LIBS)
doveconf_SOURCES = \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/deliver/Makefile.am
--- a/src/deliver/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/deliver/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -21,17 +21,9 @@ AM_CPPFLAGS = \
deliver_LDFLAGS = -export-dynamic
-# get some functions included which only plugins use. liblib should probably
-# be a shared library so this wouldn't be needed..
-unused_objects = \
- ../lib/mountpoint.o \
- ../lib-imap/imap-util.o
-
libs = \
- $(STORAGE_LIBS) \
- ../lib-dict/libdict.a \
- ../lib-settings/libsettings.a \
- $(unused_objects)
+ ../lib-storage/libdovecot-storage.la \
+ ../lib-dovecot/libdovecot.la
deliver_LDADD = \
$(libs) \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/dict/Makefile.am
--- a/src/dict/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/dict/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -13,10 +13,8 @@ dict_LDFLAGS = -export-dynamic
libs = \
../lib-dict/libdict_backend.a \
- ../lib-dict/libdict.a \
- ../lib-sql/libsql.a \
- ../lib-settings/libsettings.a \
- ../lib/liblib.a
+ ../lib-sql/libsql.la \
+ ../lib-dovecot/libdovecot.la
dict_LDADD = \
$(libs) \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/imap-login/Makefile.am
--- a/src/imap-login/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/imap-login/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -9,12 +9,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/login-common
imap_login_LDADD = \
- ../login-common/liblogin-common.a \
- ../lib-imap/libimap.a \
- ../lib-auth/libauth.a \
- ../lib-settings/libsettings.a \
- ../lib/liblib.a \
- $(SSL_LIBS)
+ ../login-common/libdovecot-login.la \
+ ../lib-dovecot/libdovecot.la
imap_login_SOURCES = \
client.c \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/imap/Makefile.am
--- a/src/imap/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/imap/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -15,16 +15,9 @@ AM_CPPFLAGS = \
imap_LDFLAGS = -export-dynamic
-# get some functions included which only plugins use. liblib should probably
-# be a shared library so this wouldn't be needed..
-unused_objects = \
- ../lib/mountpoint.o
-
libs = \
- $(STORAGE_LIBS) \
- ../lib-dict/libdict.a \
- ../lib-settings/libsettings.a \
- $(unused_objects)
+ ../lib-storage/libdovecot-storage.la \
+ ../lib-dovecot/libdovecot.la
imap_LDADD = \
$(libs) \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/lib-auth/Makefile.am
--- a/src/lib-auth/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/lib-auth/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -1,9 +1,9 @@ noinst_LIBRARIES = libauth.a
-noinst_LIBRARIES = libauth.a
+noinst_LTLIBRARIES = libauth.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib
-libauth_a_SOURCES = \
+libauth_la_SOURCES = \
auth-client.c \
auth-master.c \
auth-server-connection.c \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/lib-charset/Makefile.am
--- a/src/lib-charset/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/lib-charset/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -1,9 +1,9 @@ noinst_LIBRARIES = libcharset.a
-noinst_LIBRARIES = libcharset.a
+noinst_LTLIBRARIES = libcharset.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib
-libcharset_a_SOURCES = \
+libcharset_la_SOURCES = \
charset-iconv.c \
charset-utf8.c
diff -r fdcb1629ddcc -r 1b586a2fee8b src/lib-dict/Makefile.am
--- a/src/lib-dict/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/lib-dict/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -1,4 +1,5 @@ noinst_LIBRARIES = libdict.a libdict_bac
-noinst_LIBRARIES = libdict.a libdict_backend.a
+noinst_LTLIBRARIES = libdict.la
+noinst_LIBRARIES = libdict_backend.a
dict_drivers = @dict_drivers@
@@ -19,7 +20,7 @@ backend_sources = \
dict-sql.c \
dict-sql-settings.c
-libdict_a_SOURCES = \
+libdict_la_SOURCES = \
$(base_sources)
libdict_backend_a_SOURCES = \
diff -r fdcb1629ddcc -r 1b586a2fee8b src/lib-dovecot/Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lib-dovecot/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -0,0 +1,21 @@
+pkglib_LTLIBRARIES = libdovecot.la
+
+libdovecot_la_SOURCES =
+
+libs = \
+ ../lib-settings/libsettings.la \
+ ../lib-dict/libdict.la \
+ ../lib-index/libindex.la \
+ ../lib-imap/libimap.la \
+ ../lib-mail/libmail.la \
+ ../lib-auth/libauth.la \
+ ../lib-charset/libcharset.la \
+ ../lib/liblib.la
+
+libdovecot_la_LIBADD = \
+ $(libs) \
+ $(MODULE_LIBS)
+
+libdovecot_la_DEPENDENCIES = $(libs)
+
+libdovecot_la_LDFLAGS = -export-dynamic
diff -r fdcb1629ddcc -r 1b586a2fee8b src/lib-imap/Makefile.am
--- a/src/lib-imap/Makefile.am Fri Apr 03 19:04:43 2009 -0400
+++ b/src/lib-imap/Makefile.am Fri Apr 03 19:47:59 2009 -0400
@@ -1,11 +1,11 @@ noinst_LIBRARIES = libimap.a
-noinst_LIBRARIES = libimap.a
+noinst_LTLIBRARIES = libimap.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib-charset \
-I$(top_srcdir)/src/lib-mail
-libimap_a_SOURCES = \
+libimap_la_SOURCES = \
imap-base-subject.c \
imap-bodystructure.c \
imap-date.c \
More information about the dovecot-cvs
mailing list