SourceFormat Enforcement

diff --git a/Makefile.am b/Makefile.am
index 3d5f3de59b84c94285c84c15c8e273bc2f44c532..e1c34602d4ec05520750591f851ce7277ba8e226 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ install-pinger:
 check: have-cppunit check-recursive
 
 have-cppunit:
-       @if test "@SQUID_CPPUNIT_INC@@SQUID_CPPUNIT_LA@@SQUID_CPPUNIT_LIBS@" = "" ; then \
+       @if test "$(SQUID_CPPUNIT_INC)$(SQUID_CPPUNIT_LA)$(SQUID_CPPUNIT_LIBS)" = "" ; then \
                echo "FATAL: 'make check' requires cppunit and cppunit development packages. They do not appear to be installed." ; \
                exit 1 ; \
        fi

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 82326f1961bf4d97e7105d2bb8281edb68ae40f0..4d4f697c293d33390a9ccce0a4666b1e4b88a778 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -49,7 +49,7 @@ testPreCompiler_SOURCES= \
        testPreCompiler.h \
        testPreCompiler.cc \
        $(top_srcdir)/src/tests/testMain.cc
-testPreCompiler_LDADD= @SQUID_CPPUNIT_LA@ @SQUID_CPPUNIT_LIBS@
+testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
 testPreCompiler_LDFLAGS=
 
 # os/ subdir prevents us using src/TestHeaders.am

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index 9c3eda7de0c153eaecef354ca89d1e9257b8f79f..8a25f6b87d323c59e374a974cf1ded2d8e78d007 100644 (file)
--- a/helpers/basic_auth/LDAP/Makefile.am
+++ b/helpers/basic_auth/LDAP/Makefile.am
@@ -7,5 +7,5 @@ basic_ldap_auth_SOURCES = basic_ldap_auth.cc
 
 LDADD = \
        $(COMPAT_LIB) \
-       @LDAPLIB@ \
-       @LBERLIB@
+       $(LDAPLIB) \
+       $(LBERLIB)

diff --git a/helpers/basic_auth/Makefile.am b/helpers/basic_auth/Makefile.am
index 2a5e09e9196dd557d98e4ba26f9f9163f6f321f0..939df4b1fb4130a5c148f193178014f7bfc048ce 100644 (file)
--- a/helpers/basic_auth/Makefile.am
+++ b/helpers/basic_auth/Makefile.am
@@ -14,4 +14,4 @@ DIST_SUBDIRS = \
        SMB \
        YP
 
-SUBDIRS        = @BASIC_AUTH_HELPERS@
+SUBDIRS        = $(BASIC_AUTH_HELPERS)

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index ba5db5116f6a6ef61dfe818f85d95699e925a86f..89c83855e1f32a1eee5a86ad207072d1facc9819 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.am
+++ b/helpers/basic_auth/NCSA/Makefile.am
@@ -6,7 +6,7 @@ man_MANS                = basic_ncsa_auth.8
 EXTRA_DIST             = basic_ncsa_auth.8
 LDADD = \
        $(COMPAT_LIB) \
-       @CRYPTLIB@ \
+       $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)
 

diff --git a/helpers/digest_auth/Makefile.am b/helpers/digest_auth/Makefile.am
index a5a3615dc36eb76ec2a1f5c5bc8f7d6d500a5406..062cef190b5c5447e57e350d5d5a04850481a27e 100644 (file)
--- a/helpers/digest_auth/Makefile.am
+++ b/helpers/digest_auth/Makefile.am
@@ -4,4 +4,4 @@
 #
 
 DIST_SUBDIRS   = password ldap eDirectory
-SUBDIRS                = @DIGEST_AUTH_HELPERS@
+SUBDIRS                = $(DIGEST_AUTH_HELPERS)

diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am
index ce63875874c58da4a6902c3cefe105847e7f3767..2230d50466f73e6028e5e4875cfdc482c6efc593 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -23,8 +23,8 @@ digest_edir_auth_SOURCES = digest_pw_auth.c \
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
-       @LDAPLIB@ \
-       @LBERLIB@ \
+       $(LDAPLIB) \
+       $(LBERLIB) \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)

diff --git a/helpers/digest_auth/ldap/Makefile.am b/helpers/digest_auth/ldap/Makefile.am
index c306ffb25d909a0ef60a1cb387a57a7938c96f2a..8c2751bc31eb3ada34493c864c925252f56a3342 100644 (file)
--- a/helpers/digest_auth/ldap/Makefile.am
+++ b/helpers/digest_auth/ldap/Makefile.am
@@ -21,8 +21,8 @@ digest_ldap_auth_SOURCES = digest_pw_auth.c \
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
-       @LDAPLIB@ \
-       @LBERLIB@ \
+       $(LDAPLIB) \
+       $(LBERLIB) \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \
        $(SSLLIB)

