From: Timo Sirainen <tss@iki.fi>
Date: Sat, 30 Apr 2011 10:18:31 +0000 (+0300)
Subject: Makefile: Fixes to compiling with LDFLAGS="-Wl,--as-needed -Wl,--no-undefined"
X-Git-Tag: 2.1.alpha1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec40a17da1dfd119281c6425f12b2247d5f2a71;p=thirdparty%2Fdovecot%2Fcore.git

Makefile: Fixes to compiling with LDFLAGS="-Wl,--as-needed -Wl,--no-undefined"
---

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index 4a35d7ece5..d3337c0217 100644
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -47,6 +47,9 @@ libsql_la_SOURCES = \
 	driver-sqlpool.c
 nodist_libsql_la_SOURCES = sql-drivers-register.c
 
+deplibs = \
+	../lib-dovecot/libdovecot.la
+
 if SQL_PLUGINS
 libdriver_mysql_la_LDFLAGS = -module -avoid-version
 libdriver_mysql_la_LIBADD = $(MYSQL_LIBS)
@@ -66,7 +69,11 @@ endif
 
 pkglib_LTLIBRARIES = libdovecot-sql.la
 libdovecot_sql_la_SOURCES = 
-libdovecot_sql_la_LIBADD = libsql.la $(MODULE_LIBS)
+libdovecot_sql_la_LIBADD = libsql.la $(deplibs) \
+	$(MYSQL_LIBS) \
+	$(PGSQL_LIBS) \
+	$(SQLITE_LIBS) \
+	$(MODULE_LIBS)
 libdovecot_sql_la_DEPENDENCIES = libsql.la
 libdovecot_sql_la_LDFLAGS = -export-dynamic
 
diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
index 68d345971a..90e38331ee 100644
--- a/src/lib-ssl-iostream/Makefile.am
+++ b/src/lib-ssl-iostream/Makefile.am
@@ -23,6 +23,6 @@ pkginc_lib_HEADERS = $(headers)
 
 pkglib_LTLIBRARIES = libdovecot-ssl.la
 libdovecot_ssl_la_SOURCES = 
-libdovecot_ssl_la_LIBADD = libssl_iostream.la
+libdovecot_ssl_la_LIBADD = libssl_iostream.la ../lib-dovecot/libdovecot.la
 libdovecot_ssl_la_DEPENDENCIES = libssl_iostream.la
 libdovecot_ssl_la_LDFLAGS = -export-dynamic
diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am
index 8f28334bda..06b6eff734 100644
--- a/src/login-common/Makefile.am
+++ b/src/login-common/Makefile.am
@@ -39,6 +39,6 @@ pkginc_lib_HEADERS = $(headers)
 
 pkglib_LTLIBRARIES = libdovecot-login.la
 libdovecot_login_la_SOURCES = 
-libdovecot_login_la_LIBADD = liblogin.la
+libdovecot_login_la_LIBADD = liblogin.la ../lib-dovecot/libdovecot.la
 libdovecot_login_la_DEPENDENCIES = liblogin.la
 libdovecot_login_la_LDFLAGS = -export-dynamic