From: Timo Sirainen Date: Fri, 3 Apr 2009 23:47:59 +0000 (-0400) Subject: Build libdovecot.so and libdovecot-storage.so. X-Git-Tag: 2.0.alpha1~1035 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3b29d4b61f1549244a7509b798be6f806cf7d4e;p=thirdparty%2Fdovecot%2Fcore.git Build libdovecot.so and libdovecot-storage.so. Based on patch by Stephan Bosch. --HG-- branch : HEAD --- diff --git a/.hgignore b/.hgignore index 62c1b84c64..e9ffb2b74a 100644 --- a/.hgignore +++ b/.hgignore @@ -47,6 +47,7 @@ Makefile.in **/Makefile **/Makefile.in **/Info.plist +**/.libs doc/wiki/*.txt doc/wiki/Makefile.am diff --git a/configure.in b/configure.in index 272f84b100..3750e44db5 100644 --- a/configure.in +++ b/configure.in @@ -2210,35 +2210,25 @@ dnl ** 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-index/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 --git a/src/Makefile.am b/src/Makefile.am index 18151f4b99..35b238c45c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 --git a/src/auth/Makefile.am b/src/auth/Makefile.am index bdd8cbbf58..74c980f337 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -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 @@ else endif checkpassword_reply_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la checkpassword_reply_sources = \ checkpassword-reply.c diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 57cfb878f9..5453112e77 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -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 --git a/src/deliver/Makefile.am b/src/deliver/Makefile.am index 3694b6a5d5..2bbccae729 100644 --- a/src/deliver/Makefile.am +++ b/src/deliver/Makefile.am @@ -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 --git a/src/dict/Makefile.am b/src/dict/Makefile.am index 69ca29cea5..34808729c6 100644 --- a/src/dict/Makefile.am +++ b/src/dict/Makefile.am @@ -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 --git a/src/imap-login/Makefile.am b/src/imap-login/Makefile.am index 0eaf6c2e87..9ac9aae2b4 100644 --- a/src/imap-login/Makefile.am +++ b/src/imap-login/Makefile.am @@ -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 --git a/src/imap/Makefile.am b/src/imap/Makefile.am index e302bece79..5439ec171e 100644 --- a/src/imap/Makefile.am +++ b/src/imap/Makefile.am @@ -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 --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am index 6965692a64..0a7954999f 100644 --- a/src/lib-auth/Makefile.am +++ b/src/lib-auth/Makefile.am @@ -1,9 +1,9 @@ -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 --git a/src/lib-charset/Makefile.am b/src/lib-charset/Makefile.am index 6161fc7406..b929b72308 100644 --- a/src/lib-charset/Makefile.am +++ b/src/lib-charset/Makefile.am @@ -1,9 +1,9 @@ -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 --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am index eaa5c4e546..3200fd9b79 100644 --- a/src/lib-dict/Makefile.am +++ b/src/lib-dict/Makefile.am @@ -1,4 +1,5 @@ -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 --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am new file mode 100644 index 0000000000..815cda78fc --- /dev/null +++ b/src/lib-dovecot/Makefile.am @@ -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 --git a/src/lib-imap/Makefile.am b/src/lib-imap/Makefile.am index 61d66638e5..c52d985c2b 100644 --- a/src/lib-imap/Makefile.am +++ b/src/lib-imap/Makefile.am @@ -1,11 +1,11 @@ -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 \ diff --git a/src/lib-index/Makefile.am b/src/lib-index/Makefile.am index 1384a1cf2a..2b63fbc79e 100644 --- a/src/lib-index/Makefile.am +++ b/src/lib-index/Makefile.am @@ -1,10 +1,10 @@ -noinst_LIBRARIES = libindex.a +noinst_LTLIBRARIES = libindex.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-mail -libindex_a_SOURCES = \ +libindex_la_SOURCES = \ mail-cache.c \ mail-cache-compress.c \ mail-cache-decisions.c \ diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am index 0f1b651c5e..a6209060c3 100644 --- a/src/lib-mail/Makefile.am +++ b/src/lib-mail/Makefile.am @@ -1,10 +1,10 @@ -noinst_LIBRARIES = libmail.a +noinst_LTLIBRARIES = libmail.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-charset -libmail_a_SOURCES = \ +libmail_la_SOURCES = \ istream-header-filter.c \ mbox-from.c \ message-address.c \ diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am index a6f109b65a..da742f2b1b 100644 --- a/src/lib-settings/Makefile.am +++ b/src/lib-settings/Makefile.am @@ -1,9 +1,9 @@ -noinst_LIBRARIES = libsettings.a +noinst_LTLIBRARIES = libsettings.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib -libsettings_a_SOURCES = \ +libsettings_la_SOURCES = \ settings.c \ settings-parser.c diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am index 980b1d6d9a..c1178d285b 100644 --- a/src/lib-sql/Makefile.am +++ b/src/lib-sql/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libsql.a +noinst_LTLIBRARIES = libsql.la SQL_DRIVER_PLUGINS = @@ -42,7 +42,7 @@ driver_sources = \ driver-sqlite.c endif -libsql_a_SOURCES = \ +libsql_la_SOURCES = \ $(dist_sources) \ $(driver_sources) \ sql-drivers-register.c diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am index 838d900635..e33142a846 100644 --- a/src/lib-storage/Makefile.am +++ b/src/lib-storage/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = list index register -noinst_LIBRARIES = libstorage.a +pkglib_LTLIBRARIES = libdovecot-storage.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -DPKG_RUNDIR=\""$(rundir)"\" -libstorage_a_SOURCES = \ +libdovecot_storage_la_SOURCES = \ mail.c \ mail-copy.c \ mail-error.c \ @@ -26,6 +26,16 @@ libstorage_a_SOURCES = \ mailbox-tree.c \ mailbox-uidvalidity.c +libs = \ + list/libstorage_list.la \ + index/libstorage_index.la \ + register/libstorage_register.la + +libdovecot_storage_la_LIBADD = $(libs) +libdovecot_storage_la_DEPENDENCIES = $(libs) + +libdovecot_storage_la_LDFLAGS = -export-dynamic + headers = \ mail-copy.h \ mail-error.h \ diff --git a/src/lib-storage/index/Makefile.am b/src/lib-storage/index/Makefile.am index 67cd3a61a0..883a3210e9 100644 --- a/src/lib-storage/index/Makefile.am +++ b/src/lib-storage/index/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = maildir mbox dbox cydir raw shared -noinst_LIBRARIES = libstorage_index.a +noinst_LTLIBRARIES = libstorage_index.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage -libstorage_index_a_SOURCES = \ +libstorage_index_la_SOURCES = \ index-fetch.c \ index-mail.c \ index-mail-headers.c \ @@ -28,6 +28,9 @@ libstorage_index_a_SOURCES = \ index-thread-links.c \ index-transaction.c +libstorage_index_la_LIBADD = @LINKED_STORAGE_LIBS@ +libstorage_index_la_DEPENDENCIES = @LINKED_STORAGE_LIBS@ + headers = \ index-mail.h \ index-search-result.h \ diff --git a/src/lib-storage/index/cydir/Makefile.am b/src/lib-storage/index/cydir/Makefile.am index 18b356d5c8..b265076bdb 100644 --- a/src/lib-storage/index/cydir/Makefile.am +++ b/src/lib-storage/index/cydir/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_cydir.a +noinst_LTLIBRARIES = libstorage_cydir.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -libstorage_cydir_a_SOURCES = \ +libstorage_cydir_la_SOURCES = \ cydir-mail.c \ cydir-save.c \ cydir-sync.c \ diff --git a/src/lib-storage/index/dbox/Makefile.am b/src/lib-storage/index/dbox/Makefile.am index 0bbf70349b..8bef9efc6b 100644 --- a/src/lib-storage/index/dbox/Makefile.am +++ b/src/lib-storage/index/dbox/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_dbox.a +noinst_LTLIBRARIES = libstorage_dbox.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -libstorage_dbox_a_SOURCES = \ +libstorage_dbox_la_SOURCES = \ dbox-file.c \ dbox-file-fix.c \ dbox-file-maildir.c \ diff --git a/src/lib-storage/index/maildir/Makefile.am b/src/lib-storage/index/maildir/Makefile.am index 218d798f54..767016808e 100644 --- a/src/lib-storage/index/maildir/Makefile.am +++ b/src/lib-storage/index/maildir/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_maildir.a +noinst_LTLIBRARIES = libstorage_maildir.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -libstorage_maildir_a_SOURCES = \ +libstorage_maildir_la_SOURCES = \ maildir-copy.c \ maildir-filename.c \ maildir-keywords.c \ diff --git a/src/lib-storage/index/mbox/Makefile.am b/src/lib-storage/index/mbox/Makefile.am index 54768a83da..ebc92efcb8 100644 --- a/src/lib-storage/index/mbox/Makefile.am +++ b/src/lib-storage/index/mbox/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_mbox.a +noinst_LTLIBRARIES = libstorage_mbox.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -libstorage_mbox_a_SOURCES = \ +libstorage_mbox_la_SOURCES = \ istream-raw-mbox.c \ mbox-file.c \ mbox-lock.c \ diff --git a/src/lib-storage/index/raw/Makefile.am b/src/lib-storage/index/raw/Makefile.am index 563e4e50d4..907590d0dc 100644 --- a/src/lib-storage/index/raw/Makefile.am +++ b/src/lib-storage/index/raw/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_raw.a +noinst_LTLIBRARIES = libstorage_raw.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -libstorage_raw_a_SOURCES = \ +libstorage_raw_la_SOURCES = \ raw-mail.c \ raw-sync.c \ raw-storage.c \ diff --git a/src/lib-storage/index/shared/Makefile.am b/src/lib-storage/index/shared/Makefile.am index ea6616d576..042470a8da 100644 --- a/src/lib-storage/index/shared/Makefile.am +++ b/src/lib-storage/index/shared/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_shared.a +noinst_LTLIBRARIES = libstorage_shared.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage/index \ -DPKG_RUNDIR=\""$(rundir)"\" -libstorage_shared_a_SOURCES = \ +libstorage_shared_la_SOURCES = \ shared-list.c \ shared-storage.c diff --git a/src/lib-storage/list/Makefile.am b/src/lib-storage/list/Makefile.am index 675d49bffd..3b07e463d5 100644 --- a/src/lib-storage/list/Makefile.am +++ b/src/lib-storage/list/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage_list.a +noinst_LTLIBRARIES = libstorage_list.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index -libstorage_list_a_SOURCES = \ +libstorage_list_la_SOURCES = \ index-mailbox-list.c \ index-mailbox-list-sync.c \ mailbox-list-fs.c \ diff --git a/src/lib-storage/register/Makefile.am b/src/lib-storage/register/Makefile.am index 55699aed91..f7693d6dc7 100644 --- a/src/lib-storage/register/Makefile.am +++ b/src/lib-storage/register/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libstorage-register.a +noinst_LTLIBRARIES = libstorage_register.la BUILT_SOURCES = mail-storage-register.c mail_storages = @mail_storages@ @@ -40,7 +40,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-storage -libstorage_register_a_SOURCES = \ +libstorage_register_la_SOURCES = \ mail-storage-register.c \ mailbox-list-register.c diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 8adf75cfb3..13c86655db 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = liblib.a +noinst_LTLIBRARIES = liblib.la BUILT_SOURCES = unicodemap.c @@ -8,7 +8,7 @@ $(srcdir)/unicodemap.c: test -f UnicodeData.txt || wget http://www.unicode.org/Public/UNIDATA/UnicodeData.txt perl $(srcdir)/unicodemap.pl < UnicodeData.txt > $@ -liblib_a_SOURCES = \ +liblib_la_SOURCES = \ array.c \ aqueue.c \ backtrace-string.c \ diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am index 62bb7a2c83..286136efa3 100644 --- a/src/login-common/Makefile.am +++ b/src/login-common/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = liblogin-common.a +pkglib_LTLIBRARIES = libdovecot-login.la AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -DSBINDIR=\""$(sbindir)"\" \ -DSSLDIR=\""$(ssldir)\"" -liblogin_common_a_SOURCES = \ +libdovecot_login_la_SOURCES = \ client-common.c \ login-proxy.c \ login-settings.c \ @@ -20,6 +20,9 @@ liblogin_common_a_SOURCES = \ ssl-proxy-gnutls.c \ ssl-proxy-openssl.c +libdovecot_login_la_LIBADD = \ + $(SSL_LIBS) + noinst_HEADERS = \ client-common.h \ login-proxy.h \ diff --git a/src/master/Makefile.am b/src/master/Makefile.am index ef647ea633..f307fef386 100644 --- a/src/master/Makefile.am +++ b/src/master/Makefile.am @@ -16,8 +16,7 @@ AM_CPPFLAGS = \ dovecot_LDADD = \ $(LIBCAP) \ - ../lib-settings/libsettings.a \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la dovecot_SOURCES = \ auth-process.c \ @@ -60,6 +59,6 @@ ssl_build_param_SOURCES = \ ssl-init-gnutls.c ssl_build_param_LDADD = \ - ../lib/liblib.a \ + ../lib-dovecot/libdovecot.la \ $(SSL_LIBS) diff --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am index 5946629ab1..395ec90261 100644 --- a/src/plugins/convert/Makefile.am +++ b/src/plugins/convert/Makefile.am @@ -32,8 +32,9 @@ convert_tool_SOURCES = \ common_objects = \ convert-storage.lo -libs = $(STORAGE_LIBS) \ - $(top_builddir)/src/lib-settings/libsettings.a +libs = \ + $(top_builddir)/src/lib-storage/libdovecot-storage.la \ + $(top_builddir)/src/lib-dovecot/libdovecot.la convert_tool_LDADD = \ $(common_objects) \ diff --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am index 1e6753e1e7..83b8e77130 100644 --- a/src/plugins/expire/Makefile.am +++ b/src/plugins/expire/Makefile.am @@ -35,9 +35,8 @@ expire_tool_SOURCES = \ expire-tool.c libs = \ - $(STORAGE_LIBS) \ - $(top_builddir)/src/lib-settings/libsettings.a \ - $(top_builddir)/src/lib-dict/libdict.a + $(top_builddir)/src/lib-storage/libdovecot-storage.la \ + $(top_builddir)/src/lib-dovecot/libdovecot.la expire_tool_LDADD = \ $(libs) \ diff --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am index 33d2e2a8fc..ba28af6ee1 100644 --- a/src/plugins/fts-squat/Makefile.am +++ b/src/plugins/fts-squat/Makefile.am @@ -31,7 +31,9 @@ common_objects = \ squat-trie.lo \ squat-uidlist.lo -libs = $(STORAGE_LIBS) +libs = \ + $(top_builddir)/src/lib-storage/libdovecot-storage.la \ + $(top_builddir)/src/lib-dovecot/libdovecot.la squat_test_LDADD = \ $(common_objects) \ diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am index dfa3f17a8f..bdc7bc1423 100644 --- a/src/pop3-login/Makefile.am +++ b/src/pop3-login/Makefile.am @@ -8,11 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/login-common pop3_login_LDADD = \ - ../login-common/liblogin-common.a \ - ../lib-auth/libauth.a \ - ../lib-settings/libsettings.a \ - ../lib/liblib.a \ - $(SSL_LIBS) + ../login-common/libdovecot-login.la \ + ../lib-dovecot/libdovecot.la pop3_login_SOURCES = \ client.c \ diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am index 56a89dc67b..0174ce76c0 100644 --- a/src/pop3/Makefile.am +++ b/src/pop3/Makefile.am @@ -13,17 +13,9 @@ AM_CPPFLAGS = \ pop3_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 pop3_LDADD = \ $(libs) \ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 9408cc362e..e8398b7189 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -18,7 +18,7 @@ test_lib_SOURCES = \ test_lib_LDADD = \ libtest.a \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la test_mail_SOURCES = \ test-mail.c @@ -33,14 +33,9 @@ noinst_HEADERS = \ test_mail_LDADD = \ $(LIBICONV) \ libtest.a \ - ../lib-mail/libmail.a \ - ../lib-charset/libcharset.a \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la test_imap_LDADD = \ $(LIBICONV) \ libtest.a \ - ../lib-imap/libimap.a \ - ../lib-mail/libmail.a \ - ../lib-charset/libcharset.a \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la diff --git a/src/util/Makefile.am b/src/util/Makefile.am index aa43d45f0a..5575f023ae 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -21,44 +21,42 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/auth rawlog_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la rawlog_SOURCES = \ rawlog.c gdbhelper_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la gdbhelper_SOURCES = \ gdbhelper.c idxview_LDADD = \ - ../lib-index/libindex.a \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la idxview_SOURCES = \ idxview.c imap_utf7_LDADD = \ - ../lib-imap/imap-utf7.o \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la imap_utf7_SOURCES = \ imap-utf7.c listview_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la listview_SOURCES = \ listview.c logview_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la logview_SOURCES = \ logview.c maildirlock_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la maildirlock_SOURCES = \ maildirlock.c threadview_LDADD = \ - ../lib/liblib.a + ../lib-dovecot/libdovecot.la threadview_SOURCES = \ threadview.c @@ -66,7 +64,7 @@ dovecotpw_LDADD = \ ../auth/libpassword.a \ ../lib-ntlm/libntlm.a \ ../lib-otp/libotp.a \ - ../lib/liblib.a \ + ../lib-dovecot/libdovecot.la \ $(AUTH_LIBS) \ $(MODULE_LIBS)