diff --git a/helpers/external_acl/Makefile.am b/helpers/external_acl/Makefile.am
index 55acde885fa6af2a27565e152adb654511c16a77..4b0217adc1a9bc897a2d5c1e0bccf6fe18a1ebdc 100644 (file)
--- a/helpers/external_acl/Makefile.am
+++ b/helpers/external_acl/Makefile.am
@@ -4,4 +4,4 @@
 #
 
 DIST_SUBDIRS   = ip_user ldap_group mswin_ad_group mswin_lm_group session unix_group wbinfo_group
-SUBDIRS                = @EXTERNAL_ACL_HELPERS@
+SUBDIRS                = $(EXTERNAL_ACL_HELPERS)

diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am
index 7361cb4aaa0e4a72a2b69a864e919fa5bd0cf08d..035056874a376fa09449afb06e206855c8ee3057 100644 (file)
--- a/helpers/external_acl/ip_user/Makefile.am
+++ b/helpers/external_acl/ip_user/Makefile.am
@@ -29,4 +29,4 @@ EXTRA_DIST = \
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
-       @XTRA_LIBS@
+       $(XTRA_LIBS)

diff --git a/helpers/external_acl/ldap_group/Makefile.am b/helpers/external_acl/ldap_group/Makefile.am
index 08c2fc84e66c172a54b9147a468cf674cda83ba4..3eeedc12184d492211fc4754a56ab9c3652ca3b0 100644 (file)
--- a/helpers/external_acl/ldap_group/Makefile.am
+++ b/helpers/external_acl/ldap_group/Makefile.am
@@ -20,6 +20,6 @@ squid_ldap_group_SOURCES      = squid_ldap_group.c
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
-       @LDAPLIB@ \
-       @LBERLIB@ \
-       @XTRA_LIBS@
+       $(LDAPLIB) \
+       $(LBERLIB) \
+       $(XTRA_LIBS)

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index 2a1aea0c123bde8c420a01826875b6ddfd38608e..e725cff2e7dbc0aea00da28abb9f12ec21b74a65 100644 (file)
--- a/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@ -19,4 +19,4 @@ squid_session_SOURCES         = squid_session.c
 
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
-       @LIB_DB@
+       $(LIB_DB)

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
index bbecef2ffefc72b9596bf1646a7f5de82c8ce5ab..dbb612bb4f3d1adcd6a307460309c6c74d6c51c9 100644 (file)
--- a/helpers/external_acl/unix_group/Makefile.am
+++ b/helpers/external_acl/unix_group/Makefile.am
@@ -20,4 +20,4 @@ squid_unix_group_SOURCES      = check_group.c
 LDADD = \
        $(top_builddir)/compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
-       @XTRA_LIBS@
+       $(XTRA_LIBS)

diff --git a/helpers/negotiate_auth/Makefile.am b/helpers/negotiate_auth/Makefile.am
index d636c7142c57011185bdc058a443641ff18cea15..8b6c10e991d28621fedf6806d378947aa1f780e9 100644 (file)
--- a/helpers/negotiate_auth/Makefile.am
+++ b/helpers/negotiate_auth/Makefile.am
@@ -1,3 +1,3 @@
 
 DIST_SUBDIRS   = mswin_sspi kerberos
-SUBDIRS                = @NEGOTIATE_AUTH_HELPERS@
+SUBDIRS                = $(NEGOTIATE_AUTH_HELPERS)

diff --git a/helpers/negotiate_auth/kerberos/Makefile.am b/helpers/negotiate_auth/kerberos/Makefile.am
index 8c8f2011b5b2ad99151dc741f5fcf8137c8f4d9e..5ad1cf2832aca0c2b53a159fa6ea84ceb7177b67 100644 (file)
--- a/helpers/negotiate_auth/kerberos/Makefile.am
+++ b/helpers/negotiate_auth/kerberos/Makefile.am
@@ -24,6 +24,6 @@ negotiate_kerberos_auth_test_SOURCES = $(SOURCE_test)
 
 
 negotiate_kerberos_auth_LDFLAGS = 
-negotiate_kerberos_auth_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) @KRB5LIBS@
+negotiate_kerberos_auth_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) $(KRB5LIBS)
 negotiate_kerberos_auth_test_LDFLAGS = 
-negotiate_kerberos_auth_test_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) @KRB5LIBS@
+negotiate_kerberos_auth_test_LDADD = $(COMPAT_LIB) $(XTRA_LIBS) $(KRB5LIBS)

