Mercurial > dovecot > core-2.2

changeset 15928:217fb4ca9b5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MODULE_LIBS is now part of LIBDOVECOT. No need to explicitly link it everywhere.
author Timo Sirainen <tss@iki.fi>
date Mon, 25 Feb 2013 13:00:40 +0200
parents 61508a42a44b
children 1841a4b95783
files Makefile.am configure.ac dovecot-config.in.in src/anvil/Makefile.am src/auth/Makefile.am src/config/Makefile.am src/dict/Makefile.am src/dns/Makefile.am src/doveadm/Makefile.am src/imap-urlauth/Makefile.am src/imap/Makefile.am src/indexer/Makefile.am src/ipc/Makefile.am src/lda/Makefile.am src/lib-compression/Makefile.am src/lib-sql/Makefile.am src/lib-storage/Makefile.am src/lmtp/Makefile.am src/plugins/quota/Makefile.am src/pop3/Makefile.am src/replication/aggregator/Makefile.am src/replication/replicator/Makefile.am src/stats/Makefile.am src/util/Makefile.am
diffstat 24 files changed, 25 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -41,6 +41,7 @@
 	-e "s|\$$(top_builddir)|$$abs_builddir|g" \
 	-e "s|\$$(incdir)|$$abs_srcdir|g" \
 	-e "s|\$$(LIBICONV)|$(LIBICONV)|g" \
+	-e "s|\$$(MODULE_LIBS)|$(MODULE_LIBS)|g" \
 	-e "s|^\(dovecot_pkgincludedir\)=|\1=$(pkgincludedir)|" \
 	-e "s|^\(dovecot_pkglibdir\)=|\1=$(pkglibdir)|" \
 	-e "s|^\(dovecot_pkglibexecdir\)=|\1=$(libexecdir)/dovecot|" \
--- a/configure.ac	Mon Feb 25 09:12:06 2013 +0200
+++ b/configure.ac	Mon Feb 25 13:00:40 2013 +0200
@@ -2545,7 +2545,7 @@
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/libdovecot-lda.la'
 else
   LIBDOVECOT_DEPS='$(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-http/libhttp.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-dns/libdns.la $(top_builddir)/src/lib-fs/libfs.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la $(top_builddir)/src/lib-test/libtest.la $(top_builddir)/src/lib/liblib.la'
-  LIBDOVECOT="$LIBDOVECOT_DEPS \$(LIBICONV)"
+  LIBDOVECOT="$LIBDOVECOT_DEPS \$(LIBICONV) \$(MODULE_LIBS)"
   LIBDOVECOT_STORAGE_LAST='$(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-index/libindex.la $(top_builddir)/src/lib-imap-storage/libimap-storage.la'
   LIBDOVECOT_STORAGE_FIRST='$(top_builddir)/src/lib-storage/libstorage_service.la $(top_builddir)/src/lib-storage/register/libstorage_register.la'
   LIBDOVECOT_STORAGE_DEPS="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
--- a/dovecot-config.in.in	Mon Feb 25 09:12:06 2013 +0200
+++ b/dovecot-config.in.in	Mon Feb 25 13:00:40 2013 +0200
@@ -4,7 +4,7 @@
 DOVECOT_SQL_LIBS="@SQL_LIBS@"
 DOVECOT_COMPRESS_LIBS="@COMPRESS_LIBS@"
 
-LIBDOVECOT="@LIBDOVECOT@ @MODULE_LIBS@"
+LIBDOVECOT="@LIBDOVECOT@"
 LIBDOVECOT_LOGIN="@LIBDOVECOT_LOGIN@ @SSL_LIBS@"
 LIBDOVECOT_SQL="@LIBDOVECOT_SQL@"
 LIBDOVECOT_COMPRESS="@LIBDOVECOT_COMPRESS@"
--- a/src/anvil/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/anvil/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -10,7 +10,6 @@
 
 anvil_LDADD = \
 	$(LIBDOVECOT) \
-	$(MODULE_LIBS) \
 	$(RAND_LIBS)
 anvil_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
--- a/src/auth/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/auth/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -54,7 +54,7 @@
 	../lib-otp/libotp.a \
 	$(LIBDOVECOT_SQL)
 
-auth_LDADD = $(auth_libs) $(LIBDOVECOT) $(AUTH_LIBS) $(MODULE_LIBS)
+auth_LDADD = $(auth_libs) $(LIBDOVECOT) $(AUTH_LIBS)
 auth_DEPENDENCIES = $(auth_libs) $(LIBDOVECOT_DEPS)
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
--- a/src/config/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/config/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -17,13 +17,11 @@
 
 config_LDADD = \
 	$(LIBDOVECOT) \
