dovecot-2.0-sslstream: Makefiles: Separated LIBDOVECOT and LIBDO...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Feb 13 02:55:10 EET 2010
details: http://hg.dovecot.org/dovecot-2.0-sslstream/rev/6a1c96577476
changeset: 10092:6a1c96577476
user: Timo Sirainen <tss at iki.fi>
date: Sun Oct 18 15:24:12 2009 -0400
description:
Makefiles: Separated LIBDOVECOT and LIBDOVECOT_DEPS.
diffstat:
20 files changed, 47 insertions(+), 57 deletions(-)
configure.in | 7 +++++--
src/anvil/Makefile.am | 2 +-
src/auth/Makefile.am | 9 ++++-----
src/config/Makefile.am | 4 ++--
src/dict/Makefile.am | 6 +++---
src/doveadm/Makefile.am | 2 +-
src/dsync/Makefile.am | 2 +-
src/imap-login/Makefile.am | 2 +-
src/imap/Makefile.am | 5 ++---
src/lda/Makefile.am | 6 ++----
src/lmtp/Makefile.am | 8 +++-----
src/log/Makefile.am | 2 +-
src/master/Makefile.am | 6 ++----
src/plugins/convert/Makefile.am | 10 +++++-----
src/plugins/expire/Makefile.am | 5 ++---
src/plugins/fts-squat/Makefile.am | 9 +++------
src/pop3-login/Makefile.am | 2 +-
src/pop3/Makefile.am | 5 ++---
src/ssl-params/Makefile.am | 2 +-
src/util/Makefile.am | 10 +++++-----
diffs (truncated from 354 to 300 lines):
diff -r 755e6208d8ce -r 6a1c96577476 configure.in
--- a/configure.in Sun Oct 18 15:23:15 2009 -0400
+++ b/configure.in Sun Oct 18 15:24:12 2009 -0400
@@ -2388,11 +2388,13 @@ dnl **
dnl **
if test "$want_shared_libs" = "yes"; then
- LIBDOVECOT='$(top_builddir)/src/lib-dovecot/libdovecot.la'
+ LIBDOVECOT_DEPS='$(top_builddir)/src/lib-dovecot/libdovecot.la'
+ LIBDOVECOT="$LIBDOVECOT_DEPS"
LIBDOVECOT_STORAGE='$(top_builddir)/src/lib-storage/libdovecot-storage.la'
LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/libdovecot-login.la'
else
- LIBDOVECOT='$(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib/liblib.la $(LIBICONV)'
+ LIBDOVECOT_DEPS='$(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib/liblib.la'
+ LIBDOVECOT="$LIBDOVECOT_DEPS \$(LIBICONV)"
LIBDOVECOT_STORAGE_LAST='$(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-index/libindex.la'
LIBDOVECOT_STORAGE_FIRST='$(top_builddir)/src/lib-storage/libstorage_service.la $(top_builddir)/src/lib-storage/register/libstorage_register.la'
LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
@@ -2400,6 +2402,7 @@ fi
fi
LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
AC_SUBST(LIBDOVECOT)
+AC_SUBST(LIBDOVECOT_DEPS)
AC_SUBST(LIBDOVECOT_STORAGE)
AC_SUBST(LIBDOVECOT_LOGIN)
AC_SUBST(LIBDOVECOT_SQL)
diff -r 755e6208d8ce -r 6a1c96577476 src/anvil/Makefile.am
--- a/src/anvil/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/anvil/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -11,7 +11,7 @@ anvil_LDADD = \
$(LIBDOVECOT) \
$(MODULE_LIBS) \
$(RAND_LIBS)
-anvil_DEPENDENCIES = $(LIBDOVECOT)
+anvil_DEPENDENCIES = $(LIBDOVECOT_DEPS)
anvil_SOURCES = \
main.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/auth/Makefile.am
--- a/src/auth/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/auth/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -42,11 +42,10 @@ dovecot_auth_libs = \
libpassword.a \
../lib-ntlm/libntlm.a \
../lib-otp/libotp.a \
- $(LIBDOVECOT_SQL) \
- $(LIBDOVECOT)
+ $(LIBDOVECOT_SQL)
-dovecot_auth_LDADD = $(dovecot_auth_libs) $(AUTH_LIBS) $(MODULE_LIBS)
-dovecot_auth_DEPENDENCIES = $(dovecot_auth_libs)
+dovecot_auth_LDADD = $(dovecot_auth_libs) $(LIBDOVECOT) $(AUTH_LIBS) $(MODULE_LIBS)
+dovecot_auth_DEPENDENCIES = $(dovecot_auth_libs) $(LIBDOVECOT_DEPS)
ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
@@ -157,7 +156,7 @@ endif
endif
checkpassword_reply_LDADD = $(LIBDOVECOT)
-checkpassword_reply_DEPENDENCIES = $(LIBDOVECOT)
+checkpassword_reply_DEPENDENCIES = $(LIBDOVECOT_DEPS)
checkpassword_reply_sources = \
checkpassword-reply.c
diff -r 755e6208d8ce -r 6a1c96577476 src/config/Makefile.am
--- a/src/config/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/config/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -18,13 +18,13 @@ config_LDADD = \
$(LIBDOVECOT) \
$(MODULE_LIBS) \
$(RAND_LIBS)
-config_DEPENDENCIES = $(LIBDOVECOT)
+config_DEPENDENCIES = $(LIBDOVECOT_DEPS)
doveconf_LDADD = \
$(LIBDOVECOT) \
$(MODULE_LIBS) \
$(RAND_LIBS)
-doveconf_DEPENDENCIES = $(LIBDOVECOT)
+doveconf_DEPENDENCIES = $(LIBDOVECOT_DEPS)
common = \
all-settings.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/dict/Makefile.am
--- a/src/dict/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/dict/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -15,15 +15,15 @@ dict_LDFLAGS = -export-dynamic
libs = \
../lib-dict/libdict_backend.a \
- $(LIBDOVECOT_SQL) \
- $(LIBDOVECOT)
+ $(LIBDOVECOT_SQL)
dict_LDADD = \
$(libs) \
+ $(LIBDOVECOT) \
$(MODULE_LIBS) \
$(DICT_LIBS) \
$(SQL_LIBS)
-dict_DEPENDENCIES = $(libs)
+dict_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
dict_SOURCES = \
dict-connection.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/doveadm/Makefile.am
--- a/src/doveadm/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/doveadm/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -25,7 +25,7 @@ doveadm_DEPENDENCIES = \
doveadm_DEPENDENCIES = \
$(cmd_pw_libs) \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT)
+ $(LIBDOVECOT_DEPS)
doveadm_SOURCES = \
doveadm.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/dsync/Makefile.am
--- a/src/dsync/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/dsync/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib-storage
dsync_LDADD = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) $(MODULE_LIBS)
-dsync_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
+dsync_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT_DEPS)
dsync_SOURCES = \
dsync.c \
dsync-brain.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/imap-login/Makefile.am
--- a/src/imap-login/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/imap-login/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -14,7 +14,7 @@ imap_login_LDADD = \
$(LIBDOVECOT)
imap_login_DEPENDENCIES = \
$(LIBDOVECOT_LOGIN) \
- $(LIBDOVECOT)
+ $(LIBDOVECOT_DEPS)
imap_login_SOURCES = \
client.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/imap/Makefile.am
--- a/src/imap/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/imap/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -21,11 +21,10 @@ endif
libs = \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT) \
$(unused_objects)
-imap_LDADD = $(libs) $(MODULE_LIBS)
-imap_DEPENDENCIES = $(libs)
+imap_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
+imap_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
cmds = \
cmd-append.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/lda/Makefile.am
--- a/src/lda/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/lda/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -25,12 +25,10 @@ libs = \
libs = \
../lib-lda/liblda.a \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT) \
$(unused_objects)
-dovecot_lda_LDADD = $(libs) $(MODULE_LIBS)
-
-dovecot_lda_DEPENDENCIES = $(libs)
+dovecot_lda_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
+dovecot_lda_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
dovecot_lda_SOURCES = \
main.c
diff -r 755e6208d8ce -r 6a1c96577476 src/lmtp/Makefile.am
--- a/src/lmtp/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/lmtp/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -19,12 +19,10 @@ lmtp_LDFLAGS = -export-dynamic
libs = \
../lib-lda/liblda.a \
- $(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT)
+ $(LIBDOVECOT_STORAGE)
-lmtp_LDADD = $(libs) $(MODULE_LIBS)
-
-lmtp_DEPENDENCIES = $(libs)
+lmtp_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
+lmtp_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
lmtp_SOURCES = \
main.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/log/Makefile.am
--- a/src/log/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/log/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib-master
log_LDADD = $(LIBDOVECOT)
-log_DEPENDENCIES = $(LIBDOVECOT)
+log_DEPENDENCIES = $(LIBDOVECOT_DEPS)
log_SOURCES = \
log-connection.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/master/Makefile.am
--- a/src/master/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/master/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -11,12 +11,10 @@ AM_CPPFLAGS = \
-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-DBINDIR=\""$(bindir)"\"
-libs = \
+dovecot_LDADD = \
$(LIBCAP) \
$(LIBDOVECOT)
-
-dovecot_LDADD = $(libs)
-dovecot_DEPENDENCIES = $(libs)
+dovecot_DEPENDENCIES = $(LIBDOVECOT_DEPS)
dovecot_SOURCES = \
capabilities-posix.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/plugins/convert/Makefile.am
--- a/src/plugins/convert/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/plugins/convert/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -30,11 +30,11 @@ common_objects = \
libs = \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT)
+ $(common_objects)
convert_tool_LDADD = \
- $(MODULE_LIBS) \
- $(common_objects) \
- $(libs)
+ $(libs) \
+ $(LIBDOVECOT) \
+ $(MODULE_LIBS)
-convert_tool_DEPENDENCIES = $(libs) $(common_objects)
+convert_tool_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
diff -r 755e6208d8ce -r 6a1c96577476 src/plugins/expire/Makefile.am
--- a/src/plugins/expire/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/plugins/expire/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -38,8 +38,7 @@ libs = \
libs = \
expire-env.o \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT) \
$(unused_objects)
-expire_tool_LDADD = $(libs) $(MODULE_LIBS)
-expire_tool_DEPENDENCIES = $(libs)
+expire_tool_LDADD = $(libs) $(LIBDOVECOT) $(MODULE_LIBS)
+expire_tool_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
diff -r 755e6208d8ce -r 6a1c96577476 src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/plugins/fts-squat/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -36,10 +36,7 @@ common_objects = \
libs = \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT)
+ $(common_objects)
-squat_test_LDADD = \
- $(common_objects) \
- $(libs)
-
-squat_test_DEPENDENCIES = $(libs) $(common_objects)
+squat_test_LDADD = $(libs) $(LIBDOVECOT)
+squat_test_DEPENDENCIES = $(libs) $(LIBDOVECOT_DEPS)
diff -r 755e6208d8ce -r 6a1c96577476 src/pop3-login/Makefile.am
--- a/src/pop3-login/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/pop3-login/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -13,7 +13,7 @@ pop3_login_LDADD = \
$(LIBDOVECOT)
pop3_login_DEPENDENCIES = \
$(LIBDOVECOT_LOGIN) \
- $(LIBDOVECOT)
+ $(LIBDOVECOT_DEPS)
pop3_login_SOURCES = \
client.c \
diff -r 755e6208d8ce -r 6a1c96577476 src/pop3/Makefile.am
--- a/src/pop3/Makefile.am Sun Oct 18 15:23:15 2009 -0400
+++ b/src/pop3/Makefile.am Sun Oct 18 15:24:12 2009 -0400
@@ -20,11 +20,10 @@ endif
libs = \
$(LIBDOVECOT_STORAGE) \
- $(LIBDOVECOT) \
$(unused_objects)
More information about the dovecot-cvs
mailing list