Merge form trunk

[thirdparty/squid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 236373d8f62d5cc35a653aa4b4084849327a0329..b1e843b22461346ae5e1c96e4225fd440d2ad0b3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,11 @@ DNSSOURCE += \
        DnsLookupDetails.h \
        DnsLookupDetails.cc
 
+SBUF_SOURCE= \
+       base/InstanceId.h \
+       MemBlob.h \
+       MemBlob.cc
+
 SNMP_ALL_SOURCE = \
        snmp_core.cc \
        snmp_agent.cc
@@ -34,7 +39,7 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h \
        LoadableModules.cc
 
-SUBDIRS        = base comm eui acl fs repl auth ip icmp ident log ipc
+SUBDIRS        = base comm eui acl fs repl auth ip icmp ident log ipc mgr
 
 if USE_ADAPTATION
 SUBDIRS += adaptation
@@ -75,7 +80,10 @@ DELAY_POOL_ALL_SOURCE = \
        DelayVector.cc \
        DelayVector.h \
        NullDelayId.cc \
-       NullDelayId.h
+       NullDelayId.h \
+       ClientDelayConfig.cc \
+       ClientDelayConfig.h
+       
 if USE_DELAY_POOLS
 DELAY_POOL_SOURCE = $(DELAY_POOL_ALL_SOURCE)
 else
@@ -165,7 +173,8 @@ COMMON_LIBS = \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
-       ipc/libipc.la
+       ipc/libipc.la \
+       mgr/libmgr.la
 
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \
@@ -234,6 +243,7 @@ squid_COMMSOURCES = \
        comm_select_win32.cc \
        comm_poll.cc \
        comm_poll.h \
+       comm_devpoll.cc \
        comm_epoll.cc \
        comm_epoll.h \
        comm_kqueue.cc \
@@ -308,6 +318,7 @@ squid_SOURCES = \
        $(DNSSOURCE) \
        enums.h \
        err_type.h \
+       err_detail_type.h \
        errorpage.cc \
        errorpage.h \
        ETag.cc \
@@ -413,6 +424,7 @@ squid_SOURCES = \
        RemovalPolicy.cc \
        RemovalPolicy.h \
        send-announce.cc \
+       $(SBUF_SOURCE) \
        $(SNMP_SOURCE) \
        squid.h \
        SquidMath.h \
@@ -525,6 +537,7 @@ BUILT_SOURCES = \
        cf_gen_defines.cci \
        cf_parser.cci \
        err_type.cc \
+       err_detail_type.cc \
        globals.cc \
        hier_code.cc \
        icp_opcode.cc \
@@ -554,13 +567,16 @@ squid_LDADD = \
        $(SNMPLIB) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
-       $(COMPAT_LIB) \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(SSLLIB) \
        $(EPOLL_LIBS) \
        $(MINGW_LIBS) \
        $(KRB5LIBS) \
+       $(COMPAT_LIB) \
        $(XTRA_LIBS)
-squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+squid_DEPENDENCIES = \
        $(DISK_LIBS) \
        $(DISK_LINKOBJS) \
        $(REPL_OBJS) \
@@ -584,10 +600,9 @@ endif
 INCLUDES += $(KRB5INCS)
 
 
-unlinkd_SOURCES = unlinkd_daemon.cc SquidNew.cc
-
-dnsserver_SOURCES = dnsserver.cc SquidNew.cc test_tools.cc time.cc
-recv_announce_SOURCES = recv-announce.cc SquidNew.cc
+unlinkd_SOURCES = unlinkd_daemon.cc
+dnsserver_SOURCES = dnsserver.cc SquidNew.cc tests/stub_debug.cc test_tools.cc time.cc
+recv_announce_SOURCES = recv-announce.cc
 
 ## What requires what..
 ## many things want ACLChecklist.cc
@@ -653,7 +668,7 @@ ufsdump_LDADD = \
        $(EPOLL_LIBS) \
        $(MINGW_LIBS) \
        $(XTRA_LIBS)
-ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+ufsdump_DEPENDENCIES = \
        $(COMMON_LIBS) \
        $(DISK_LIBS) \
        $(DISK_LINKOBJS) \
@@ -671,7 +686,6 @@ data_DATA = \
        mib.txt
 
 LDADD = $(COMMON_LIBS) \
-       -L../lib -lmiscutil \
        $(EPOLL_LIBS) \
        $(MINGW_LIBS) \
        $(COMPAT_LIB) \
@@ -715,7 +729,9 @@ libDiskDaemon_a_SOURCES = \
                DiskIO/DiskDaemon/DiskdIOStrategy.h \
                DiskIO/DiskDaemon/diomsg.h \
                DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc \
-               DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
+               DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h \
+               DiskIO/DiskDaemon/DiskdAction.cc \
+               DiskIO/DiskDaemon/DiskdAction.h
 
 libDiskThreads_a_SOURCES = \
                $(AIOPS_SOURCE) \
@@ -730,7 +746,12 @@ libDiskThreads_a_SOURCES = \
 
 DiskIO_DiskDaemon_diskd_SOURCES = DiskIO/DiskDaemon/diskd.cc
 nodist_DiskIO_DiskDaemon_diskd_SOURCES = time.cc
-DiskIO_DiskDaemon_diskd_LDADD = $(COMPAT_LIB) $(XTRA_LIBS)
+DiskIO_DiskDaemon_diskd_LDADD = \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 
 DEFAULT_HTTP_PORT      = 3128
@@ -768,6 +789,9 @@ hier_code.cc: hier_code.h mk-string-arrays.awk
 err_type.cc: err_type.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_type.h > $@ || ($(RM) -f $@ && exit 1)
 
+err_detail_type.cc: err_detail_type.h mk-string-arrays.awk
+       $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/err_detail_type.h | sed 's/ERR_DETAIL_//' > $@ || ($(RM) -f $@ && exit 1)
+
 lookup_t.cc: lookup_t.h mk-string-arrays.awk
        $(AWK) -f $(srcdir)/mk-string-arrays.awk < $(srcdir)/lookup_t.h > $@ || ($(RM) -f $@ && exit 1)
 
@@ -857,7 +881,7 @@ install-data-local: install-sysconfDATA install-dataDATA
        $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
        $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \
        $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \
-       $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)`
+       $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)`
 
 uninstall-local: squid.conf.default
        @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_MIME_TABLE) $(srcdir)/mime.conf.default