diff --git a/helpers/ntlm_auth/Makefile.am b/helpers/ntlm_auth/Makefile.am
index 31ea55ed6a3b942dc12ae5135c7c05d41ce32e37..7635efb48612f4cff65190c3c3db9e75bc3c51d0 100644 (file)
--- a/helpers/ntlm_auth/Makefile.am
+++ b/helpers/ntlm_auth/Makefile.am
@@ -4,4 +4,4 @@
 #
 
 DIST_SUBDIRS   = fakeauth no_check smb_lm mswin_sspi
-SUBDIRS                = @NTLM_AUTH_HELPERS@
+SUBDIRS                = $(NTLM_AUTH_HELPERS)

diff --git a/helpers/url_rewrite/Makefile.am b/helpers/url_rewrite/Makefile.am
index f439bcb2bc2cf0e62af621bd618d4e5455b845dd..be60b320dcd2558d33251061ac80fbc6467d5f7f 100644 (file)
--- a/helpers/url_rewrite/Makefile.am
+++ b/helpers/url_rewrite/Makefile.am
@@ -1,3 +1,3 @@
 
 DIST_SUBDIRS   = fake
-SUBDIRS                = @URL_REWRITE_HELPERS@
+SUBDIRS                = $(URL_REWRITE_HELPERS)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 444b10dd35bb8f42f85b265cd1723d005d9078d2..c6372e678641a65159b091986634b938f8216eee 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -76,18 +76,18 @@ libmiscutil_a_SOURCES = \
        xusleep.c \
        $(XPROF_STATS_SOURCE) \
        $(WIN32SRC)
-libmiscutil_a_LIBADD = @LIBOBJS@
+libmiscutil_a_LIBADD = $(LIBOBJS)
 
 # $(top_srcdir)/include/version.h should be a dependency
 libntlmauth_a_SOURCES = \
        ntlmauth.c
 libntlmauth_a_LIBADD = \
-       @LIBOBJS@
+       $(LIBOBJS)
 libsspwin32_a_SOURCES = \
        base64.c \
        sspwin32.c
 libsspwin32_a_LIBADD = \
-       @LIBOBJS@
+       $(LIBOBJS)
 
 
 TESTS += tests/testAll
@@ -106,7 +106,7 @@ tests_testAll_SOURCES= \
        $(WIN32SRC) \
        util.c
 
-tests_testAll_LDADD= @SQUID_CPPUNIT_LA@ @SQUID_CPPUNIT_LIBS@
+tests_testAll_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
 
 tests_testAll_LDFLAGS = $(LIBADD_DL)
 

diff --git a/lib/libTrie/src/Makefile.am b/lib/libTrie/src/Makefile.am
index 0fed01f36f5819ee4074f7f929965d6d74d29474..34a02a8699f8fc4ead34ac3975b19631b0c2a358 100644 (file)
--- a/lib/libTrie/src/Makefile.am
+++ b/lib/libTrie/src/Makefile.am
@@ -1,8 +1,8 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
-AM_CFLAGS = @TRIE_CFLAGS@
-AM_CXXFLAGS = @TRIE_CXXFLAGS@
+AM_CFLAGS = $(TRIE_CFLAGS)
+AM_CXXFLAGS = $(TRIE_CXXFLAGS)
 
 noinst_LIBRARIES = libTrie.a
 

diff --git a/lib/libTrie/test/Makefile.am b/lib/libTrie/test/Makefile.am
index 45f88fea5839504b26a18b465a44b699c5837480..a396987f49bd8539719daecc3f08feec7418fe03 100644 (file)
--- a/lib/libTrie/test/Makefile.am
+++ b/lib/libTrie/test/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/include
 
-AM_CFLAGS = @TRIE_CFLAGS@
-AM_CXXFLAGS = @TRIE_CXXFLAGS@
+AM_CFLAGS = $(TRIE_CFLAGS)
+AM_CXXFLAGS = $(TRIE_CXXFLAGS)
 
 TESTS = trie trie-c
 

diff --git a/snmplib/Makefile.am b/snmplib/Makefile.am
index 30d2512aeaa3b15d24e8c143e54f7d09e623518c..027d617b197606b78a7ddaf50631052a5df4b160 100644 (file)
--- a/snmplib/Makefile.am
+++ b/snmplib/Makefile.am
@@ -2,8 +2,8 @@
 ##
 ## Makefile for libsnmp.
 ## 
