From: Timo Sirainen <tss@iki.fi>
Date: Mon, 20 Apr 2009 22:07:46 +0000 (-0400)
Subject: Some binaries were missing list of library dependencies.
X-Git-Tag: 2.0.alpha1~906
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=463cf881132dc89c6a1400614a80b70e67ca915f;p=thirdparty%2Fdovecot%2Fcore.git

Some binaries were missing list of library dependencies.

--HG--
branch : HEAD
---

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 349879f303..71d0e0680b 100644
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -37,14 +37,15 @@ libpassword_a_SOURCES = \
 	password-scheme-otp.c \
 	password-scheme-rpa.c
 
-dovecot_auth_LDADD = \
+dovecot_auth_libs = \
 	libpassword.a \
 	../lib-ntlm/libntlm.a \
 	../lib-otp/libotp.a \
 	$(LIBDOVECOT_SQL) \
-	$(LIBDOVECOT) \
-	$(MODULE_LIBS) \
-	$(AUTH_LIBS)
+	$(LIBDOVECOT)
+
+dovecot_auth_LDADD = $(dovecot_auth_libs) $(MODULE_LIBS) $(AUTH_LIBS)
+dovecot_auth_DEPENDENCIES = $(dovecot_auth_libs)
 
 ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
 
@@ -157,6 +158,7 @@ else
 endif
 
 checkpassword_reply_LDADD = $(LIBDOVECOT)
+checkpassword_reply_DEPENDENCIES = $(LIBDOVECOT)
 
 checkpassword_reply_sources = \
 	checkpassword-reply.c
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 59af4b56f6..fb3b9ce66e 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -13,6 +13,7 @@ doveconf_LDADD = \
 	$(LIBDOVECOT) \
 	$(MODULE_LIBS) \
 	$(RAND_LIBS)
+doveconf_DEPENDENCIES = $(LIBDOVECOT)
 
 doveconf_SOURCES = \
 	all-settings.c \
diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am
index 46b127db9a..855b1ed6d2 100644
--- a/src/dict/Makefile.am
+++ b/src/dict/Makefile.am
@@ -21,7 +21,6 @@ dict_LDADD = \
 	$(MODULE_LIBS) \
 	$(DICT_LIBS) \
 	$(SQL_LIBS)
-
 dict_DEPENDENCIES = $(libs)
 
 dict_SOURCES = \
diff --git a/src/imap-login/Makefile.am b/src/imap-login/Makefile.am
index 6b8c08df77..7b39f75a3d 100644
--- a/src/imap-login/Makefile.am
+++ b/src/imap-login/Makefile.am
@@ -11,6 +11,9 @@ AM_CPPFLAGS = \
 imap_login_LDADD = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT)
+imap_login_DEPENDENCIES = \
+	$(LIBDOVECOT_LOGIN) \
+	$(LIBDOVECOT)
 
 imap_login_SOURCES = \
 	client.c \
diff --git a/src/master/Makefile.am b/src/master/Makefile.am
index efa9d0140c..33390273e6 100644
--- a/src/master/Makefile.am
+++ b/src/master/Makefile.am
@@ -59,4 +59,4 @@ ssl_build_param_SOURCES = \
 ssl_build_param_LDADD = \
 	$(LIBDOVECOT) \
 	$(SSL_LIBS)
-
+ssl_build_param_DEPENDENCIES = $(LIBDOVECOT)
diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am
index b7d5c66030..7f8ae44f00 100644
--- a/src/pop3-login/Makefile.am
+++ b/src/pop3-login/Makefile.am
@@ -10,6 +10,9 @@ AM_CPPFLAGS = \
 pop3_login_LDADD = \
 	$(LIBDOVECOT_LOGIN) \
 	$(LIBDOVECOT)
+pop3_login_DEPENDENCIES = \
+	$(LIBDOVECOT_LOGIN) \
+	$(LIBDOVECOT)
 
 pop3_login_SOURCES = \
 	client.c \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 7a5cd04ea2..f57a4b9411 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -12,17 +12,23 @@ AM_CPPFLAGS = \
 libtest_a_SOURCES = \
 	test-common.c
 
+libs = \
+	libtest.a \
+	$(LIBDOVECOT)
+
 test_lib_SOURCES = \
 	test-istream.c \
 	test-lib.c
 
-test_lib_LDADD = \
-	libtest.a \
-	$(LIBDOVECOT)
+test_lib_LDADD = $(libs)
+test_lib_DEPENDENCIES = $(libs)
 
 test_mail_SOURCES = \
 	test-mail.c
 
+test_mail_LDADD = $(libs)
+test_mail_DEPENDENCIES = $(libs)
+
 test_imap_SOURCES = \
 	test-imap.c
 
@@ -30,10 +36,5 @@ noinst_HEADERS = \
 	test-common.h \
 	test-lib.h
 
-test_mail_LDADD = \
-	libtest.a \
-	$(LIBDOVECOT)
-
-test_imap_LDADD = \
-	libtest.a \
-	$(LIBDOVECOT)
+test_imap_LDADD = $(libs)
+test_imap_DEPENDENCIES = $(libs)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c5a58002d7..e128c8189f 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -24,45 +24,55 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/auth
 
 rawlog_LDADD = $(LIBDOVECOT)
+rawlog_DEPENDENCIES = $(LIBDOVECOT)
 rawlog_SOURCES = \
 	rawlog.c
 
 gdbhelper_LDADD = $(LIBDOVECOT)
+gdbhelper_DEPENDENCIES = $(LIBDOVECOT)
 gdbhelper_SOURCES = \
 	gdbhelper.c
 
-idxview_LDADD = \
-	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+idxview_LDADD = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
+idxview_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
 idxview_SOURCES = \
 	idxview.c
 
 imap_utf7_LDADD = $(LIBDOVECOT)
+imap_utf7_DEPENDENCIES = $(LIBDOVECOT)
 imap_utf7_SOURCES = \
 	imap-utf7.c
 
 listview_LDADD = $(LIBDOVECOT)
+listview_DEPENDENCIES = $(LIBDOVECOT)
 listview_SOURCES = \
 	listview.c
 
 logview_LDADD = $(LIBDOVECOT)
+logview_DEPENDENCIES = $(LIBDOVECOT)
 logview_SOURCES = \
 	logview.c
 
 maildirlock_LDADD = $(LIBDOVECOT)
+maildirlock_DEPENDENCIES = $(LIBDOVECOT)
 maildirlock_SOURCES = \
 	maildirlock.c
 
 threadview_LDADD = $(LIBDOVECOT)
+threadview_DEPENDENCIES = $(LIBDOVECOT)
 threadview_SOURCES = \
 	threadview.c
 
-dovecotpw_LDADD = \
+dovecotpw_libs = \
 	../auth/libpassword.a \
 	../lib-ntlm/libntlm.a \
 	../lib-otp/libotp.a \
-	$(LIBDOVECOT) \
+	$(LIBDOVECOT)
+
+dovecotpw_LDADD = \
+	$(dovecotpw_libs) \
 	$(AUTH_LIBS)
+dovecotpw_DEPENDENCIES = $(dovecotpw_libs)
 
 dovecotpw_SOURCES = \
 	dovecotpw.c
@@ -71,6 +81,7 @@ doveadm_LDADD = \
 	$(LIBDOVECOT_STORAGE) \
 	$(LIBDOVECOT) \
 	$(MODULE_LIBS)
+doveadm_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
 doveadm_SOURCES = \
 	doveadm.c