summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-11-29 23:21:19 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-11-30 00:13:51 +0200
commitcfd3a6fe7f841d9992c521fbd8a6b6b1c048f413 (patch)
tree438d107da146dab28e6b6b5dbb6f5d187bfbe303
parent5ccef4cfd1eb3252430f04fa8418268a93ff8b08 (diff)
downloadmailutils-cfd3a6fe7f841d9992c521fbd8a6b6b1c048f413.tar.gz
mailutils-cfd3a6fe7f841d9992c521fbd8a6b6b1c048f413.tar.bz2
Revise LIBADD settings
Avoid contaminating *LIBADD with external libraries deduced by configure, as these may contain library path specifications (-L*) which drive some operating systems (vide: FreeBSD) crazy. This has an undesired side effect that the *LDADD statements of the tools that depend on these librarise must be autgmented accordingly.
-rw-r--r--comsat/Makefile.am3
-rw-r--r--examples/Makefile.am25
-rw-r--r--frm/Makefile.am3
-rw-r--r--imap4d/tests/Makefile.am2
-rw-r--r--libmailutils/Makefile.am1
-rw-r--r--libmailutils/tests/Makefile.am2
-rw-r--r--libproto/dotmail/Makefile.am2
-rw-r--r--libproto/dotmail/tests/Makefile.am2
-rw-r--r--libproto/imap/Makefile.am2
-rw-r--r--libproto/imap/tests/Makefile.am4
-rw-r--r--libproto/mailer/Makefile.am2
-rw-r--r--libproto/pop/Makefile.am2
-rw-r--r--mda/lmtpd/Makefile.am4
-rw-r--r--mda/mda/Makefile.am4
-rw-r--r--mda/mda/tests/Makefile.am4
-rw-r--r--mda/putmail/Makefile.am5
-rw-r--r--mimeview/Makefile.am2
-rw-r--r--mu/Makefile.am2
-rw-r--r--python/2/libmu_py/Makefile.am4
-rw-r--r--python/3/libmu_py/Makefile.am4
-rw-r--r--testsuite/Makefile.am8
21 files changed, 53 insertions, 34 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 5d124c521..371fbb8f4 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -30,8 +30,9 @@ biff.rc.h: $(top_srcdir)/comsat/biff.rc
$(top_srcdir)/comsat/biff.rc > biff.rc.h
comsatd_LDADD = \
- ${MU_APP_LIBRARIES}\
${MU_LIB_MAILBOX}\
${MU_LIB_MAILUTILS}\
+ ${MU_APP_LIBRARIES}\
+ ${MU_LIB_AUTH}\
@MU_COMMON_LIBRARIES@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 54e92f7f3..0f840fe0d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -74,28 +74,32 @@ msg_send_LDADD =\
../lib/libmuaux.la\
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
mta_CPPFLAGS=@MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib -I${top_builddir}/lib
mta_LDADD =\
../lib/libmuaux.la\
${MU_LIB_MBOX}\
${MU_LIB_MAILER}\
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
sfrom_LDADD =\
../lib/libmuaux.la\
${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
mboxsize_LDADD =\
../lib/libmuaux.la\
${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
nntpclient_LDADD = \
../lib/libmuaux.la\
@@ -103,25 +107,29 @@ nntpclient_LDADD = \
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)\
@READLINE_LIBS@
lsf_LDADD = \
${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
muauth_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
muauth_LDADD = \
${MU_APP_LIBRARIES}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
muemail_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
muemail_LDADD = \
${MU_APP_LIBRARIES} \
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS} \
+ $(MU_COMMON_LIBRARIES)
mboxidx_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
mboxidx_LDADD=\
@@ -129,4 +137,5 @@ mboxidx_LDADD=\
${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 62130109d..ffe690818 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -31,5 +31,6 @@ common_ldadd = \
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS}\
- @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
+ @FRIBIDI_LIBS@\
+ @MU_COMMON_LIBRARIES@
diff --git a/imap4d/tests/Makefile.am b/imap4d/tests/Makefile.am
index 50d09833c..a75e09305 100644
--- a/imap4d/tests/Makefile.am
+++ b/imap4d/tests/Makefile.am
@@ -22,7 +22,7 @@ include $(top_srcdir)/testsuite/testsuite.am
AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
noinst_PROGRAMS = ckiconv
-LDADD = ${MU_LIB_MAILUTILS}
+LDADD = ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
TESTSUITE_AT += \
anystate.at\
diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index 71bcda298..5ac5b20f2 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -50,7 +50,6 @@ lib_LTLIBRARIES = libmailutils.la
libmailutils_la_SOURCES =
libmailutils_la_LIBADD = \
- @MU_COMMON_LIBRARIES@\
auth/libauth.la\
base/libbase.la\
address/libaddress.la\
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index a933152f6..2163a376f 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -76,7 +76,7 @@ linetrack_LDADD = libmu_tesh.la $(LDADD)
listop_LDADD = libmu_tesh.la $(LDADD)
-LDADD = ${MU_LIB_MAILUTILS}
+LDADD = ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
EXTRA_DIST += Encode Decode Wicketfile
diff --git a/libproto/dotmail/Makefile.am b/libproto/dotmail/Makefile.am
index eeac8be28..c01d9900b 100644
--- a/libproto/dotmail/Makefile.am
+++ b/libproto/dotmail/Makefile.am
@@ -18,7 +18,7 @@ AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_dotmail.la
libmu_dotmail_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_dotmail_la_LIBADD = ${MU_LIB_MAILUTILS}
+libmu_dotmail_la_LIBADD = ${MU_LIB_MAILUTILS}
libmu_dotmail_la_SOURCES = \
dotmail.c\
message.c\
diff --git a/libproto/dotmail/tests/Makefile.am b/libproto/dotmail/tests/Makefile.am
index ab383921c..66a4e364c 100644
--- a/libproto/dotmail/tests/Makefile.am
+++ b/libproto/dotmail/tests/Makefile.am
@@ -28,7 +28,7 @@ noinst_PROGRAMS = \
dm_mesg_LDADD = -L$(top_builddir)/libmailutils/tests -lmu_tesh $(LDADD)
dm_mesg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libmailutils/tests
-LDADD = ${MU_LIB_DOTMAIL} ${MU_LIB_MAILUTILS}
+LDADD = ${MU_LIB_DOTMAIL} ${MU_LIB_MAILUTILS} ${MU_COMMON_LIBRARIES}
## ------------ ##
## Test suite. ##
diff --git a/libproto/imap/Makefile.am b/libproto/imap/Makefile.am
index e07ecb00a..39ba58385 100644
--- a/libproto/imap/Makefile.am
+++ b/libproto/imap/Makefile.am
@@ -18,7 +18,7 @@ AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_imap.la
libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_imap_la_LIBADD = ${MU_LIB_AUTH} ${MU_LIB_MAILUTILS} @INTLLIBS@
+libmu_imap_la_LIBADD = ${MU_LIB_MAILUTILS}
SUBDIRS = . tests
diff --git a/libproto/imap/tests/Makefile.am b/libproto/imap/tests/Makefile.am
index c58614564..8a305378a 100644
--- a/libproto/imap/tests/Makefile.am
+++ b/libproto/imap/tests/Makefile.am
@@ -22,4 +22,6 @@ LDADD = \
@MU_LIB_IMAP@\
@MU_LIB_AUTH@\
@MU_AUTHLIBS@\
- @MU_LIB_MAILUTILS@
+ @MU_LIB_MAILUTILS@\
+ $(MU_COMMON_LIBRARIES)\
+ ${MU_LIB_MAILUTILS}
diff --git a/libproto/mailer/Makefile.am b/libproto/mailer/Makefile.am
index 82e752b8f..a26647ac3 100644
--- a/libproto/mailer/Makefile.am
+++ b/libproto/mailer/Makefile.am
@@ -18,7 +18,7 @@ AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_mailer.la
libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_mailer_la_LIBADD = ${MU_LIB_AUTH} ${MU_LIB_MAILUTILS} @INTLLIBS@
+libmu_mailer_la_LIBADD = ${MU_LIB_AUTH} ${MU_LIB_MAILUTILS}
if MU_COND_GSASL
SMTP_GSASL=smtp_gsasl.c
diff --git a/libproto/pop/Makefile.am b/libproto/pop/Makefile.am
index 2a2e7c16e..674e74852 100644
--- a/libproto/pop/Makefile.am
+++ b/libproto/pop/Makefile.am
@@ -18,7 +18,7 @@ AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
lib_LTLIBRARIES = libmu_pop.la
libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_pop_la_LIBADD = ${MU_LIB_AUTH} ${MU_LIB_MAILUTILS} @INTLLIBS@
+libmu_pop_la_LIBADD = ${MU_LIB_MAILUTILS}
libmu_pop_la_SOURCES = \
mbox.c \
diff --git a/mda/lmtpd/Makefile.am b/mda/lmtpd/Makefile.am
index 4e9927762..6e34124e3 100644
--- a/mda/lmtpd/Makefile.am
+++ b/mda/lmtpd/Makefile.am
@@ -35,7 +35,6 @@ lmtpd_LDADD = \
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS} \
- @MU_COMMON_LIBRARIES@\
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
@MU_LIB_PY@\
@@ -43,6 +42,7 @@ lmtpd_LDADD = \
@GUILE_LIBS@\
@PYTHON_LIBS@\
@DBMLIBS@\
- @MU_TCPWRAP_LIBRARIES@
+ @MU_TCPWRAP_LIBRARIES@\
+ @MU_COMMON_LIBRARIES@
diff --git a/mda/mda/Makefile.am b/mda/mda/Makefile.am
index d2a7128bd..2074176bf 100644
--- a/mda/mda/Makefile.am
+++ b/mda/mda/Makefile.am
@@ -35,14 +35,14 @@ LDADD = \
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS} \
- @MU_COMMON_LIBRARIES@\
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
@MU_LIB_PY@\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
- @DBMLIBS@
+ @DBMLIBS@\
+ @MU_COMMON_LIBRARIES@
install-exec-hook:
-chown root:mail $(DESTDIR)$(sbindir)/mda &&\
diff --git a/mda/mda/tests/Makefile.am b/mda/mda/tests/Makefile.am
index 1045d838c..16a9c9a7e 100644
--- a/mda/mda/tests/Makefile.am
+++ b/mda/mda/tests/Makefile.am
@@ -36,14 +36,14 @@ LDADD = \
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS} \
- @MU_COMMON_LIBRARIES@\
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
@MU_LIB_PY@\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
- @DBMLIBS@
+ @DBMLIBS@\
+ @MU_COMMON_LIBRARIES@
AM_CPPFLAGS = \
-I${top_srcdir}\
diff --git a/mda/putmail/Makefile.am b/mda/putmail/Makefile.am
index ace0d7880..000547629 100644
--- a/mda/putmail/Makefile.am
+++ b/mda/putmail/Makefile.am
@@ -33,11 +33,12 @@ LDADD = \
${MU_LIB_MAILER}\
@MU_AUTHLIBS@\
${MU_LIB_MAILUTILS} \
- @MU_COMMON_LIBRARIES@\
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
@MU_LIB_PY@\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
- @DBMLIBS@
+ @DBMLIBS@\
+ @MU_COMMON_LIBRARIES@
+
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index a9d95393a..2d64d9b98 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -37,5 +37,5 @@ EXTRA_DIST = gylwrap.conf
mimeview_LDADD = \
${MU_APP_LIBRARIES}\
${MU_LIB_MAILUTILS}\
- @LTLIBINTL@
+ $(MU_COMMON_LIBRARIES)
diff --git a/mu/Makefile.am b/mu/Makefile.am
index bf879e96b..c514b7bc5 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -23,6 +23,6 @@ EXTRA_DIST = mailutils-config
mailutils_SOURCES = mu.c
mailutils_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ -DMAILUTILSDIR=\"$(pkglibexecdir)\"
-LDADD = ${MU_APP_LIBRARIES} ${MU_LIB_MAILUTILS}
+LDADD = ${MU_APP_LIBRARIES} ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
diff --git a/python/2/libmu_py/Makefile.am b/python/2/libmu_py/Makefile.am
index cd1cee50d..6cfb8bd96 100644
--- a/python/2/libmu_py/Makefile.am
+++ b/python/2/libmu_py/Makefile.am
@@ -47,11 +47,13 @@ libmu_py_la_SOURCES = \
libmu_py_la_LDFLAGS = -rpath $(libdir) \
-export-symbols-regex '^(mu_py_|Py).*' \
-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_py_la_LIBADD = $(PYTHON_LIBS) @MU_COMMON_LIBRARIES@ \
+libmu_py_la_LIBADD = \
+ $(PYTHON_LIBS) \
${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
${MU_LIB_SIEVE}\
@MU_AUTHLIBS@\
+ @MU_COMMON_LIBRARIES@ \
${MU_LIB_MAILUTILS}
diff --git a/python/3/libmu_py/Makefile.am b/python/3/libmu_py/Makefile.am
index cd1cee50d..6cfb8bd96 100644
--- a/python/3/libmu_py/Makefile.am
+++ b/python/3/libmu_py/Makefile.am
@@ -47,11 +47,13 @@ libmu_py_la_SOURCES = \
libmu_py_la_LDFLAGS = -rpath $(libdir) \
-export-symbols-regex '^(mu_py_|Py).*' \
-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_py_la_LIBADD = $(PYTHON_LIBS) @MU_COMMON_LIBRARIES@ \
+libmu_py_la_LIBADD = \
+ $(PYTHON_LIBS) \
${MU_LIB_MAILBOX}\
${MU_LIB_AUTH}\
${MU_LIB_MAILER}\
${MU_LIB_SIEVE}\
@MU_AUTHLIBS@\
+ @MU_COMMON_LIBRARIES@ \
${MU_LIB_MAILUTILS}
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9526d7d73..4877bc27b 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -50,14 +50,16 @@ LDADD = \
${MU_LIB_MAILER}\
${MU_LIB_AUTH}\
@MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
smtpsend_LDADD = \
${MU_LIB_MAILER} \
@MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+ ${MU_LIB_MAILUTILS}\
+ $(MU_COMMON_LIBRARIES)
-cwdrepl_LDADD = ${MU_LIB_MAILUTILS}
+cwdrepl_LDADD = ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
## ------------ ##
## Test suite. ##

Return to:

Send suggestions and report system problems to the System administrator.