-AM_CFLAGS = @SQUID_CFLAGS@
-AM_CXXFLAGS = @SQUID_CXXFLAGS@
+AM_CFLAGS = $(SQUID_CFLAGS)
+AM_CXXFLAGS = $(SQUID_CXXFLAGS)
 noinst_LIBRARIES = libsnmp.a
 libsnmp_a_SOURCES  = asn1.c parse.c snmp_vars.c \
        coexistance.c snmp_api.c snmp_error.c  \

diff --git a/src/Makefile.am b/src/Makefile.am
index 415b0eb69ffc3692a7d4178c5ae1884ff351faa0..916e8e1e8ea6d0017839066963edf78e5ccfd15d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,8 +46,8 @@ ESI_LOCAL_LIBS = \
        esi/libesi.la \
        $(top_builddir)/lib/libTrie/src/libTrie.a
 ESI_LIBS = $(ESI_LOCAL_LIBS) \
-       @XMLLIB@ \
-       @EXPATLIB@
+       $(XMLLIB) \
+       $(EXPATLIB)
 else
 ESI_LIBS = 
 endif
@@ -149,7 +149,7 @@ AIOPS_SOURCE = DiskIO/DiskThreads/aiops.cc
 endif
 
 EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
-noinst_LIBRARIES = @DISK_LIBS@
+noinst_LIBRARIES = $(DISK_LIBS)
 noinst_LTLIBRARIES = libsquid.la
 
 # libraries used by many targets
@@ -193,16 +193,16 @@ bin_PROGRAMS =
 
 libexec_PROGRAMS = \
        $(DNSSERVER) \
-       @DISK_PROGRAMS@ \
+       $(DISK_PROGRAMS) \
        $(UNLINKD)
 
 cf_gen_SOURCES = cf_gen.cc
 nodist_cf_gen_HEADER = cf_gen_defines.h
 cf_gen_LDADD= \
        $(COMPAT_LIB) \
-       @EPOLL_LIBS@ \
-       @MINGW_LIBS@ \
-       @XTRA_LIBS@
+       $(EPOLL_LIBS) \
+       $(MINGW_LIBS) \
+       $(XTRA_LIBS)
 cf_gen.$(OBJEXT): cf_gen_defines.h
 
 ## cf_gen.cc needs src/cf_gen_defines.h
@@ -534,27 +534,27 @@ squid_LDADD = \
        $(COMMON_LIBS) \
        eui/libeui.la \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @XTRA_OBJS@ \
-       @DISK_LINKOBJS@ \
-       @REPL_OBJS@ \
-       @DISK_LIBS@ \
-       @DISK_OS_LIBS@ \
-       @CRYPTLIB@ \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
+       $(XTRA_OBJS) \
+       $(DISK_LINKOBJS) \
+       $(REPL_OBJS) \
+       $(DISK_LIBS) \
+       $(DISK_OS_LIBS) \
+       $(CRYPTLIB) \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
        $(COMPAT_LIB) \
-       @SSLLIB@ \
-       @EPOLL_LIBS@ \
-       @MINGW_LIBS@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SSLLIB) \
+       $(EPOLL_LIBS) \
+       $(MINGW_LIBS) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @DISK_LIBS@ \
-       @DISK_LINKOBJS@ \
-       @REPL_OBJS@ \
-       @SNMPLIB@ \
+       $(DISK_LIBS) \
+       $(DISK_LINKOBJS) \
+       $(REPL_OBJS) \
+       $(SNMPLIB) \
        ${ADAPTATION_LIBS} \
        $(ESI_LOCAL_LIBS) \
        $(COMMON_LIBS)
@@ -562,7 +562,7 @@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
 if USE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
 squid_LDADD += \
-       @LIBLTDL@
+       $(LIBLTDL)
 squid_LDFLAGS = \
        -export-dynamic -dlopen force
 # when static module linking is supported and enabled:
@@ -572,7 +572,7 @@ squid_LDFLAGS = \
 endif
 
 ## Kerberos libraries require their include path...
-INCLUDES += @KRB5INCS@
+INCLUDES += $(KRB5INCS)
 
 
 unlinkd_SOURCES = unlinkd_daemon.cc SquidNew.cc
@@ -629,21 +629,21 @@ ufsdump_SOURCES = \
        tests/stub_fd.cc
 ufsdump_LDADD = \
        $(COMMON_LIBS) \
-       @XTRA_OBJS@ \
-       @REPL_OBJS@ \
-       @CRYPTLIB@ \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
-       @SSLLIB@ \
+       $(XTRA_OBJS) \
+       $(REPL_OBJS) \
+       $(CRYPTLIB) \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
+       $(SSLLIB) \
        -L$(top_builddir)/lib -lmiscutil \
