summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-11-30 14:44:01 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-11-30 16:07:09 +0200
commit55ac5cedee1baf716afc7882386d35c54b2f09a4 (patch)
treecedd080d9e94585c1255fc08c449e2cbc358e1ec
parentcfd3a6fe7f841d9992c521fbd8a6b6b1c048f413 (diff)
downloadmailutils-55ac5cedee1baf716afc7882386d35c54b2f09a4.tar.gz
mailutils-55ac5cedee1baf716afc7882386d35c54b2f09a4.tar.bz2
Improve makefile style consistency
. Uniformly use parentheses instead of curly braces in variable referencing . Prefer to use Make variables over substitution variables, for variables prefixed with MU_
-rw-r--r--comsat/Makefile.am12
-rw-r--r--dotlock/Makefile.am8
-rw-r--r--examples/Makefile.am82
-rw-r--r--examples/cpp/Makefile.am20
-rw-r--r--frm/Makefile.am14
-rw-r--r--imap4d/Makefile.am16
-rw-r--r--imap4d/tests/Makefile.am4
-rw-r--r--lib/Makefile.am6
-rw-r--r--libmailutils/address/Makefile.am2
-rw-r--r--libmailutils/auth/Makefile.am2
-rw-r--r--libmailutils/base/Makefile.am2
-rw-r--r--libmailutils/cfg/Makefile.am4
-rw-r--r--libmailutils/cidr/Makefile.am2
-rw-r--r--libmailutils/cli/Makefile.am2
-rw-r--r--libmailutils/datetime/Makefile.am4
-rw-r--r--libmailutils/diag/Makefile.am2
-rw-r--r--libmailutils/filter/Makefile.am2
-rw-r--r--libmailutils/imapio/Makefile.am2
-rw-r--r--libmailutils/list/Makefile.am2
-rw-r--r--libmailutils/locus/Makefile.am2
-rw-r--r--libmailutils/mailbox/Makefile.am2
-rw-r--r--libmailutils/mailcap/Makefile.am2
-rw-r--r--libmailutils/mailer/Makefile.am2
-rw-r--r--libmailutils/mime/Makefile.am2
-rw-r--r--libmailutils/msgset/Makefile.am2
-rw-r--r--libmailutils/opt/Makefile.am2
-rw-r--r--libmailutils/property/Makefile.am2
-rw-r--r--libmailutils/server/Makefile.am2
-rw-r--r--libmailutils/sockaddr/Makefile.am2
-rw-r--r--libmailutils/stdstream/Makefile.am2
-rw-r--r--libmailutils/stream/Makefile.am2
-rw-r--r--libmailutils/string/Makefile.am8
-rw-r--r--libmailutils/tests/Makefile.am4
-rw-r--r--libmailutils/url/Makefile.am2
-rw-r--r--libmailutils/wicket/Makefile.am2
-rw-r--r--libmu_auth/Makefile.am4
-rw-r--r--libmu_cpp/Makefile.am4
-rw-r--r--libmu_dbm/Makefile.am4
-rw-r--r--libmu_scm/Makefile.am8
-rw-r--r--libmu_scm/mailutils/Makefile.am2
-rw-r--r--libmu_sieve/Makefile.am8
-rw-r--r--libmu_sieve/extensions/Makefile.am4
-rw-r--r--libproto/dotmail/Makefile.am4
-rw-r--r--libproto/dotmail/tests/Makefile.am4
-rw-r--r--libproto/imap/Makefile.am4
-rw-r--r--libproto/imap/tests/Makefile.am12
-rw-r--r--libproto/maildir/Makefile.am4
-rw-r--r--libproto/mailer/Makefile.am4
-rw-r--r--libproto/mbox/Makefile.am4
-rw-r--r--libproto/mh/Makefile.am4
-rw-r--r--libproto/nntp/Makefile.am4
-rw-r--r--libproto/pop/Makefile.am4
-rw-r--r--mail/Makefile.am18
-rw-r--r--mapi/Makefile.am4
-rw-r--r--mda/lib/Makefile.am4
-rw-r--r--mda/lmtpd/Makefile.am26
-rw-r--r--mda/mda/Makefile.am24
-rw-r--r--mda/mda/tests/Makefile.am34
-rw-r--r--mda/putmail/Makefile.am24
-rw-r--r--messages/Makefile.am14
-rw-r--r--mh/Makefile.am32
-rw-r--r--mh/tests/Makefile.am2
-rw-r--r--mimeview/Makefile.am8
-rw-r--r--movemail/Makefile.am16
-rw-r--r--mu/Makefile.am6
-rw-r--r--mu/libexec/Makefile.am60
-rw-r--r--pop3d/Makefile.am26
-rw-r--r--python/2/libmu_py/Makefile.am16
-rw-r--r--python/2/mailutils/Makefile.am4
-rw-r--r--python/3/libmu_py/Makefile.am16
-rw-r--r--python/3/mailutils/Makefile.am4
-rw-r--r--readmsg/Makefile.am14
-rw-r--r--sieve/Makefile.am18
-rw-r--r--sql/Makefile.am2
-rw-r--r--testsuite/Makefile.am20
75 files changed, 351 insertions, 351 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 371fbb8f4..701eb0361 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -19,7 +19,7 @@ sbin_PROGRAMS = comsatd
comsatd_SOURCES = action.c comsat.c comsat.h biff.rc.h
AM_CPPFLAGS = \
- @MU_APP_COMMON_INCLUDES@\
+ $(MU_APP_COMMON_INCLUDES)\
-DSYSCONFDIR=\"$(sysconfdir)\"
BUILT_SOURCES=biff.rc.h
@@ -30,9 +30,9 @@ biff.rc.h: $(top_srcdir)/comsat/biff.rc
$(top_srcdir)/comsat/biff.rc > biff.rc.h
comsatd_LDADD = \
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILUTILS}\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_AUTH}\
- @MU_COMMON_LIBRARIES@
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_AUTH)\
+ $(MU_COMMON_LIBRARIES)
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 3e121fa6d..005ecda68 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -14,14 +14,14 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
bin_PROGRAMS = dotlock
dotlock_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
install-exec-hook:
for i in $(bin_PROGRAMS); do\
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 0f840fe0d..3c27c8be6 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -56,86 +56,86 @@ EXTRA_PROGRAMS = nntpclient
## will not create a shared library and `make check' will fail in
## sieve. Pity.
## -Sergey
-moddir=@MU_SIEVE_MODDIR@
+moddir=$(MU_SIEVE_MODDIR)
mod_LTLIBRARIES = numaddr.la
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
LDADD = \
../lib/libmuaux.la\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
numaddr_la_SOURCES = numaddr.c
-numaddr_la_LIBADD = ${MU_LIB_SIEVE}
+numaddr_la_LIBADD = $(MU_LIB_SIEVE)
numaddr_la_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
msg_send_LDADD =\
../lib/libmuaux.la\
- ${MU_LIB_MAILER}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILER)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
-mta_CPPFLAGS=@MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib -I${top_builddir}/lib
+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_MBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
sfrom_LDADD =\
../lib/libmuaux.la\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
mboxsize_LDADD =\
../lib/libmuaux.la\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
nntpclient_LDADD = \
../lib/libmuaux.la\
- ${MU_LIB_NNTP}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_NNTP)\
+ $(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_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS) \
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
-muauth_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+muauth_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
muauth_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS) \
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
-muemail_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+muemail_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
muemail_LDADD = \
- ${MU_APP_LIBRARIES} \
- ${MU_LIB_MAILUTILS} \
+ $(MU_APP_LIBRARIES) \
+ $(MU_LIB_MAILUTILS) \
$(MU_COMMON_LIBRARIES)
-mboxidx_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+mboxidx_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
mboxidx_LDADD=\
../lib/libmuaux.la\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS) \
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index ee98fb035..2f2ad60d7 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -28,15 +28,15 @@ MU_CXX_EXAMPLES_LIST = \
url-parse
EXTRA_PROGRAMS=$(MU_CXX_EXAMPLES_LIST)
-noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
+noinst_PROGRAMS = $(MU_CXX_EXAMPLES_BUILD)
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
AM_LDFLAGS = \
../../lib/libmuaux.la\
../../libmu_cpp/libmu_cpp.la\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
addr_SOURCES = addr.cc
http_SOURCES = http.cc
@@ -53,9 +53,9 @@ url_parse_SOURCES = url-parse.cc
LDADD =\
../../lib/libmuaux.la\
../../libmu_cpp/libmu_cpp.la\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_SIEVE}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_SIEVE)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)
diff --git a/frm/Makefile.am b/frm/Makefile.am
index ffe690818..05e9c4f68 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
SUBDIRS = . tests
@@ -26,11 +26,11 @@ frm_LDADD = $(common_ldadd)
from_LDADD = $(common_ldadd)
common_ldadd = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
@FRIBIDI_LIBS@\
- @MU_COMMON_LIBRARIES@
+ $(MU_COMMON_LIBRARIES)
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 7b44701a4..2aa500585 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES) $(MU_AUTHINCS) @SERV_AUTHINCS@
SUBDIRS = . tests
sbin_PROGRAMS = imap4d
@@ -71,14 +71,14 @@ imap4d_SOURCES = \
util.c
imap4d_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_LOCAL_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_LOCAL_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS) \
+ $(MU_LIB_MAILUTILS)\
@SERV_AUTHLIBS@\
- @MU_COMMON_LIBRARIES@\
- @MU_TCPWRAP_LIBRARIES@
+ $(MU_COMMON_LIBRARIES)\
+ $(MU_TCPWRAP_LIBRARIES)
if MU_COND_UNISTRING
imap4d_LDADD += -lunistring
diff --git a/imap4d/tests/Makefile.am b/imap4d/tests/Makefile.am
index a75e09305..2fbbc028f 100644
--- a/imap4d/tests/Makefile.am
+++ b/imap4d/tests/Makefile.am
@@ -20,9 +20,9 @@ include $(top_srcdir)/testsuite/testsuite.am
## Non-installable programs
## -------------------------- ##
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
noinst_PROGRAMS = ckiconv
-LDADD = ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
+LDADD = $(MU_LIB_MAILUTILS) $(MU_COMMON_LIBRARIES)
TESTSUITE_AT += \
anystate.at\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6661bec7c..795a503e4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,9 +17,9 @@
SUBDIRS = gnu .
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@\
- -I${top_srcdir}/lib/gnu\
- -I${top_builddir}/lib/gnu\
+ $(MU_LIB_COMMON_INCLUDES)\
+ -I$(top_srcdir)/lib/gnu\
+ -I$(top_builddir)/lib/gnu\
@GUILE_INCLUDES@\
@PYTHON_INCLUDES@
diff --git a/libmailutils/address/Makefile.am b/libmailutils/address/Makefile.am
index 671d2615a..e839774d3 100644
--- a/libmailutils/address/Makefile.am
+++ b/libmailutils/address/Makefile.am
@@ -22,4 +22,4 @@ libaddress_la_SOURCES = \
addrstream.c\
parse822.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/auth/Makefile.am b/libmailutils/auth/Makefile.am
index 7d8544083..2d74d015c 100644
--- a/libmailutils/auth/Makefile.am
+++ b/libmailutils/auth/Makefile.am
@@ -22,4 +22,4 @@ libauth_la_SOURCES = \
mu_auth.c\
system.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am
index e641f1dc0..db8da73b0 100644
--- a/libmailutils/base/Makefile.am
+++ b/libmailutils/base/Makefile.am
@@ -74,7 +74,7 @@ libbase_la_SOURCES = \
localedir = $(datadir)/locale
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
+ $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
-DLOCALEDIR=\"$(localedir)\"
diff --git a/libmailutils/cfg/Makefile.am b/libmailutils/cfg/Makefile.am
index aad631d29..6f112d839 100644
--- a/libmailutils/cfg/Makefile.am
+++ b/libmailutils/cfg/Makefile.am
@@ -25,7 +25,7 @@ libcfg_la_SOURCES = \
localedir = $(datadir)/locale
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
+ $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DLOCALEDIR=\"$(localedir)\"
@@ -37,7 +37,7 @@ EXTRA_DIST = \
BUILT_SOURCES = parser.c parser.h lexer.c
-YLWRAP = @MU_YLWRAP@
+YLWRAP = $(MU_YLWRAP)
AM_YFLAGS=-vdt
AM_LFLAGS=-dp
diff --git a/libmailutils/cidr/Makefile.am b/libmailutils/cidr/Makefile.am
index 40887a552..9edce6e5b 100644
--- a/libmailutils/cidr/Makefile.am
+++ b/libmailutils/cidr/Makefile.am
@@ -24,4 +24,4 @@ libcidr_la_SOURCES = \
tosa.c\
tostr.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/cli/Makefile.am b/libmailutils/cli/Makefile.am
index db5540e15..d1bb90040 100644
--- a/libmailutils/cli/Makefile.am
+++ b/libmailutils/cli/Makefile.am
@@ -24,4 +24,4 @@ libcli_la_SOURCES = \
stdcapa.c
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+ $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/datetime/Makefile.am b/libmailutils/datetime/Makefile.am
index 2cc68df91..1b6f24603 100644
--- a/libmailutils/datetime/Makefile.am
+++ b/libmailutils/datetime/Makefile.am
@@ -32,6 +32,6 @@ libdatetime_la_SOURCES = \
utcoff.c\
yd.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
-YLWRAP = @MU_YLWRAP@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
+YLWRAP = $(MU_YLWRAP)
EXTRA_DIST = gylwrap.conf
diff --git a/libmailutils/diag/Makefile.am b/libmailutils/diag/Makefile.am
index 666a0baed..6e4c99ea8 100644
--- a/libmailutils/diag/Makefile.am
+++ b/libmailutils/diag/Makefile.am
@@ -26,7 +26,7 @@ libdiag_la_SOURCES = \
syslog.c\
wd.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
EXTRA_DIST = \
debcat\
diff --git a/libmailutils/filter/Makefile.am b/libmailutils/filter/Makefile.am
index 223c1e908..8d83a8b2d 100644
--- a/libmailutils/filter/Makefile.am
+++ b/libmailutils/filter/Makefile.am
@@ -39,5 +39,5 @@ libfilter_la_SOURCES =\
qpflt.c\
xml.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils
diff --git a/libmailutils/imapio/Makefile.am b/libmailutils/imapio/Makefile.am
index f501a21c7..e7bbb75a4 100644
--- a/libmailutils/imapio/Makefile.am
+++ b/libmailutils/imapio/Makefile.am
@@ -40,5 +40,5 @@ libimapio_la_SOURCES = \
words.c\
xscript.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/list/Makefile.am b/libmailutils/list/Makefile.am
index efcac5c57..61af870e3 100644
--- a/libmailutils/list/Makefile.am
+++ b/libmailutils/list/Makefile.am
@@ -52,5 +52,5 @@ liblist_la_SOURCES = \
sort.c\
tail.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/locus/Makefile.am b/libmailutils/locus/Makefile.am
index 7bf9b4a03..fdedc9385 100644
--- a/libmailutils/locus/Makefile.am
+++ b/libmailutils/locus/Makefile.am
@@ -27,5 +27,5 @@ liblocus_la_SOURCES = \
EXTRA_DIST = genprloc.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mailbox/Makefile.am b/libmailutils/mailbox/Makefile.am
index edf01cf84..8cab0f169 100644
--- a/libmailutils/mailbox/Makefile.am
+++ b/libmailutils/mailbox/Makefile.am
@@ -56,4 +56,4 @@ libmailbox_la_SOURCES = \
msguid.c\
msguidl.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mailcap/Makefile.am b/libmailutils/mailcap/Makefile.am
index 20e86682d..7e3719042 100644
--- a/libmailutils/mailcap/Makefile.am
+++ b/libmailutils/mailcap/Makefile.am
@@ -39,4 +39,4 @@ libmailcap_la_SOURCES = \
parse.c\
parsefile.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mailer/Makefile.am b/libmailutils/mailer/Makefile.am
index 6aca0e892..358e85cd1 100644
--- a/libmailutils/mailer/Makefile.am
+++ b/libmailutils/mailer/Makefile.am
@@ -21,4 +21,4 @@ libmailer_la_SOURCES = \
mailer.c\
progmailer.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mime/Makefile.am b/libmailutils/mime/Makefile.am
index b71b07c62..adb98f99f 100644
--- a/libmailutils/mime/Makefile.am
+++ b/libmailutils/mime/Makefile.am
@@ -23,4 +23,4 @@ libmime_la_SOURCES = \
mimehdr.c\
mimehdrset.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/msgset/Makefile.am b/libmailutils/msgset/Makefile.am
index 5f55667b6..b74488eb0 100644
--- a/libmailutils/msgset/Makefile.am
+++ b/libmailutils/msgset/Makefile.am
@@ -44,5 +44,5 @@ libmsgset_la_SOURCES = \
subset.c\
trans.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/opt/Makefile.am b/libmailutils/opt/Makefile.am
index 35856fe8e..4fb54d494 100644
--- a/libmailutils/opt/Makefile.am
+++ b/libmailutils/opt/Makefile.am
@@ -23,4 +23,4 @@ libopt_la_SOURCES = \
progname.c
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+ $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/property/Makefile.am b/libmailutils/property/Makefile.am
index 6863f3b4a..33d61a288 100644
--- a/libmailutils/property/Makefile.am
+++ b/libmailutils/property/Makefile.am
@@ -27,4 +27,4 @@ libproperty_la_SOURCES = \
propinv.c\
propset.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/server/Makefile.am b/libmailutils/server/Makefile.am
index 8e12a1cba..6aca7e423 100644
--- a/libmailutils/server/Makefile.am
+++ b/libmailutils/server/Makefile.am
@@ -24,4 +24,4 @@ libserver_la_SOURCES = \
ipsrv.c\
sid.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/sockaddr/Makefile.am b/libmailutils/sockaddr/Makefile.am
index 087509ba2..a3e901004 100644
--- a/libmailutils/sockaddr/Makefile.am
+++ b/libmailutils/sockaddr/Makefile.am
@@ -29,4 +29,4 @@ libsockaddr_la_SOURCES = \
unlink.c\
url.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/stdstream/Makefile.am b/libmailutils/stdstream/Makefile.am
index aa2d73191..f8a54c14f 100644
--- a/libmailutils/stdstream/Makefile.am
+++ b/libmailutils/stdstream/Makefile.am
@@ -22,4 +22,4 @@ libstdstream_la_SOURCES = \
dbgstream.c\
strerr.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/stream/Makefile.am b/libmailutils/stream/Makefile.am
index 2c2c396f9..075de2cbe 100644
--- a/libmailutils/stream/Makefile.am
+++ b/libmailutils/stream/Makefile.am
@@ -42,4 +42,4 @@ libstream_la_SOURCES = \
wordwrap.c\
xscript-stream.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/string/Makefile.am b/libmailutils/string/Makefile.am
index 24557717a..d7b1eef40 100644
--- a/libmailutils/string/Makefile.am
+++ b/libmailutils/string/Makefile.am
@@ -51,7 +51,7 @@ libstring_la_SOURCES = \
EXTRA_DIST=to_sn.c to_un.c
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@\
- -I${srcdir}\
- -I${top_srcdir}/libmailutils\
- -I${top_srcdir}/libmailutils/wordsplit
+ $(MU_LIB_COMMON_INCLUDES)\
+ -I$(srcdir)\
+ -I$(top_srcdir)/libmailutils\
+ -I$(top_srcdir)/libmailutils/wordsplit
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index 2163a376f..1177962b4 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -21,7 +21,7 @@ AUTOTEST_INCLUDES += -I $(top_srcdir)/libmailutils/wordsplit
## Non-installable programs
## -------------------------- ##
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
noinst_LTLIBRARIES = libmu_tesh.la
libmu_tesh_la_SOURCES = tesh.c tesh.h
@@ -76,7 +76,7 @@ linetrack_LDADD = libmu_tesh.la $(LDADD)
listop_LDADD = libmu_tesh.la $(LDADD)
-LDADD = ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
+LDADD = $(MU_LIB_MAILUTILS) $(MU_COMMON_LIBRARIES)
EXTRA_DIST += Encode Decode Wicketfile
diff --git a/libmailutils/url/Makefile.am b/libmailutils/url/Makefile.am
index 7fd95d3db..0cb1436d8 100644
--- a/libmailutils/url/Makefile.am
+++ b/libmailutils/url/Makefile.am
@@ -55,5 +55,5 @@ liburl_la_SOURCES = \
urlinv.c\
urlstr.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/wicket/Makefile.am b/libmailutils/wicket/Makefile.am
index b7f352879..b597fe4ab 100644
--- a/libmailutils/wicket/Makefile.am
+++ b/libmailutils/wicket/Makefile.am
@@ -22,7 +22,7 @@ libwicket_la_SOURCES = \
localedir = $(datadir)/locale
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
+ $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
-DLOCALEDIR=\"$(localedir)\"
diff --git a/libmu_auth/Makefile.am b/libmu_auth/Makefile.am
index 613dc6376..a48fa5473 100644
--- a/libmu_auth/Makefile.am
+++ b/libmu_auth/Makefile.am
@@ -15,7 +15,7 @@
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@\
+ $(MU_LIB_COMMON_INCLUDES)\
-DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
-DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
@@ -40,5 +40,5 @@ else
libmu_auth_la_SOURCES += notls.c
endif
-libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
+libmu_auth_la_LIBADD = $(MU_LIB_MAILUTILS) $(MU_AUTHLIBS) @SQLLIB@ @LTLIBINTL@
libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libmu_cpp/Makefile.am b/libmu_cpp/Makefile.am
index d97befdd0..9aed22812 100644
--- a/libmu_cpp/Makefile.am
+++ b/libmu_cpp/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
lib_LTLIBRARIES = libmu_cpp.la
@@ -41,6 +41,6 @@ libmu_cpp_la_SOURCES = \
stream.cc\
url.cc
-libmu_cpp_la_LIBADD = @MU_COMMON_LIBRARIES@
+libmu_cpp_la_LIBADD = $(MU_COMMON_LIBRARIES)
libmu_cpp_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libmu_dbm/Makefile.am b/libmu_dbm/Makefile.am
index 6effa8f6c..6a12e3f23 100644
--- a/libmu_dbm/Makefile.am
+++ b/libmu_dbm/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @DBMINCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) @DBMINCLUDES@
lib_LTLIBRARIES = libmu_dbm.la
@@ -42,6 +42,6 @@ libmu_dbm_la_SOURCES = \
noinst_HEADERS = mudbm.h
-libmu_dbm_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @DBMLIBS@ @LTLIBINTL@
+libmu_dbm_la_LIBADD = $(MU_LIB_MAILUTILS) $(MU_AUTHLIBS) @DBMLIBS@ @LTLIBINTL@
libmu_dbm_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am
index 98c348c31..2c04c8ea2 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -16,7 +16,7 @@
SUBDIRS = . mailutils tests
-AM_CPPFLAGS = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@
+AM_CPPFLAGS = -I. $(MU_LIB_COMMON_INCLUDES) @GUILE_INCLUDES@
lib_LTLIBRARIES=libmu_scm.la
@@ -42,9 +42,9 @@ libmu_scm_la_SOURCES=\
libmu_scm_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_scm_la_LIBADD = \
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_MAILUTILS)\
@GUILE_LIBS@
DOT_X_FILES=\
diff --git a/libmu_scm/mailutils/Makefile.am b/libmu_scm/mailutils/Makefile.am
index f24dc955d..24f92ed6d 100644
--- a/libmu_scm/mailutils/Makefile.am
+++ b/libmu_scm/mailutils/Makefile.am
@@ -48,7 +48,7 @@ if MU_COND_SUPPORT_MAILDIR
MU_FEATURES += -DMU_SUPPORT_MAILDIR
endif
-mailutils.scm: mailutils.scm.in
+mailutils.scm: mailutils.scm.in $(top_builddir)/config.status
$(AM_V_GEN)m4 $(MU_FEATURES) $(srcdir)/mailutils.scm.in > $@
diff --git a/libmu_sieve/Makefile.am b/libmu_sieve/Makefile.am
index fada78b75..29694f934 100644
--- a/libmu_sieve/Makefile.am
+++ b/libmu_sieve/Makefile.am
@@ -14,12 +14,12 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-YLWRAP = @MU_YLWRAP@
+YLWRAP = $(MU_YLWRAP)
AM_YFLAGS = -dtv
#AM_LEXFLAGS=-dvp
AM_CPPFLAGS =\
- @MU_LIB_COMMON_INCLUDES@\
- -DMU_SIEVE_MODDIR=\"@MU_SIEVE_MODDIR@\"
+ $(MU_LIB_COMMON_INCLUDES)\
+ -DMU_SIEVE_MODDIR=\"$(MU_SIEVE_MODDIR)\"
SUBDIRS = . extensions
@@ -45,7 +45,7 @@ libmu_sieve_la_SOURCES = \
tests.c\
util.c\
variables.c
-libmu_sieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
+libmu_sieve_la_LIBADD = $(MU_LIB_MAILUTILS) @LTDL_LIB@
libmu_sieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
noinst_HEADERS = sieve-priv.h sieve-gram.h
diff --git a/libmu_sieve/extensions/Makefile.am b/libmu_sieve/extensions/Makefile.am
index c512340e5..4456eed0e 100644
--- a/libmu_sieve/extensions/Makefile.am
+++ b/libmu_sieve/extensions/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-moddir=@MU_SIEVE_MODDIR@
+moddir=$(MU_SIEVE_MODDIR)
mod_LTLIBRARIES = \
editheader.la\
list.la\
@@ -24,7 +24,7 @@ mod_LTLIBRARIES = \
timestamp.la\
vacation.la
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
AM_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
diff --git a/libproto/dotmail/Makefile.am b/libproto/dotmail/Makefile.am
index c01d9900b..e145f2d0a 100644
--- a/libproto/dotmail/Makefile.am
+++ b/libproto/dotmail/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+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 66a4e364c..37a118e64 100644
--- a/libproto/dotmail/tests/Makefile.am
+++ b/libproto/dotmail/tests/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/testsuite/testsuite.am
## Non-installable programs
## -------------------------- ##
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
noinst_PROGRAMS = \
dm_mesg\
dm_qget\
@@ -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} ${MU_COMMON_LIBRARIES}
+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 39ba58385..c7c44d070 100644
--- a/libproto/imap/Makefile.am
+++ b/libproto/imap/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+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_MAILUTILS}
+libmu_imap_la_LIBADD = $(MU_LIB_MAILUTILS)
SUBDIRS = . tests
diff --git a/libproto/imap/tests/Makefile.am b/libproto/imap/tests/Makefile.am
index 8a305378a..0a9c26875 100644
--- a/libproto/imap/tests/Makefile.am
+++ b/libproto/imap/tests/Makefile.am
@@ -17,11 +17,11 @@
noinst_PROGRAMS = \
imapfolder
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
LDADD = \
- @MU_LIB_IMAP@\
- @MU_LIB_AUTH@\
- @MU_AUTHLIBS@\
- @MU_LIB_MAILUTILS@\
+ $(MU_LIB_IMAP)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)\
- ${MU_LIB_MAILUTILS}
+ $(MU_LIB_MAILUTILS)
diff --git a/libproto/maildir/Makefile.am b/libproto/maildir/Makefile.am
index 8f61b9980..ded2d2388 100644
--- a/libproto/maildir/Makefile.am
+++ b/libproto/maildir/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
lib_LTLIBRARIES = libmu_maildir.la
libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_maildir_la_LIBADD = ${MU_LIB_MAILUTILS}
+libmu_maildir_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_maildir_la_SOURCES = \
folder.c \
maildir.h \
diff --git a/libproto/mailer/Makefile.am b/libproto/mailer/Makefile.am
index a26647ac3..84ea3d9ee 100644
--- a/libproto/mailer/Makefile.am
+++ b/libproto/mailer/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+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}
+libmu_mailer_la_LIBADD = $(MU_LIB_AUTH) $(MU_LIB_MAILUTILS)
if MU_COND_GSASL
SMTP_GSASL=smtp_gsasl.c
diff --git a/libproto/mbox/Makefile.am b/libproto/mbox/Makefile.am
index 032e66955..4a5775efe 100644
--- a/libproto/mbox/Makefile.am
+++ b/libproto/mbox/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
lib_LTLIBRARIES = libmu_mbox.la
libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_mbox_la_LIBADD = ${MU_LIB_MAILUTILS}
+libmu_mbox_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_mbox_la_SOURCES = \
folder.c\
mbox.c\
diff --git a/libproto/mh/Makefile.am b/libproto/mh/Makefile.am
index f79c998f6..b8eb472c2 100644
--- a/libproto/mh/Makefile.am
+++ b/libproto/mh/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
lib_LTLIBRARIES = libmu_mh.la
libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_mh_la_LIBADD = ${MU_LIB_MAILUTILS}
+libmu_mh_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_mh_la_SOURCES = \
folder.c\
mbox.c\
diff --git a/libproto/nntp/Makefile.am b/libproto/nntp/Makefile.am
index e559c04aa..6825269a7 100644
--- a/libproto/nntp/Makefile.am
+++ b/libproto/nntp/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
lib_LTLIBRARIES = libmu_nntp.la
libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmu_nntp_la_LIBADD = ${MU_LIB_MAILUTILS}
+libmu_nntp_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_nntp_la_SOURCES = \
nntp_article.c \
nntp_body.c \
diff --git a/libproto/pop/Makefile.am b/libproto/pop/Makefile.am
index 674e74852..32cdd6e43 100644
--- a/libproto/pop/Makefile.am
+++ b/libproto/pop/Makefile.am
@@ -14,11 +14,11 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+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_MAILUTILS}
+libmu_pop_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_pop_la_SOURCES = \
mbox.c \
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 38400589a..c9604ae3b 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -14,10 +14,10 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-YLWRAP = @MU_YLWRAP@
+YLWRAP = $(MU_YLWRAP)
AM_YFLAGS=-vt
AM_CPPFLAGS = \
- @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@\
+ $(MU_APP_COMMON_INCLUDES) $(MU_AUTHINCS)\
-DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
mailbindir=@MAILBINDIR@
@@ -25,13 +25,13 @@ mailbindir=@MAILBINDIR@
mailbin_PROGRAMS = mail
mail_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ @READLINE_LIBS@ $(MU_COMMON_LIBRARIES)
EXTRA_DIST = msgset.c
diff --git a/mapi/Makefile.am b/mapi/Makefile.am
index 80dac2d6b..747d9dd49 100644
--- a/mapi/Makefile.am
+++ b/mapi/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
SUBDIRS = include
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = libmapi.la
/* FIXME: This should be part of the default includes. */
EXTRA_DIST = mapi.h
-libmapi_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS}
+libmapi_LDADD = ../lib/libmuaux.la $(MU_LIB_MAILUTILS)
libmapi_la_SOURCES = \
MAPIAddress.c \
diff --git a/mda/lib/Makefile.am b/mda/lib/Makefile.am
index 8f78331e0..87b57fa39 100644
--- a/mda/lib/Makefile.am
+++ b/mda/lib/Makefile.am
@@ -22,9 +22,9 @@ libmda_a_SOURCES = \
noinst_HEADERS = libmda.h
-# # FIXME @MU_TCPWRAP_LIBRARIES@
+# # FIXME $(MU_TCPWRAP_LIBRARIES)
-AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
+AM_CPPFLAGS = -I$(top_srcdir) $(MU_APP_COMMON_INCLUDES) @GUILE_INCLUDES@ \
@PYTHON_INCLUDES@
if MU_COND_MAILBOX_QUOTA
diff --git a/mda/lmtpd/Makefile.am b/mda/lmtpd/Makefile.am
index 6e34124e3..39e890e44 100644
--- a/mda/lmtpd/Makefile.am
+++ b/mda/lmtpd/Makefile.am
@@ -19,30 +19,30 @@ sbin_PROGRAMS = lmtpd
lmtpd_SOURCES = lmtpd.c
-AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ -I${srcdir}/../lib
+AM_CPPFLAGS = -I$(top_srcdir) $(MU_APP_COMMON_INCLUDES) -I$(srcdir)/../lib
if MU_COND_DBM
- LIBMU_DBM=${top_builddir}/libmu_dbm/libmu_dbm.la
+ LIBMU_DBM=$(top_builddir)/libmu_dbm/libmu_dbm.la
endif
lmtpd_LDADD = \
../lib/libmda.a\
- ${top_builddir}/lib/libmuscript.a\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- ${MU_LIB_MAILER}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS} \
+ $(top_builddir)/lib/libmuscript.a\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_SIEVE)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS) \
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
- @MU_LIB_PY@\
+ $(MU_LIB_PY)\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
@DBMLIBS@\
- @MU_TCPWRAP_LIBRARIES@\
- @MU_COMMON_LIBRARIES@
+ $(MU_TCPWRAP_LIBRARIES)\
+ $(MU_COMMON_LIBRARIES)
diff --git a/mda/mda/Makefile.am b/mda/mda/Makefile.am
index 2074176bf..67c19124e 100644
--- a/mda/mda/Makefile.am
+++ b/mda/mda/Makefile.am
@@ -19,30 +19,30 @@ sbin_PROGRAMS = mda
mda_SOURCES = mda.c
-AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ -I${srcdir}/../lib
+AM_CPPFLAGS = -I$(top_srcdir) $(MU_APP_COMMON_INCLUDES) -I$(srcdir)/../lib
if MU_COND_DBM
- LIBMU_DBM=${top_builddir}/libmu_dbm/libmu_dbm.la
+ LIBMU_DBM=$(top_builddir)/libmu_dbm/libmu_dbm.la
endif
LDADD = \
../lib/libmda.a\
- ${top_builddir}/lib/libmuscript.a\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- ${MU_LIB_MAILER}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS} \
+ $(top_builddir)/lib/libmuscript.a\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_SIEVE)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS) \
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
- @MU_LIB_PY@\
+ $(MU_LIB_PY)\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
@DBMLIBS@\
- @MU_COMMON_LIBRARIES@
+ $(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 16a9c9a7e..ad38f33ac 100644
--- a/mda/mda/tests/Makefile.am
+++ b/mda/mda/tests/Makefile.am
@@ -20,35 +20,35 @@ TESTSUITE_AT += mda.at forward.at
noinst_PROGRAMS = testmda
testmda_SOURCES = testmda.c
-testmda.c: ${srcdir}/../mda.c
- cp ${srcdir}/../mda.c testmda.c
+testmda.c: $(srcdir)/../mda.c
+ cp $(srcdir)/../mda.c testmda.c
BUILT_SOURCES = testmda.c
if MU_COND_DBM
- LIBMU_DBM=${top_builddir}/libmu_dbm/libmu_dbm.la
+ LIBMU_DBM=$(top_builddir)/libmu_dbm/libmu_dbm.la
endif
LDADD = \
- ${builddir}/../../lib/libmda.a\
- ${top_builddir}/lib/libmuscript.a\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- ${MU_LIB_MAILER}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS} \
+ $(builddir)/../../lib/libmda.a\
+ $(top_builddir)/lib/libmuscript.a\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_SIEVE)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS) \
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
- @MU_LIB_PY@\
+ $(MU_LIB_PY)\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
@DBMLIBS@\
- @MU_COMMON_LIBRARIES@
+ $(MU_COMMON_LIBRARIES)
AM_CPPFLAGS = \
- -I${top_srcdir}\
- @MU_APP_COMMON_INCLUDES@\
- -I${srcdir}/../../lib\
+ -I$(top_srcdir)\
+ $(MU_APP_COMMON_INCLUDES)\
+ -I$(srcdir)/../../lib\
-DTESTSUITE_CONFIG_FILE=\"testmda.conf\"
diff --git a/mda/putmail/Makefile.am b/mda/putmail/Makefile.am
index 000547629..28fa110ec 100644
--- a/mda/putmail/Makefile.am
+++ b/mda/putmail/Makefile.am
@@ -17,28 +17,28 @@ SUBDIRS = . tests
bin_PROGRAMS = putmail
-AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ -I${srcdir}/../lib
+AM_CPPFLAGS = -I$(top_srcdir) $(MU_APP_COMMON_INCLUDES) -I$(srcdir)/../lib
if MU_COND_DBM
- LIBMU_DBM=${top_builddir}/libmu_dbm/libmu_dbm.la
+ LIBMU_DBM=$(top_builddir)/libmu_dbm/libmu_dbm.la
endif
LDADD = \
../lib/libmda.a\
- ${top_builddir}/lib/libmuscript.a\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- ${MU_LIB_MAILER}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS} \
+ $(top_builddir)/lib/libmuscript.a\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_SIEVE)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS) \
@LIBMU_SCM@\
@LIBMU_SCM_DEPS@\
- @MU_LIB_PY@\
+ $(MU_LIB_PY)\
$(LIBMU_DBM)\
@GUILE_LIBS@\
@PYTHON_LIBS@\
@DBMLIBS@\
- @MU_COMMON_LIBRARIES@
+ $(MU_COMMON_LIBRARIES)
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 8c4f84bf3..db169f412 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -14,17 +14,17 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
SUBDIRS = . tests
bin_PROGRAMS = messages
messages_SOURCES = messages.c
messages_LDADD =\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
diff --git a/mh/Makefile.am b/mh/Makefile.am
index de562cd62..034bce8cc 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -100,24 +100,24 @@ EXTRA_DIST = gylwrap.conf
mhlibdir = $(pkgdatadir)/mh
AM_CPPFLAGS =\
- @MU_APP_COMMON_INCLUDES@\
+ $(MU_APP_COMMON_INCLUDES)\
-D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\"\
-DMHBINDIR=\"$(bindir)\"
mh_LIBS = \
./libmh.a\
../lib/libmuaux.la\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
LDADD = $(mh_LIBS)
scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
pick_SOURCES = pick.c pick.h pick-gram.y pick-gram.h
-YLWRAP = @MU_YLWRAP@
+YLWRAP = $(MU_YLWRAP)
AM_YFLAGS=-vt
inc_LDADD = \
@@ -126,14 +126,14 @@ inc_LDADD = \
../lib/libmuscript.a\
@LIBMU_SCM@ @GUILE_LIBS@\
@LIBMU_SCM_DEPS@\
- @MU_LIB_PY@ @PYTHON_LIBS@\
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_LIB_PY) @PYTHON_LIBS@\
+ $(MU_LIB_SIEVE)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
install-exec-hook:
@here=`pwd`; \
diff --git a/mh/tests/Makefile.am b/mh/tests/Makefile.am
index 8b744afc6..21477250b 100644
--- a/mh/tests/Makefile.am
+++ b/mh/tests/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST += mhed movemsg
## Non-installable programs ##
## -------------------------- ##
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
noinst_PROGRAMS = lu
TESTSUITE_AT += \
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index 2d64d9b98..fe303e181 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -17,7 +17,7 @@
SUBDIRS = . tests
AM_CPPFLAGS = \
- @MU_APP_COMMON_INCLUDES@\
+ $(MU_APP_COMMON_INCLUDES)\
-D_GNU_SOURCE=1\
-DDEFAULT_CUPS_CONFDIR=\"@DEFAULT_CUPS_CONFDIR@\"
@@ -29,13 +29,13 @@ mimeview_SOURCES = \
mimeview.h\
grammar.h
-YLWRAP = @MU_YLWRAP@
+YLWRAP = $(MU_YLWRAP)
AM_YFLAGS=-vtd
AM_LEXFLAGS=-d
EXTRA_DIST = gylwrap.conf
mimeview_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILUTILS}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 0dfc2e3cb..340563a9a 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -14,15 +14,15 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES) $(MU_AUTHINCS)
bin_PROGRAMS = movemail
movemail_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- ${MU_LIB_MAILER}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
diff --git a/mu/Makefile.am b/mu/Makefile.am
index c514b7bc5..aa238d730 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -21,8 +21,8 @@ bin_SCRIPTS = mailutils-config
EXTRA_DIST = mailutils-config
mailutils_SOURCES = mu.c
-mailutils_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ -DMAILUTILSDIR=\"$(pkglibexecdir)\"
+mailutils_CPPFLAGS = $(MU_APP_COMMON_INCLUDES) -DMAILUTILSDIR=\"$(pkglibexecdir)\"
-LDADD = ${MU_APP_LIBRARIES} ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
+LDADD = $(MU_APP_LIBRARIES) $(MU_LIB_MAILUTILS) $(MU_COMMON_LIBRARIES)
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
diff --git a/mu/libexec/Makefile.am b/mu/libexec/Makefile.am
index b4f430260..8959dabfd 100644
--- a/mu/libexec/Makefile.am
+++ b/mu/libexec/Makefile.am
@@ -49,7 +49,7 @@ if MU_COND_DBM
pkglibexec_PROGRAMS += mailutils-dbm
mailutils_dbm_SOURCES = dbm.c
mailutils_dbm_LDFLAGS = \
- ${MU_APP_LIBRARIES}\
+ $(MU_APP_LIBRARIES)\
../../libmu_dbm/libmu_dbm.la\
@DBMLIBS@\
$(MUTOOL_LIBRARIES_TAIL)
@@ -60,12 +60,12 @@ if MU_COND_SUPPORT_POP
mailutils_pop_SOURCES = pop.c
mailutils_pop_CPPFLAGS = \
$(AM_CPPFLAGS)\
- @MU_AUTHINCS@
+ $(MU_AUTHINCS)
mailutils_pop_LDADD =\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_POP}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_POP)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
$(MUTOOL_LIBRARIES_TAIL)
endif
@@ -74,53 +74,53 @@ if MU_COND_SUPPORT_IMAP
mailutils_imap_SOURCES = imap.c
mailutils_imap_CPPFLAGS = \
$(AM_CPPFLAGS)\
- @MU_AUTHINCS@
+ $(MU_AUTHINCS)
mailutils_imap_LDADD =\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_IMAP)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
$(MUTOOL_LIBRARIES_TAIL)
endif
mailutils_send_SOURCES = send.c
mailutils_send_CPPFLAGS = \
$(AM_CPPFLAGS)\
- @MU_AUTHINCS@
+ $(MU_AUTHINCS)
mailutils_send_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
$(MUTOOL_LIBRARIES_TAIL)
mailutils_stat_SOURCES = stat.c
mailutils_stat_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
$(MUTOOL_LIBRARIES_TAIL)
mailutils_smtp_SOURCES = smtp.c
mailutils_smtp_CPPFLAGS = \
$(AM_CPPFLAGS)\
- @MU_AUTHINCS@
+ $(MU_AUTHINCS)
mailutils_smtp_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
$(MUTOOL_LIBRARIES_TAIL)
MUTOOL_LIBRARIES_TAIL = \
./libmutool.a\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILUTILS}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILUTILS)\
@READLINE_LIBS@\
- @MU_COMMON_LIBRARIES@
+ $(MU_COMMON_LIBRARIES)
-LDADD = ${MU_APP_LIBRARIES} $(MUTOOL_LIBRARIES_TAIL)
+LDADD = $(MU_APP_LIBRARIES) $(MUTOOL_LIBRARIES_TAIL)
AM_CPPFLAGS = \
- @MU_APP_COMMON_INCLUDES@
+ $(MU_APP_COMMON_INCLUDES)
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 36f8dbd8e..c9edd5497 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
sbin_PROGRAMS = pop3d
bin_PROGRAMS = @POPAUTH@
@@ -50,21 +50,21 @@ if MU_COND_DBM
endif
pop3d_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_LOCAL_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@ \
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@\
- ${LIBMU_DBM}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_LOCAL_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS) \
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)\
+ $(LIBMU_DBM)\
@DBMLIBS@\
- @MU_TCPWRAP_LIBRARIES@
+ $(MU_TCPWRAP_LIBRARIES)
popauth_SOURCES = popauth.c
popauth_LDADD = \
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@\
- ${LIBMU_DBM}\
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)\
+ $(LIBMU_DBM)\
@DBMLIBS@
diff --git a/python/2/libmu_py/Makefile.am b/python/2/libmu_py/Makefile.am
index 6cfb8bd96..41d511c3e 100644
--- a/python/2/libmu_py/Makefile.am
+++ b/python/2/libmu_py/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) $(PYTHON_INCLUDES)
lib_LTLIBRARIES=libmu_py.la
libmu_py_la_SOURCES = \
@@ -49,11 +49,11 @@ libmu_py_la_LDFLAGS = -rpath $(libdir) \
-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
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}
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_SIEVE)\
+ $(MU_AUTHLIBS)\
+ $(MU_COMMON_LIBRARIES) \
+ $(MU_LIB_MAILUTILS)
diff --git a/python/2/mailutils/Makefile.am b/python/2/mailutils/Makefile.am
index 7ed760967..54c3a11dc 100644
--- a/python/2/mailutils/Makefile.am
+++ b/python/2/mailutils/Makefile.am
@@ -42,8 +42,8 @@ pythonsite_PYTHON=\
pythonexecdir=@PYTHON_EXEC_DIR@
pythonexec_LTLIBRARIES = c_api.la
c_api_la_LDFLAGS = -avoid-version -module -rpath $(pythonexecdir)
-c_api_la_LIBADD = $(PYTHON_LIBS) ${MU_LIB_PY}
+c_api_la_LIBADD = $(PYTHON_LIBS) $(MU_LIB_PY)
c_api_la_SOURCES = c_api.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @PYTHON_INCLUDES@\
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) @PYTHON_INCLUDES@\
-I$(top_srcdir)/python/$(PYTHON_MAJOR)/libmu_py
diff --git a/python/3/libmu_py/Makefile.am b/python/3/libmu_py/Makefile.am
index 6cfb8bd96..41d511c3e 100644
--- a/python/3/libmu_py/Makefile.am
+++ b/python/3/libmu_py/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) $(PYTHON_INCLUDES)
lib_LTLIBRARIES=libmu_py.la
libmu_py_la_SOURCES = \
@@ -49,11 +49,11 @@ libmu_py_la_LDFLAGS = -rpath $(libdir) \
-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
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}
+ $(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/mailutils/Makefile.am b/python/3/mailutils/Makefile.am
index 7ed760967..54c3a11dc 100644
--- a/python/3/mailutils/Makefile.am
+++ b/python/3/mailutils/Makefile.am
@@ -42,8 +42,8 @@ pythonsite_PYTHON=\
pythonexecdir=@PYTHON_EXEC_DIR@
pythonexec_LTLIBRARIES = c_api.la
c_api_la_LDFLAGS = -avoid-version -module -rpath $(pythonexecdir)
-c_api_la_LIBADD = $(PYTHON_LIBS) ${MU_LIB_PY}
+c_api_la_LIBADD = $(PYTHON_LIBS) $(MU_LIB_PY)
c_api_la_SOURCES = c_api.c
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ @PYTHON_INCLUDES@\
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) @PYTHON_INCLUDES@\
-I$(top_srcdir)/python/$(PYTHON_MAJOR)/libmu_py
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 1792605d1..e697ae0b2 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -14,7 +14,7 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
SUBDIRS = . tests
@@ -22,9 +22,9 @@ bin_PROGRAMS = readmsg
readmsg_SOURCES = readmsg.c msglist.c readmsg.h
readmsg_LDADD =\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 6ed4f91f9..3ee86af23 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -14,21 +14,21 @@
## You should have received a copy of the GNU General Public License
## along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
-AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_APP_COMMON_INCLUDES)
SUBDIRS = . tests
EXTRA_DIST = examples
bin_PROGRAMS = sieve
sieve_SOURCES = sieve.c
sieve_LDADD =\
- ${MU_APP_LIBRARIES}\
- ${MU_LIB_SIEVE}\
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
- @MU_COMMON_LIBRARIES@
+ $(MU_APP_LIBRARIES)\
+ $(MU_LIB_SIEVE)\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
+ $(MU_COMMON_LIBRARIES)
sieve_LDFLAGS = -export-dynamic
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 9c7408924..56506523e 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST=\
postgres.c
DISTCLEANFILES = modlist.h
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
libsql_la_SOURCES=sql.c
libsql_la_LIBADD=@SQL_LTLIBOBJS@
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 4877bc27b..1bef60df4 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST += \
## Non-installable programs
## -------------------------- ##
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
noinst_PROGRAMS = \
bs\
cwdrepl\
@@ -46,20 +46,20 @@ noinst_PROGRAMS = \
ufms
LDADD = \
- ${MU_LIB_MAILBOX}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILBOX)\
+ $(MU_LIB_MAILER)\
+ $(MU_LIB_AUTH)\
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
smtpsend_LDADD = \
- ${MU_LIB_MAILER} \
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}\
+ $(MU_LIB_MAILER) \
+ $(MU_AUTHLIBS)\
+ $(MU_LIB_MAILUTILS)\
$(MU_COMMON_LIBRARIES)
-cwdrepl_LDADD = ${MU_LIB_MAILUTILS} $(MU_COMMON_LIBRARIES)
+cwdrepl_LDADD = $(MU_LIB_MAILUTILS) $(MU_COMMON_LIBRARIES)
## ------------ ##
## Test suite. ##

Return to:

Send suggestions and report system problems to the System administrator.