From: Amos Jeffries Date: Sat, 21 Nov 2009 01:16:17 +0000 (-0700) Subject: Author: Automatic source maintenance X-Git-Tag: SQUID_3_1_0_15~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e3ab14a9f4867126516df1cba47bf5a43c1c6df;p=thirdparty%2Fsquid.git Author: Automatic source maintenance SourceFormat Enforcement --- diff --git a/Makefile.am b/Makefile.am index 3d5f3de59b..e1c34602d4 100644 --- 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 4fb54e595f..9ff0fc182e 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -47,7 +47,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/doc/Makefile.am b/doc/Makefile.am index f3f93fb516..1209c64c97 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,10 +12,10 @@ DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf DEFAULT_ERROR_DIR = $(datadir)/errors SUBSTITUTE=sed "\ - s%@DEFAULT_CONFIG_FILE@%$(DEFAULT_CONFIG_FILE)%g;\ - s%@DEFAULT_CACHEMGR_CONFIG@%$(DEFAULT_CACHEMGR_CONFIG)%g;\ - s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + s%$(DEFAULT_CONFIG_FILE)%$(DEFAULT_CONFIG_FILE)%g;\ + s%$(DEFAULT_CACHEMGR_CONFIG)%$(DEFAULT_CACHEMGR_CONFIG)%g;\ + s%$(DEFAULT_ERROR_DIR)%$(DEFAULT_ERROR_DIR)%g;\ + s%$(DEFAULT_MIME_TABLE)%$(DEFAULT_MIME_TABLE)%g;\ s%@""PACKAGE_STRING""@%$(PACKAGE_STRING)%g;\ " diff --git a/helpers/basic_auth/Makefile.am b/helpers/basic_auth/Makefile.am index 742720e7f2..5d7e9759d7 100644 --- a/helpers/basic_auth/Makefile.am +++ b/helpers/basic_auth/Makefile.am @@ -4,4 +4,4 @@ # DIST_SUBDIRS = getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM SMB YP SASL mswin_sspi POP3 DB squid_radius_auth -SUBDIRS = @BASIC_AUTH_HELPERS@ +SUBDIRS = $(BASIC_AUTH_HELPERS) diff --git a/helpers/digest_auth/Makefile.am b/helpers/digest_auth/Makefile.am index a5a3615dc3..062cef190b 100644 --- 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/external_acl/Makefile.am b/helpers/external_acl/Makefile.am index 55acde885f..4b0217adc1 100644 --- 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 7361cb4aaa..035056874a 100644 --- 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 8ce92a39ce..fcaf332802 100644 --- a/helpers/external_acl/ldap_group/Makefile.am +++ b/helpers/external_acl/ldap_group/Makefile.am @@ -22,4 +22,4 @@ LDADD = \ -L$(top_builddir)/lib -lmiscutil \ $(LIB_LDAP) \ $(LIB_LBER) \ - @XTRA_LIBS@ + $(XTRA_LIBS) diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am index 2a1aea0c12..e725cff2e7 100644 --- 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 bbecef2ffe..dbb612bb4f 100644 --- 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 bc2f5ebe1f..84cb8f988f 100644 --- a/helpers/negotiate_auth/Makefile.am +++ b/helpers/negotiate_auth/Makefile.am @@ -4,4 +4,4 @@ # DIST_SUBDIRS = mswin_sspi squid_kerb_auth -SUBDIRS = @NEGOTIATE_AUTH_HELPERS@ +SUBDIRS = $(NEGOTIATE_AUTH_HELPERS) diff --git a/helpers/ntlm_auth/Makefile.am b/helpers/ntlm_auth/Makefile.am index 31ea55ed6a..7635efb486 100644 --- 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/lib/Makefile.am b/lib/Makefile.am index 444b10dd35..c6372e6786 100644 --- 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 0fed01f36f..34a02a8699 100644 --- 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 45f88fea58..a396987f49 100644 --- 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 30d2512aea..027d617b19 100644 --- 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 e5de0d1fb3..186e8bea4e 100644 --- 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 @@ -192,7 +192,7 @@ bin_PROGRAMS = libexec_PROGRAMS = \ $(DNSSERVER) \ - @DISK_PROGRAMS@ \ + $(DISK_PROGRAMS) \ $(UNLINKD) cf_gen_SOURCES = cf_gen.cc @@ -200,9 +200,9 @@ nodist_cf_gen_HEADER = cf_gen_defines.h cf_gen_LDADD= \ ../compat/libcompat.la \ -L../lib -lmiscutil \ - @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 @@ -519,26 +519,26 @@ squid_LDADD = \ icmp/libicmp.la icmp/libicmp-core.la \ ../compat/libcompat.la \ -L../lib \ - @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) \ - @SSLLIB@ \ + $(SSLLIB) \ -lmiscutil \ - @EPOLL_LIBS@ \ - @MINGW_LIBS@ \ - @XTRA_LIBS@ + $(EPOLL_LIBS) \ + $(MINGW_LIBS) \ + $(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) @@ -546,7 +546,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: @@ -610,21 +610,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 @@ -647,9 +647,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 \ @@ -703,21 +703,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)/'` @@ -725,7 +725,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)\" @@ -843,7 +843,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) @@ -865,10 +865,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 @@ -920,11 +920,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 = \ @@ -960,13 +960,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 @@ -1023,13 +1023,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. @@ -1042,12 +1042,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 = \ @@ -1180,20 +1180,20 @@ 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@ \ - @XTRA_LIBS@ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SSLLIB) \ + $(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) \ @@ -1205,17 +1205,17 @@ nodist_tests_testDiskIO_SOURCES= \ $(SWAP_TEST_GEN_SOURCES) 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 = \ @@ -1351,20 +1351,20 @@ 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@ \ - @XTRA_LIBS@ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SSLLIB) \ + $(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 = \ @@ -1499,20 +1499,20 @@ 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@ \ - @XTRA_LIBS@ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SSLLIB) \ + $(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 \ @@ -1642,19 +1642,19 @@ 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@ \ - @XTRA_LIBS@ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SSLLIB) \ + $(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. @@ -1790,20 +1790,20 @@ 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@ \ - @XTRA_LIBS@ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SSLLIB) \ + $(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 @@ -1877,13 +1877,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 @@ -1902,13 +1902,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 \ @@ -1946,22 +1946,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 \ @@ -1974,8 +1974,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) @@ -1991,8 +1991,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) @@ -2006,8 +2006,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) @@ -2146,20 +2146,20 @@ 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@ \ - @XTRA_LIBS@ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SSLLIB) \ + $(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 7d1b3952c3..5ecd433aec 100644 --- 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 d1ac796877..9912440df3 100644 --- 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/fs/Makefile.am b/src/fs/Makefile.am index 85c86fbd64..51171216a2 100644 --- 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 9d9a2f0268..e7d1c49618 100644 --- 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@ \ - @XTRA_LIBS@ \ + $(SQUID_CPPUNIT_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(XTRA_LIBS) \ libicmp-core.la \ ../ip/libip.la \ $(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 ee83d8df1d..467b336ce5 100644 --- a/src/ip/Makefile.am +++ b/src/ip/Makefile.am @@ -24,7 +24,7 @@ testIpAddress_LDADD= \ $(top_builddir)/compat/libcompat.la \ libip.la \ -L$(top_builddir)/lib -lmiscutil \ - @XTRA_LIBS@ \ - @SQUID_CPPUNIT_LA@ \ - @SQUID_CPPUNIT_LIBS@ + $(XTRA_LIBS) \ + $(SQUID_CPPUNIT_LA) \ + $(SQUID_CPPUNIT_LIBS) testIpAddress_LDFLAGS= $(LIBADD_DL) diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am index 9fe09a5692..65bb5a2667 100644 --- 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