-	$(MODULE_LIBS) \
 	$(RAND_LIBS)
 config_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 doveconf_LDADD = \
 	$(LIBDOVECOT) \
-	$(MODULE_LIBS) \
 	$(RAND_LIBS)
 doveconf_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
--- a/src/dict/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/dict/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -20,7 +20,6 @@
 dict_LDADD = \
 	$(libs) \
 	$(LIBDOVECOT) \
-	$(MODULE_LIBS) \
 	$(DICT_LIBS) \
 	$(SQL_LIBS)
 dict_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
--- a/src/dns/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/dns/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -7,7 +7,7 @@
 	-I$(top_srcdir)/src/lib-master \
 	-I$(top_srcdir)/src/lib-settings
 
-dns_client_LDADD = $(LIBDOVECOT) $(MODULE_LIBS)
+dns_client_LDADD = $(LIBDOVECOT)
 dns_client_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 dns_client_SOURCES = \
 	dns-client.c \
--- a/src/doveadm/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/doveadm/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -41,8 +41,7 @@
 	$(cmd_pw_libs) \
 	$(CRYPT_LIBS) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 doveadm_DEPENDENCIES = \
 	$(libs) \
 	$(cmd_pw_libs) \
@@ -52,8 +51,7 @@
 doveadm_server_LDADD = \
 	$(libs) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 doveadm_server_DEPENDENCIES = \
 	$(libs) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
--- a/src/imap-urlauth/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/imap-urlauth/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -36,7 +36,7 @@
 
 imap_urlauth_LDFLAGS = -export-dynamic
 
-imap_urlauth_LDADD = $(LIBDOVECOT) $(MODULE_LIBS)
+imap_urlauth_LDADD = $(LIBDOVECOT)
 imap_urlauth_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 imap_urlauth_SOURCES = \
@@ -65,7 +65,7 @@
 urlauth_libs = \
 	$(top_builddir)/src/lib-imap-urlauth/libimap-urlauth.la
 
-imap_urlauth_worker_LDADD = $(urlauth_libs) $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) $(MODULE_LIBS)
+imap_urlauth_worker_LDADD = $(urlauth_libs) $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
 imap_urlauth_worker_DEPENDENCIES = $(urlauth_libs) $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_DEPS)
 
 imap_urlauth_worker_SOURCES = \
--- a/src/imap/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/imap/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -19,8 +19,7 @@
 imap_LDADD = \
 	../lib-imap-urlauth/libimap-urlauth.la \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 imap_DEPENDENCIES = \
 	../lib-imap-urlauth/libimap-urlauth.la \
 	$(LIBDOVECOT_STORAGE_DEPS) \
--- a/src/indexer/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/indexer/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -11,7 +11,7 @@
 	-I$(top_srcdir)/src/lib-storage \
 	-DPKG_RUNDIR=\""$(rundir)"\"
 
-indexer_LDADD = $(LIBDOVECOT) $(MODULE_LIBS)
+indexer_LDADD = $(LIBDOVECOT)
 indexer_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 indexer_SOURCES = \
 	indexer.c \
@@ -23,8 +23,7 @@
 
 indexer_worker_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 indexer_worker_DEPENDENCIES = \
 	$(LIBDOVECOT_STORAGE_DEPS) \
 	$(LIBDOVECOT_DEPS)
--- a/src/ipc/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/ipc/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -7,9 +7,7 @@
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master
 
-ipc_LDADD = \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+ipc_LDADD = $(LIBDOVECOT) 
 ipc_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 ipc_SOURCES = \
--- a/src/lda/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/lda/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -19,8 +19,7 @@
 dovecot_lda_LDADD = \
 	$(LIBDOVECOT_LDA) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 dovecot_lda_DEPENDENCIES = \
 	$(LIBDOVECOT_LDA) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
--- a/src/lib-compression/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/lib-compression/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -21,6 +21,6 @@
 
 pkglib_LTLIBRARIES = libdovecot-compression.la
 libdovecot_compression_la_SOURCES = 
-libdovecot_compression_la_LIBADD = libcompression.la ../lib/liblib.la $(MODULE_LIBS) $(COMPRESS_LIBS)
+libdovecot_compression_la_LIBADD = libcompression.la ../lib/liblib.la $(COMPRESS_LIBS)
 libdovecot_compression_la_DEPENDENCIES = libcompression.la
 libdovecot_compression_la_LDFLAGS = -export-dynamic
