From bd6abf27d1d29a2407f990163e9fe0d0c478a15a Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 6 Apr 2009 17:10:44 -0400 Subject: [PATCH] Link -liconv to libdovecot.so if necessary. --HG-- branch : HEAD --- src/auth/Makefile.am | 3 +-- src/deliver/Makefile.am | 5 +---- src/dict/Makefile.am | 1 - src/imap/Makefile.am | 4 +--- src/lib-dovecot/Makefile.am | 3 ++- src/pop3/Makefile.am | 5 +---- src/tests/Makefile.am | 2 -- src/util/Makefile.am | 3 +-- 8 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 74c980f337..6528609efe 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -43,8 +43,7 @@ dovecot_auth_LDADD = \ ../lib-otp/libotp.a \ ../lib-sql/libsql.la \ ../lib-dovecot/libdovecot.la \ - $(AUTH_LIBS) \ - $(MODULE_LIBS) + $(AUTH_LIBS) ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c diff --git a/src/deliver/Makefile.am b/src/deliver/Makefile.am index 2bbccae729..3a727abbc5 100644 --- a/src/deliver/Makefile.am +++ b/src/deliver/Makefile.am @@ -25,10 +25,7 @@ libs = \ ../lib-storage/libdovecot-storage.la \ ../lib-dovecot/libdovecot.la -deliver_LDADD = \ - $(libs) \ - $(LIBICONV) \ - $(MODULE_LIBS) +deliver_LDADD = $(libs) deliver_DEPENDENCIES = $(libs) diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am index 34808729c6..7f91ce49a8 100644 --- a/src/dict/Makefile.am +++ b/src/dict/Makefile.am @@ -18,7 +18,6 @@ libs = \ dict_LDADD = \ $(libs) \ - $(MODULE_LIBS) \ $(DICT_LIBS) \ $(SQL_LIBS) diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am index 5439ec171e..9ca4086e8b 100644 --- a/src/imap/Makefile.am +++ b/src/imap/Makefile.am @@ -20,9 +20,7 @@ libs = \ ../lib-dovecot/libdovecot.la imap_LDADD = \ - $(libs) \ - $(LIBICONV) \ - $(MODULE_LIBS) + $(libs) imap_DEPENDENCIES = $(libs) diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am index 4a26f26a4c..69ced6bbb1 100644 --- a/src/lib-dovecot/Makefile.am +++ b/src/lib-dovecot/Makefile.am @@ -13,7 +13,8 @@ libs = \ libdovecot_la_LIBADD = \ $(libs) \ - $(MODULE_LIBS) + $(MODULE_LIBS) \ + $(LIBICONV) libdovecot_la_DEPENDENCIES = $(libs) diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am index 0174ce76c0..8e9324ea8a 100644 --- a/src/pop3/Makefile.am +++ b/src/pop3/Makefile.am @@ -17,10 +17,7 @@ libs = \ ../lib-storage/libdovecot-storage.la \ ../lib-dovecot/libdovecot.la -pop3_LDADD = \ - $(libs) \ - $(LIBICONV) \ - $(MODULE_LIBS) +pop3_LDADD = $(libs) pop3_DEPENDENCIES = $(libs) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index e8398b7189..6ed5f50031 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -31,11 +31,9 @@ noinst_HEADERS = \ test-lib.h test_mail_LDADD = \ - $(LIBICONV) \ libtest.a \ ../lib-dovecot/libdovecot.la test_imap_LDADD = \ - $(LIBICONV) \ libtest.a \ ../lib-dovecot/libdovecot.la diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 23a8e37ae8..d4d7b14183 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -66,8 +66,7 @@ dovecotpw_LDADD = \ ../lib-ntlm/libntlm.a \ ../lib-otp/libotp.a \ ../lib-dovecot/libdovecot.la \ - $(AUTH_LIBS) \ - $(MODULE_LIBS) + $(AUTH_LIBS) dovecotpw_SOURCES = \ dovecotpw.c -- 2.47.3