@@ -920,10 +944,8 @@ TESTS += $(check_PROGRAMS)
 #tests_testX_LDADD=\
 #      $(SQUID_CPPUNIT_LIBS) \
 #      $(SQUID_CPPUNIT_LA) \
-#      -L../lib -lmiscutil
 #      $(COMPAT_LIB) \
-#tests_testX_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \
-#      $(top_builddir)/lib/libmiscutil.a
+#tests_testX_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 
 # - add other component .(h|cc) files needed to link and run tests
@@ -962,6 +984,7 @@ tests_testHttpReply_SOURCES=\
        Packer.h \
        Packer.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_StatHist.cc \
        tests/stub_store.cc \
@@ -978,12 +1001,13 @@ tests_testHttpReply_LDADD=\
        auth/libauth.la \
        ip/libip.la \
        base/libbase.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \
-       $(top_builddir)/lib/libmiscutil.a
+tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 tests_testAuth_SOURCES = \
        tests/testAuth.cc tests/testMain.cc  tests/testAuth.h \
@@ -991,6 +1015,7 @@ tests_testAuth_SOURCES = \
        HelperChildConfig.h \
        HelperChildConfig.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc \
+       tests/stub_debug.cc \
        tests/stub_helper.cc cbdata.cc String.cc \
        tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc mem.cc ClientInfo.h \
        MemBuf.cc HttpHdrContRange.cc Packer.cc HttpHdrCc.cc HttpHdrSc.cc \
@@ -1010,23 +1035,21 @@ tests_testAuth_SOURCES = \
        URLScheme.cc \
        $(TEST_CALL_SOURCES) \
        wordlist.cc
-##     acl.cc cache_cf.cc tools.cc \
-##     helper.cc String.cc cbdata.cc HttpHeaderTools.cc store.cc cache_manager.cc \
-##     HttpHeader.cc url.cc mem.cc HttpRequest.cc Packer.cc \
-##     MemBuf.cc StatHist.cc
 nodist_tests_testAuth_SOURCES = \
        $(TESTSOURCES)
 
 tests_testAuth_LDADD= \
        $(COMMON_LIBS) \
-       -L../lib -lmiscutil \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testAuth_LDFLAGS = $(LIBADD_DL)
-tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+tests_testAuth_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
 ## Tests for the ACLMaxUserIP class
@@ -1070,6 +1093,7 @@ tests_testACLMaxUserIP_SOURCES= \
        $(TEST_CALL_SOURCES) \
        tests/stub_cache_cf.cc \
        tests/stub_comm.cc \
+       tests/stub_debug.cc \
        tests/stub_DelayId.cc \
        tests/stub_MemObject.cc \
        tests/stub_store.cc \
@@ -1085,7 +1109,9 @@ nodist_tests_testACLMaxUserIP_SOURCES= \
        $(TESTSOURCES)
 tests_testACLMaxUserIP_LDADD= \
        $(COMMON_LIBS) \
-       -L../lib -lmiscutil \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
@@ -1105,7 +1131,6 @@ tests_testBoilerplate_SOURCES = \
 nodist_tests_testBoilerplate_SOURCES = \
        $(TESTSOURCES)
 tests_testBoilerplate_LDADD= \