--- a/src/lib-sql/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/lib-sql/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -79,7 +79,7 @@
 
 pkglib_LTLIBRARIES = libdovecot-sql.la
 libdovecot_sql_la_SOURCES = 
-libdovecot_sql_la_LIBADD = libsql.la $(deplibs) $(MODULE_LIBS) $(sql_libs)
+libdovecot_sql_la_LIBADD = libsql.la $(deplibs) $(sql_libs)
 libdovecot_sql_la_DEPENDENCIES = libsql.la
 libdovecot_sql_la_LDFLAGS = -export-dynamic
 
--- a/src/lib-storage/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/lib-storage/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -89,7 +89,7 @@
 
 pkglib_LTLIBRARIES = libdovecot-storage.la
 libdovecot_storage_la_SOURCES = 
-libdovecot_storage_la_LIBADD = $(shlibs) $(LINKED_STORAGE_LDADD) $(MODULE_LIBS)
+libdovecot_storage_la_LIBADD = $(shlibs) $(LINKED_STORAGE_LDADD)
 libdovecot_storage_la_DEPENDENCIES = $(shlibs)
 libdovecot_storage_la_LDFLAGS = -export-dynamic
 
--- a/src/lmtp/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/lmtp/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -20,8 +20,7 @@
 lmtp_LDADD = \
 	$(LIBDOVECOT_LDA) \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 lmtp_DEPENDENCIES = \
 	$(LIBDOVECOT_LDA) \
 	$(LIBDOVECOT_STORAGE_DEPS) \
--- a/src/plugins/quota/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/plugins/quota/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -58,7 +58,6 @@
 	$(quota_common_objects) \
 	$(LIBDOVECOT_STORAGE) \
 	$(LIBDOVECOT) \
-	$(MODULE_LIBS) \
 	$(QUOTA_LIBS)
 quota_status_DEPENDENCIES = \
 	$(quota_common_objects) \
--- a/src/pop3/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/pop3/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -14,8 +14,7 @@
 
 pop3_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT)
 pop3_DEPENDENCIES = \
 	$(LIBDOVECOT_STORAGE_DEPS) \
 	$(LIBDOVECOT_DEPS)
--- a/src/replication/aggregator/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/replication/aggregator/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -11,7 +11,7 @@
 	-DPKG_STATEDIR=\""$(statedir)"\"
 
 aggregator_LDFLAGS = -export-dynamic
-aggregator_LDADD = $(LIBDOVECOT) $(MODULE_LIBS)
+aggregator_LDADD = $(LIBDOVECOT)
 aggregator_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 aggregator_SOURCES = \
--- a/src/replication/replicator/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/replication/replicator/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -11,7 +11,7 @@
 	-DPKG_STATEDIR=\""$(statedir)"\"
 
 replicator_LDFLAGS = -export-dynamic
-replicator_LDADD = $(LIBDOVECOT) $(MODULE_LIBS)
+replicator_LDADD = $(LIBDOVECOT)
 replicator_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 replicator_SOURCES = \
--- a/src/stats/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/stats/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -7,9 +7,7 @@
 	-I$(top_srcdir)/src/lib-settings \
 	-I$(top_srcdir)/src/lib-master
 
-stats_LDADD = \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+stats_LDADD = $(LIBDOVECOT) 
 stats_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 
 stats_SOURCES = \
--- a/src/util/Makefile.am	Mon Feb 25 09:12:06 2013 +0200
+++ b/src/util/Makefile.am	Mon Feb 25 13:00:40 2013 +0200
@@ -29,22 +29,21 @@
 
 script_login_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS)
+	$(LIBDOVECOT) 
 script_login_DEPENDENCIES = \
 	$(LIBDOVECOT_STORAGE_DEPS) \
 	$(LIBDOVECOT_DEPS)
 script_login_SOURCES = \
 	script-login.c
 
-script_LDADD = $(LIBDOVECOT) $(MODULE_LIBS)
+script_LDADD = $(LIBDOVECOT)
 script_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 script_SOURCES = \
 	script.c
 
 if TCPWRAPPERS
 TCPWRAP_BIN = tcpwrap
-tcpwrap_LDADD = $(LIBDOVECOT) $(MODULE_LIBS) $(LIBWRAP_LIBS)
+tcpwrap_LDADD = $(LIBDOVECOT) $(LIBWRAP_LIBS)
 tcpwrap_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 tcpwrap_SOURCES = \
 	tcpwrap.c \