-       @EPOLL_LIBS@ \
-       @MINGW_LIBS@ \
-       @XTRA_LIBS@
+       $(EPOLL_LIBS) \
+       $(MINGW_LIBS) \
+       $(XTRA_LIBS)
 ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        $(COMMON_LIBS) \
-       @DISK_LIBS@ \
-       @DISK_LINKOBJS@ \
-       @REPL_OBJS@
+       $(DISK_LIBS) \
+       $(DISK_LINKOBJS) \
+       $(REPL_OBJS)
 
 nodist_ufsdump_SOURCES = \
        globals.cc
@@ -659,9 +659,9 @@ data_DATA = \
 LDADD = $(COMMON_LIBS)\
        -L../lib \
        -lmiscutil \
-       @EPOLL_LIBS@ \
-       @MINGW_LIBS@ \
-       @XTRA_LIBS@
+       $(EPOLL_LIBS) \
+       $(MINGW_LIBS) \
+       $(XTRA_LIBS)
 
 EXTRA_DIST = \
        cf_gen_defines \
@@ -715,21 +715,21 @@ libDiskThreads_a_SOURCES = \
                DiskIO/DiskThreads/DiskThreadsIOStrategy.h
 
 DiskIO_DiskDaemon_diskd_SOURCES = DiskIO/DiskDaemon/diskd.cc 
-DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@
+DiskIO_DiskDaemon_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a $(XTRA_LIBS)
 
 
-DEFAULT_HTTP_PORT      = @CACHE_HTTP_PORT@
-DEFAULT_ICP_PORT       = @CACHE_ICP_PORT@
+DEFAULT_HTTP_PORT      = $(CACHE_HTTP_PORT)
+DEFAULT_ICP_PORT       = $(CACHE_ICP_PORT)
 DEFAULT_PREFIX         = $(prefix)
 DEFAULT_CONFIG_DIR     = $(sysconfdir)
 DEFAULT_CONFIG_FILE     = $(DEFAULT_CONFIG_DIR)/squid.conf
 DEFAULT_MIME_TABLE     = $(DEFAULT_CONFIG_DIR)/mime.conf
 DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
-DEFAULT_LOG_PREFIX     = @DEFAULT_LOG_DIR@
+DEFAULT_LOG_PREFIX     = $(DEFAULT_LOG_DIR)
 DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE        = @DEFAULT_PIDFILE@
+DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
 DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
 DEFAULT_SWAP_DIR        = $(localstatedir)/cache
 DEFAULT_PINGER         = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -737,7 +737,7 @@ DEFAULT_UNLINKD             = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT
 DEFAULT_DISKD          = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors
-DEFAULT_HOSTS          = @OPT_DEFAULT_HOSTS@
+DEFAULT_HOSTS          = $(OPT_DEFAULT_HOSTS)
 
 # Make location configure settings available to the code
 DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
@@ -871,7 +871,7 @@ check_PROGRAMS+= tests/testAuth \
        tests/testStore \
        tests/testString \
        tests/testURL \
-       @STORE_TESTS@
+       $(STORE_TESTS)
 
 ## NP: required to run the above list. check_PROGRAMS only builds the binaries...
 TESTS += $(check_PROGRAMS)
@@ -893,10 +893,10 @@ TESTS += $(check_PROGRAMS)
 #      $(TESTSOURCES)
 #tests_testX_LDFLAGS = $(LIBADD_DL)
 #tests_testX_LDADD=\
-#      @SQUID_CPPUNIT_LIBS@ \
-#      @SQUID_CPPUNIT_LA@ \
+#      $(SQUID_CPPUNIT_LIBS) \
+#      $(SQUID_CPPUNIT_LA) \
 #      -L../lib -lmiscutil
-#tests_testX_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
+#tests_testX_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \
 #      $(top_builddir)/lib/libmiscutil.a
 
 
@@ -948,11 +948,11 @@ tests_testHttpReply_LDADD=\
        acl/libstate.la \
        auth/libauth.la \
        ip/libip.la \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
        -L../lib -lmiscutil \
-       @XTRA_LIBS@
-tests_testHttpReply_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
+       $(XTRA_LIBS)
+tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \
        $(top_builddir)/lib/libmiscutil.a
 
 tests_testAuth_SOURCES = \
@@ -988,13 +988,13 @@ nodist_tests_testAuth_SOURCES = \
 tests_testAuth_LDADD= \
        $(COMMON_LIBS) \
        -L../lib -lmiscutil \
-       @REGEXLIB@ \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testAuth_LDFLAGS = $(LIBADD_DL)
 tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 ## Tests for the ACLMaxUserIP class
 ## acl needs wordlist. wordlist needs MemBug