-       -L../lib -lmiscutil \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
        $(COMPAT_LIB) \
@@ -1260,9 +1285,11 @@ tests_testCacheManager_LDADD = \
        $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SNMPLIB) \
-       -L../lib -lmiscutil \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
@@ -1270,7 +1297,7 @@ tests_testCacheManager_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
-tests_testCacheManager_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
+tests_testCacheManager_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)
 
@@ -1280,22 +1307,35 @@ tests_testDiskIO_SOURCES = \
        tests/testDiskIO.h \
        tests/testMain.cc \
        tests/stub_cache_manager.cc \
-       tests/stub_HelperChildConfig.cc
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_Port.cc \
+        tests/stub_TypedMsgHdr.cc \
+       tests/stub_UdsOp.cc
 nodist_tests_testDiskIO_SOURCES= \
        $(SWAP_TEST_GEN_SOURCES) \
        SquidMath.cc \
        SquidMath.h \
        swap_log_op.cc
 tests_testDiskIO_LDADD = \
-       $(SWAP_TEST_LDADD) \
+       SquidConfig.o \
+       CommCalls.o \
+       DnsLookupDetails.o \
+       $(COMMON_LIBS) \
+       $(REPL_OBJS) \
        $(DISK_LIBS) \
        $(DISK_OS_LIBS) \
-       $(COMMON_LIBS) \
-       SquidConfig.o \
+       acl/libapi.la \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SSLLIB) \
+       $(COMPAT_LIB) \
        $(XTRA_LIBS)
 
 tests_testDiskIO_LDFLAGS = $(LIBADD_DL)
-tests_testDiskIO_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+tests_testDiskIO_DEPENDENCIES = \
        $(DISK_LIBS) \
        $(SWAP_TEST_DS) \
        $(SQUID_CPPUNIT_LA)
@@ -1448,9 +1488,11 @@ tests_testEvent_LDADD = \
        $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SNMPLIB) \
-       -L../lib -lmiscutil \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
@@ -1458,7 +1500,7 @@ tests_testEvent_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
-tests_testEvent_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
+tests_testEvent_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)
 
@@ -1609,9 +1651,11 @@ tests_testEventLoop_LDADD = \
        $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SNMPLIB) \
-       -L../lib -lmiscutil \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
@@ -1619,7 +1663,7 @@ tests_testEventLoop_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
-tests_testEventLoop_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
+tests_testEventLoop_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)
 
@@ -1765,9 +1809,11 @@ tests_test_http_range_LDADD = \
        $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SNMPLIB) \
-       -L../lib -lmiscutil \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
@@ -1782,7 +1828,6 @@ tests_test_http_range_DEPENDENCIES = \
 ## Tests of the HttpRequest module.
 tests_testHttpRequest_SOURCES = \
        $(ACL_REGISTRATION_SOURCES) \
-       debug.cc \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        mem.cc \
@@ -1797,6 +1842,7 @@ tests_testHttpRequest_SOURCES = \
        BodyPipe.cc \
        cache_manager.cc \
        cache_cf.cc \
+       debug.cc \
        ProtoPort.cc \
        ProtoPort.h \
        CacheDigest.cc \
@@ -1926,9 +1972,11 @@ tests_testHttpRequest_LDADD = \
        $(REPL_OBJS) \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SNMPLIB) \
-       -L../lib -lmiscutil \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
@@ -1936,7 +1984,7 @@ tests_testHttpRequest_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
-tests_testHttpRequest_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
+tests_testHttpRequest_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)
 
@@ -1961,6 +2009,7 @@ STORE_TEST_SOURCES=\
        tests/stub_acl.cc tests/stub_cache_cf.cc \
        tests/stub_helper.cc cbdata.cc String.cc \
        tests/stub_comm.cc \
+       tests/stub_debug.cc \
        tests/stub_client_side_request.cc \
        tests/stub_http.cc \
        mem_node.cc \
@@ -2000,6 +2049,9 @@ tests_testStore_SOURCES= \
        tests/stub_HelperChildConfig.cc \
        tests/stub_HttpReply.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_Port.cc \
+       tests/stub_TypedMsgHdr.cc \
+       tests/stub_UdsOp.cc \
        $(STORE_TEST_SOURCES) \
        tests/stub_fd.cc
 
@@ -2011,14 +2063,18 @@ nodist_tests_testStore_SOURCES= \
 
 tests_testStore_LDADD= \
        $(COMMON_LIBS) \
-       -L../lib -lmiscutil \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       CommCalls.o \
+       DnsLookupDetails.o \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testStore_LDFLAGS = $(LIBADD_DL)
-tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+tests_testStore_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
 ## string needs mem.cc.
@@ -2032,20 +2088,21 @@ tests_testString_SOURCES = \
        tests/testString.cc \
        tests/testString.h \
        tests/stub_cache_manager.cc \
