From: Timo Sirainen <tss@iki.fi>
Date: Wed, 1 Aug 2012 15:33:14 +0000 (+0300)
Subject: Removed duplicate libdovecot-ssl
X-Git-Tag: 2.2.alpha1~402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68505752206bf0a082b985be5d3b1eaebde07896;p=thirdparty%2Fdovecot%2Fcore.git

Removed duplicate libdovecot-ssl
---

diff --git a/src/lib-dovecot/Makefile.am b/src/lib-dovecot/Makefile.am
index 6780c4dd70..cd72c20839 100644
--- a/src/lib-dovecot/Makefile.am
+++ b/src/lib-dovecot/Makefile.am
@@ -25,6 +25,8 @@ libdovecot_la_LIBADD = \
 	$(LTLIBICONV)
 
 libdovecot_ssl_la_LIBADD = \
+	../lib/liblib.la \
+	$(MODULE_LIBS) \
 	$(ssl_libs) \
 	$(SSL_LIBS)
 
diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
index d2a2177fcb..21f9398efa 100644
--- a/src/lib-ssl-iostream/Makefile.am
+++ b/src/lib-ssl-iostream/Makefile.am
@@ -24,12 +24,3 @@ libssl_iostream_la_LIBADD = \
 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