Mercurial > dovecot > core-2.2
changeset 18381:36ca0e03bd06
Cleanup for libcharset's iconv linking.
Linking libcharset.la now automatically links with the necessary iconv
libraries.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 22 Mar 2015 18:59:51 +0200 |
| parents | 1bbde199a6e3 |
| children | 35a4828d11f7 |
| files | src/lib-charset/Makefile.am src/lib-dovecot/Makefile.am src/lib-mail/Makefile.am |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-charset/Makefile.am Fri Mar 20 21:58:16 2015 +0200 +++ b/src/lib-charset/Makefile.am Sun Mar 22 18:59:51 2015 +0200 @@ -3,6 +3,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib +libcharset_la_LIBADD = $(LTLIBICONV) libcharset_la_SOURCES = \ charset-iconv.c \ charset-utf8.c
--- a/src/lib-dovecot/Makefile.am Fri Mar 20 21:58:16 2015 +0200 +++ b/src/lib-dovecot/Makefile.am Sun Mar 22 18:59:51 2015 +0200 @@ -22,8 +22,7 @@ libdovecot_la_LIBADD = \ $(libs) \ - $(MODULE_LIBS) \ - $(LTLIBICONV) + $(MODULE_LIBS) libdovecot_la_DEPENDENCIES = $(libs) libdovecot_la_LDFLAGS = -export-dynamic
--- a/src/lib-mail/Makefile.am Fri Mar 20 21:58:16 2015 +0200 +++ b/src/lib-mail/Makefile.am Sun Mar 22 18:59:51 2015 +0200 @@ -142,7 +142,7 @@ test_message_date_DEPENDENCIES = $(test_deps) test_message_decoder_SOURCES = test-message-decoder.c -test_message_decoder_LDADD = message-decoder.lo quoted-printable.lo rfc822-parser.lo rfc2231-parser.lo ../lib-charset/libcharset.la $(test_libs) $(LIBICONV) +test_message_decoder_LDADD = message-decoder.lo quoted-printable.lo rfc822-parser.lo rfc2231-parser.lo ../lib-charset/libcharset.la $(test_libs) test_message_decoder_DEPENDENCIES = ../lib-charset/libcharset.la $(test_deps) test_message_header_decode_SOURCES = test-message-header-decode.c