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_

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