+       tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        time.cc
 nodist_tests_testString_SOURCES = \
        $(TESTSOURCES)
 tests_testString_LDADD = \
        $(COMMON_LIBS) \
-       -L../lib -lmiscutil \
+       $(top_builddir)/lib/libmiscutil.la \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testString_LDFLAGS = $(LIBADD_DL)
-tests_testString_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
+tests_testString_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
 SWAP_TEST_SOURCES = \
@@ -2083,19 +2140,7 @@ SWAP_TEST_GEN_SOURCES = \
        $(TESTSOURCES) \
        $(DISKIO_GEN_SOURCE)
 
-SWAP_TEST_LDADD = \
-       $(REGEXLIB) \
-       $(COMMON_LIBS) \
-       $(REPL_OBJS) \
-       $(DISK_LIBS) \
-       $(DISK_OS_LIBS) \
-       -L../lib -lmiscutil \
-       acl/libapi.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
 SWAP_TEST_DS =\
-       $(top_builddir)/lib/libmiscutil.a \
        repl_modules.o \
        $(DISK_LIBS) \
        $(COMMON_LIBS) \
@@ -2108,6 +2153,9 @@ tests_testUfs_SOURCES = \
        tests/testUfs.h \
        tests/stub_cache_manager.cc \
        tests/stub_HelperChildConfig.cc \
+       tests/stub_Port.cc \
+       tests/stub_TypedMsgHdr.cc \
+       tests/stub_UdsOp.cc \
        $(SWAP_TEST_SOURCES)
 nodist_tests_testUfs_SOURCES = \
        $(SWAP_TEST_GEN_SOURCES) \
@@ -2115,9 +2163,20 @@ nodist_tests_testUfs_SOURCES = \
        SquidMath.h \
        swap_log_op.cc
 tests_testUfs_LDADD = \
-       $(SWAP_TEST_LDADD) \
+       CommCalls.o \
+       DnsLookupDetails.o \
        $(COMMON_LIBS) \
+       $(REPL_OBJS) \
+       $(DISK_LIBS) \
+       $(DISK_OS_LIBS) \
+       acl/libapi.la \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testUfs_LDFLAGS = $(LIBADD_DL)
 tests_testUfs_DEPENDENCIES = \
@@ -2128,6 +2187,7 @@ tests_testCoss_SOURCES = \
        tests/testMain.cc \
        tests/testCoss.h \
        tests/stub_cache_manager.cc \
+       tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        $(SWAP_TEST_SOURCES)
 nodist_tests_testCoss_SOURCES = \
@@ -2137,8 +2197,18 @@ nodist_tests_testCoss_SOURCES = \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testCoss_LDADD = \
        libsquid.la \
-       $(SWAP_TEST_LDADD) \
+       $(REGEXLIB) \
+       $(COMMON_LIBS) \
+       $(REPL_OBJS) \
+       $(DISK_LIBS) \
+       $(DISK_OS_LIBS) \
+       acl/libapi.la \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testCoss_LDFLAGS = $(LIBADD_DL)
 tests_testCoss_DEPENDENCIES = \
@@ -2152,8 +2222,18 @@ tests_testNull_SOURCES = \
 nodist_tests_testNull_SOURCES = \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testNull_LDADD = \
-       $(SWAP_TEST_LDADD) \
+       $(REGEXLIB) \
+       $(COMMON_LIBS) \
+       $(REPL_OBJS) \
+       $(DISK_LIBS) \
+       $(DISK_OS_LIBS) \
+       acl/libapi.la \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testNull_LDFLAGS = $(LIBADD_DL)
 tests_testNull_DEPENDENCIES = \
@@ -2163,7 +2243,6 @@ tests_testNull_DEPENDENCIES = \
 ## TODO: Trim this down once the insanity is over.
 tests_testURL_SOURCES = \
        $(ACL_REGISTRATION_SOURCES) \
-       debug.cc \
        url.cc \
        URLScheme.cc \
        HttpRequest.cc \
@@ -2176,6 +2255,7 @@ tests_testURL_SOURCES = \
        tests/testURLScheme.cc \
        tests/testURLScheme.h \
        tests/testMain.cc \
+       tests/stub_debug.cc \
        tests/stub_main_cc.cc \
        time.cc \
        BodyPipe.cc \
@@ -2309,7 +2389,10 @@ tests_testURL_LDADD = \
        ${ADAPTATION_LIBS} \
        $(ESI_LIBS) \
        $(SNMPLIB) \
-       -L../lib -lmiscutil \
+       $(top_builddir)/lib/libmisccontainers.la \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
        $(SSLLIB) \
@@ -2317,7 +2400,7 @@ tests_testURL_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testURL_LDFLAGS = $(LIBADD_DL)
-tests_testURL_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
+tests_testURL_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)