dovecot-1.3: Some binaries were missing list of library dependen...
dovecot at dovecot.org
dovecot at dovecot.org
Tue Apr 21 02:11:58 EEST 2009
details: http://hg.dovecot.org/dovecot-1.3/rev/1e26166a3cf8
changeset: 9146:1e26166a3cf8
user: Timo Sirainen <tss at iki.fi>
date: Mon Apr 20 18:07:46 2009 -0400
description:
Some binaries were missing list of library dependencies.
diffstat:
8 files changed, 41 insertions(+), 21 deletions(-)
src/auth/Makefile.am | 10 ++++++----
src/config/Makefile.am | 1 +
src/dict/Makefile.am | 1 -
src/imap-login/Makefile.am | 3 +++
src/master/Makefile.am | 2 +-
src/pop3-login/Makefile.am | 3 +++
src/tests/Makefile.am | 21 +++++++++++----------
src/util/Makefile.am | 21 ++++++++++++++++-----
diffs (202 lines):
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/auth/Makefile.am
--- a/src/auth/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/auth/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -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 @@ endif
endif
checkpassword_reply_LDADD = $(LIBDOVECOT)
+checkpassword_reply_DEPENDENCIES = $(LIBDOVECOT)
checkpassword_reply_sources = \
checkpassword-reply.c
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/config/Makefile.am
--- a/src/config/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/config/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -13,6 +13,7 @@ doveconf_LDADD = \
$(LIBDOVECOT) \
$(MODULE_LIBS) \
$(RAND_LIBS)
+doveconf_DEPENDENCIES = $(LIBDOVECOT)
doveconf_SOURCES = \
all-settings.c \
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/dict/Makefile.am
--- a/src/dict/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/dict/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -21,7 +21,6 @@ dict_LDADD = \
$(MODULE_LIBS) \
$(DICT_LIBS) \
$(SQL_LIBS)
-
dict_DEPENDENCIES = $(libs)
dict_SOURCES = \
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/imap-login/Makefile.am
--- a/src/imap-login/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/imap-login/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -11,6 +11,9 @@ imap_login_LDADD = \
imap_login_LDADD = \
$(LIBDOVECOT_LOGIN) \
$(LIBDOVECOT)
+imap_login_DEPENDENCIES = \
+ $(LIBDOVECOT_LOGIN) \
+ $(LIBDOVECOT)
imap_login_SOURCES = \
client.c \
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/master/Makefile.am
--- a/src/master/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/master/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -59,4 +59,4 @@ ssl_build_param_LDADD = \
ssl_build_param_LDADD = \
$(LIBDOVECOT) \
$(SSL_LIBS)
-
+ssl_build_param_DEPENDENCIES = $(LIBDOVECOT)
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/pop3-login/Makefile.am
--- a/src/pop3-login/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/pop3-login/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -10,6 +10,9 @@ pop3_login_LDADD = \
pop3_login_LDADD = \
$(LIBDOVECOT_LOGIN) \
$(LIBDOVECOT)
+pop3_login_DEPENDENCIES = \
+ $(LIBDOVECOT_LOGIN) \
+ $(LIBDOVECOT)
pop3_login_SOURCES = \
client.c \
diff -r fb8b7ebf0baf -r 1e26166a3cf8 src/tests/Makefile.am
--- a/src/tests/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/tests/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -12,16 +12,22 @@ libtest_a_SOURCES = \
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 -r fb8b7ebf0baf -r 1e26166a3cf8 src/util/Makefile.am
--- a/src/util/Makefile.am Mon Apr 20 14:54:49 2009 -0400
+++ b/src/util/Makefile.am Mon Apr 20 18:07:46 2009 -0400
@@ -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
More information about the dovecot-cvs
mailing list