Mercurial > dovecot > core-2.2

changeset 14740:7ece66101bbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed duplicate libdovecot-ssl
author Timo Sirainen <tss@iki.fi>
date Wed, 01 Aug 2012 18:33:14 +0300
parents 378ba560ea9f
children 558db9e46789
files src/lib-dovecot/Makefile.am src/lib-ssl-iostream/Makefile.am
diffstat 2 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dovecot/Makefile.am	Wed Aug 01 18:30:40 2012 +0300
+++ b/src/lib-dovecot/Makefile.am	Wed Aug 01 18:33:14 2012 +0300
@@ -25,6 +25,8 @@
 	$(LTLIBICONV)
 
 libdovecot_ssl_la_LIBADD = \
+	../lib/liblib.la \
+	$(MODULE_LIBS) \
 	$(ssl_libs) \
 	$(SSL_LIBS)
 
--- a/src/lib-ssl-iostream/Makefile.am	Wed Aug 01 18:30:40 2012 +0300
+++ b/src/lib-ssl-iostream/Makefile.am	Wed Aug 01 18:33:14 2012 +0300
@@ -24,12 +24,3 @@
 headers = \
 	iostream-openssl.h \
 	iostream-ssl.h
-
-pkginc_libdir=$(pkgincludedir)
-pkginc_lib_HEADERS = $(headers)
-
-pkglib_LTLIBRARIES = libdovecot-ssl.la
-libdovecot_ssl_la_SOURCES = 
-libdovecot_ssl_la_LIBADD = libssl_iostream.la ../lib/liblib.la $(MODULE_LIBS) $(SSL_LIBS)
-libdovecot_ssl_la_DEPENDENCIES = libssl_iostream.la
-libdovecot_ssl_la_LDFLAGS = -export-dynamic