@@ -1051,13 +1051,13 @@ nodist_tests_testACLMaxUserIP_SOURCES= \
 tests_testACLMaxUserIP_LDADD= \
        $(COMMON_LIBS) \
        -L../lib -lmiscutil \
-       @REGEXLIB@ \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
 tests_testACLMaxUserIP_DEPENDENCIES = \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 ## a demonstration test that does nothing but shows the salient points
 ## involved in writing tests.
@@ -1070,12 +1070,12 @@ nodist_tests_testBoilerplate_SOURCES = \
        $(TESTSOURCES)
 tests_testBoilerplate_LDADD= \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
 tests_testBoilerplate_DEPENDENCIES = \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 ## Tests of the CacheManager module.
 tests_testCacheManager_SOURCES = \
@@ -1208,21 +1208,21 @@ nodist_tests_testCacheManager_SOURCES = \
 tests_testCacheManager_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @REPL_OBJS@ \
+       $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SSLLIB) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
 tests_testCacheManager_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
-       @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@
+       $(REPL_OBJS) \
+       $(SQUID_CPPUNIT_LA)
 
 tests_testDiskIO_SOURCES = \
        $(SWAP_TEST_SOURCES) \
@@ -1235,17 +1235,17 @@ nodist_tests_testDiskIO_SOURCES= \
        swap_log_op.cc
 tests_testDiskIO_LDADD = \
        $(SWAP_TEST_LDADD) \
-       @DISK_LIBS@ \
-       @DISK_OS_LIBS@ \
+       $(DISK_LIBS) \
+       $(DISK_OS_LIBS) \
        $(COMMON_LIBS) \
        SquidConfig.o \
-       @XTRA_LIBS@
+       $(XTRA_LIBS)
 
 tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
 tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @DISK_LIBS@ \
+       $(DISK_LIBS) \
        $(SWAP_TEST_DS) \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 ## Tests of the Even module.
 tests_testEvent_SOURCES = \
@@ -1381,21 +1381,21 @@ nodist_tests_testEvent_SOURCES = \
 tests_testEvent_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @REPL_OBJS@ \
+       $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SSLLIB) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
 tests_testEvent_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
-       @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@
+       $(REPL_OBJS) \
+       $(SQUID_CPPUNIT_LA)
 
 ## Tests of the EventLoop module.
 tests_testEventLoop_SOURCES = \
@@ -1530,21 +1530,21 @@ nodist_tests_testEventLoop_SOURCES = \
 tests_testEventLoop_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @REPL_OBJS@ \
+       $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SSLLIB) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
 tests_testEventLoop_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
-       @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@
+       $(REPL_OBJS) \
+       $(SQUID_CPPUNIT_LA)
 
 tests_test_http_range_SOURCES = \
        tests/test_http_range.cc \
@@ -1674,20 +1674,20 @@ nodist_tests_test_http_range_SOURCES = \
 tests_test_http_range_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @REPL_OBJS@ \
+       $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SSLLIB) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 tests_test_http_range_LDFLAGS = $(LIBADD_DL)
 tests_test_http_range_DEPENDENCIES = \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 
 ## Tests of the HttpRequest module.
@@ -1823,21 +1823,21 @@ nodist_tests_testHttpRequest_SOURCES = \
 tests_testHttpRequest_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @REPL_OBJS@ \
+       $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       @REGEXLIB@ \
-       @SNMPLIB@ \
+       $(REGEXLIB) \
+       $(SNMPLIB) \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SSLLIB) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
 tests_testHttpRequest_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
-       @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@
+       $(REPL_OBJS) \
+       $(SQUID_CPPUNIT_LA)
 
 # TODO:mime.cc drags in HttpReply.cc
 # delay pools need client_side_request.cc
@@ -1908,13 +1908,13 @@ nodist_tests_testStore_SOURCES= \
 tests_testStore_LDADD= \
        $(COMMON_LIBS) \
        -L../lib -lmiscutil \
-       @REGEXLIB@ \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testStore_LDFLAGS = $(LIBADD_DL)
 tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 ## string needs mem.cc.
 ## mem.cc needs ClientInfo.h
@@ -1933,13 +1933,13 @@ nodist_tests_testString_SOURCES = \
 tests_testString_LDADD = \
        $(COMMON_LIBS) \
        -L../lib -lmiscutil \
-       @REGEXLIB@ \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testString_LDFLAGS = $(LIBADD_DL)
 tests_testString_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @SQUID_CPPUNIT_LA@
+       $(SQUID_CPPUNIT_LA)
 
 SWAP_TEST_SOURCES = \
        tests/stub_internal.cc \
@@ -1977,22 +1977,22 @@ SWAP_TEST_GEN_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 
 SWAP_TEST_LDADD = \
-       @REGEXLIB@ \
+       $(REGEXLIB) \
        $(COMMON_LIBS) \
-       @REPL_OBJS@ \
-       @DISK_LIBS@ \
-       @DISK_OS_LIBS@ \
+       $(REPL_OBJS) \
+       $(DISK_LIBS) \
+       $(DISK_OS_LIBS) \
        -L../lib -lmiscutil \
        acl/libapi.la \
-       @SQUID_CPPUNIT_LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(XTRA_LIBS)
 SWAP_TEST_DS =\
        $(top_builddir)/lib/libmiscutil.a \
        repl_modules.o \
-       @DISK_LIBS@ \
+       $(DISK_LIBS) \
        $(COMMON_LIBS) \
-       @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@
+       $(REPL_OBJS) \
+       $(SQUID_CPPUNIT_LA)
 
 tests_testUfs_SOURCES = \
        tests/testUfs.cc \
@@ -2006,8 +2006,8 @@ nodist_tests_testUfs_SOURCES = \
 tests_testUfs_LDADD = \
        $(SWAP_TEST_LDADD) \
        $(COMMON_LIBS) \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testUfs_LDFLAGS = $(LIBADD_DL)
 tests_testUfs_DEPENDENCIES = \
        $(SWAP_TEST_DS)
@@ -2023,8 +2023,8 @@ nodist_tests_testCoss_SOURCES = \
 tests_testCoss_LDADD = \
        libsquid.la \
        $(SWAP_TEST_LDADD) \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testCoss_LDFLAGS = $(LIBADD_DL)
 tests_testCoss_DEPENDENCIES = \
        $(SWAP_TEST_DS)
@@ -2038,8 +2038,8 @@ nodist_tests_testNull_SOURCES = \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testNull_LDADD = \
        $(SWAP_TEST_LDADD) \
-       @SSLLIB@ \
-       @XTRA_LIBS@
+       $(SSLLIB) \
+       $(XTRA_LIBS)
 tests_testNull_LDFLAGS = $(LIBADD_DL)
 tests_testNull_DEPENDENCIES = \
        $(SWAP_TEST_DS)
@@ -2178,21 +2178,21 @@ nodist_tests_testURL_SOURCES = \
 tests_testURL_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
-       @REGEXLIB@ \
-       @REPL_OBJS@ \
+       $(REGEXLIB) \
+       $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       @SNMPLIB@ \
+       $(SNMPLIB) \
        -L../lib -lmiscutil \
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       @SSLLIB@ \
-       @KRB5LIBS@ \
-       @XTRA_LIBS@
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SSLLIB) \
+       $(KRB5LIBS) \
+       $(XTRA_LIBS)
 tests_testURL_LDFLAGS = $(LIBADD_DL)
 tests_testURL_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
-       @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@
+       $(REPL_OBJS) \
+       $(SQUID_CPPUNIT_LA)
 
 
 TESTS += testHeaders

diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am
index 7d1b3952c30d65f762a15e23c20801fb866422be..5ecd433aec03fc96ec6361aaee7ed44f379ecd9b 100644 (file)
--- a/src/adaptation/Makefile.am
+++ b/src/adaptation/Makefile.am
@@ -45,6 +45,6 @@ libadaptation_la_SOURCES = \
        History.h 
 
 # add libraries for specific adaptation schemes
-libadaptation_la_LIBADD = @ECAP_LIBS@ @ECAPLIB@ @ICAP_LIBS@
+libadaptation_la_LIBADD = $(ECAP_LIBS) $(ECAPLIB) $(ICAP_LIBS)
 
-libadaptation_la_DEPENDENCIES = @ECAP_LIBS@ @ICAP_LIBS@
+libadaptation_la_DEPENDENCIES = $(ECAP_LIBS) $(ICAP_LIBS)

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index d1ac796877a8e07df082f79e583967d43a37a15c..9912440df3afc411e8797b45c517f9e447299878 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/Common.am
 ## we need our local files too (but avoid -I. at all costs)
 INCLUDES += -I$(srcdir)
 
-noinst_LTLIBRARIES = libauth.la libacls.la @AUTH_LIBS_TO_BUILD@
+noinst_LTLIBRARIES = libauth.la libacls.la $(AUTH_LIBS_TO_BUILD)
 EXTRA_LTLIBRARIES = libbasic.la libdigest.la libntlm.la libnegotiate.la
 
 ## authentication framework; this library is always built
@@ -20,8 +20,8 @@ libauth_la_SOURCES = \
        Gadgets.cc \
        Gadgets.h
 
-libauth_la_LIBADD = @AUTH_LIBS_TO_BUILD@
-libauth_la_DEPENDENCIES = @AUTH_LIBS_TO_BUILD@
+libauth_la_LIBADD = $(AUTH_LIBS_TO_BUILD)
+libauth_la_DEPENDENCIES = $(AUTH_LIBS_TO_BUILD)
 
 ## authentication-dependent ACLs and authentication code they share
 libacls_la_SOURCES = \

diff --git a/src/eui/Makefile.am b/src/eui/Makefile.am
index 39ea2af322ed0e6fb21ea7ddac1d337e3ebb4d36..8244b57a1feb27e635475dce19f18b234981ee3c 100644 (file)
--- a/src/eui/Makefile.am
+++ b/src/eui/Makefile.am
@@ -11,4 +11,4 @@ libeui_la_SOURCES = \
        Eui64.h \
        Eui64.cc
 
-libeui_la_LIBADD = @EUILIB@
+libeui_la_LIBADD = $(EUILIB)

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 85c86fbd64c3359c62feb88794d9ebfbc5883671..51171216a22ed57477ac4d6676c0d26002e403e8 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,7 +1,7 @@
 include $(top_srcdir)/src/Common.am
 
 EXTRA_LTLIBRARIES = libaufs.la libdiskd.la libcoss.la libufs.la
-noinst_LTLIBRARIES =  @STORE_LIBS_TO_BUILD@ libfs.la
+noinst_LTLIBRARIES =  $(STORE_LIBS_TO_BUILD) libfs.la
 
 # aufs is a "fake" legacy store
 libaufs_la_SOURCES = \
@@ -29,8 +29,8 @@ libufs_la_SOURCES = \
        ufs/ufscommon.h 
 
 libfs_la_SOURCES = Module.cc Module.h
-libfs_la_LIBADD =  @STORE_LIBS_TO_BUILD@
-libfs_la_DEPENDENCIES = @STORE_LIBS_TO_BUILD@
+libfs_la_LIBADD =  $(STORE_LIBS_TO_BUILD)
+libfs_la_DEPENDENCIES = $(STORE_LIBS_TO_BUILD)
 
 EXTRA_DIST = \
        coss/coss-notes.txt

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 87e40b6f8dece74cc40831d6be05c1eaa0763a5c..7974864038c34cab6f60a66676dd13e94e83969d 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -61,7 +61,7 @@ pinger_LDFLAGS = $(LIBADD_DL)
 pinger_LDADD=\
        libicmp-core.la \
        ../ip/libip.la \
-       @XTRA_LIBS@ \
+       $(XTRA_LIBS) \
        $(top_builddir)/lib/libmiscutil.a
 pinger_DEPENDENCIES= \
        libicmp-core.la \
@@ -100,12 +100,12 @@ nodist_testIcmp_SOURCES = \
        $(top_builddir)/src/globals.cc
 testIcmp_LDFLAGS = $(LIBADD_DL)
 testIcmp_LDADD=\
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
        libicmp-core.la \
        ../ip/libip.la \
-       @XTRA_LIBS@ \
+       $(XTRA_LIBS) \
        $(top_builddir)/lib/libmiscutil.a
-testIcmp_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
+testIcmp_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \
        libicmp-core.la \
        $(top_builddir)/lib/libmiscutil.a

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 888b57ef4cc2fbb9bc52fd56b1d7bca32ef14505..d8a48540631e8382f38184832e1e27190655c412 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -22,8 +22,8 @@ nodist_testIpAddress_SOURCES= \
        ../tests/testMain.cc
 testIpAddress_LDADD= \
        libip.la \
-       @XTRA_LIBS@ \
+       $(XTRA_LIBS) \
        $(COMPAT_LIB) \
-       @SQUID_CPPUNIT_LA@ \
-       @SQUID_CPPUNIT_LIBS@
+       $(SQUID_CPPUNIT_LA) \
+       $(SQUID_CPPUNIT_LIBS)
 testIpAddress_LDFLAGS= $(LIBADD_DL)

diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am
index 9fe09a5692145a8b04591312d30e72a4b37bb783..65bb5a2667404c6ac85b968024de95f2d74606fa 100644 (file)
--- a/src/repl/Makefile.am
+++ b/src/repl/Makefile.am
@@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # No recursion is needed for the subdirs, we build from here.
 
 EXTRA_LIBRARIES = liblru.a libheap.a
-noinst_LIBRARIES = @REPL_LIBS@
+noinst_LIBRARIES = $(REPL_LIBS)
 
 liblru_a_SOURCES = lru/store_repl_lru.cc
 libheap_a_SOURCES = heap/store_heap_replacement.h heap/store_heap_replacement.cc heap/store_repl_heap.cc