Merged from trunk rev.14096

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

diff --git a/src/Makefile.am b/src/Makefile.am
index fb57de2c2c1c4516a5c6cd136337d5c4c87b9c56..ecc95486a9fb86c4e04cef6bfd1adad60d4b7fe7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,16 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  Uncomment and customize the following to suit your needs:
-#
+## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 include $(top_srcdir)/src/Common.am
 
 AUTOMAKE_OPTIONS = subdir-objects
 
 DNSSOURCE = \
-       dns_internal.cc \
-       SquidDns.h \
-       DnsLookupDetails.h \
-       DnsLookupDetails.cc
+       dns_internal.cc
 
 SBUF_SOURCE= \
        base/CharacterSet.h \
@@ -46,8 +44,8 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h \
        LoadableModules.cc
 
-SUBDIRS        = base anyp parser comm eui acl format fs repl
-DIST_SUBDIRS = base anyp parser comm eui acl format fs repl
+SUBDIRS        = mem base anyp helper dns ftp parser comm eui acl format clients servers fs repl
+DIST_SUBDIRS = mem base anyp helper dns ftp parser comm eui acl format clients servers fs repl
 
 if ENABLE_AUTH
 SUBDIRS += auth
@@ -57,16 +55,15 @@ check_PROGRAMS+= tests/testACLMaxUserIP
 endif
 DIST_SUBDIRS += auth
 
-SUBDIRS        += http ip icmp ident log ipc mgr
-DIST_SUBDIRS += http ip icmp ident log ipc mgr
+SUBDIRS        += http ip icmp ident log ipc mgr security
+DIST_SUBDIRS += http ip icmp ident log ipc mgr security
 
+SSL_LIBS=
 if ENABLE_SSL
 SUBDIRS += ssl
-SSL_LIBS = \
+SSL_LIBS += \
        ssl/libsslsquid.la \
        ssl/libsslutil.la
-else
-SSL_LOCAL_LIBS =
 endif
 DIST_SUBDIRS += ssl
 
@@ -234,7 +231,7 @@ cf_gen_LDADD=
 cf_gen.$(OBJEXT): cf_gen_defines.cci
 
 ## cf_gen.cc needs src/cf_gen_defines.cci
-INCLUDES += -I$(top_builddir)/src
+AM_CPPFLAGS += -I$(top_builddir)/src
 
 
 ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc
@@ -264,7 +261,6 @@ DiskIO/DiskIOModules_gen.cc: Makefile
 libsquid_la_SOURCES = \
        comm.cc \
        comm.h \
-       comm_err_t.h \
        CommCalls.cc \
        CommCalls.h \
        DescriptorSet.cc \
@@ -288,15 +284,13 @@ squid_SOURCES = \
        CacheDigest.cc \
        cache_manager.cc \
        NeighborTypeDomainList.h \
-       CachePeerDomainList.h \
+       CachePeer.cc \
        CachePeer.h \
        CacheManager.h \
        carp.h \
        carp.cc \
        cbdata.cc \
        cbdata.h \
-       ChunkedCodingParser.cc \
-       ChunkedCodingParser.h \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -313,6 +307,7 @@ squid_SOURCES = \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
+       clientStreamForward.h \
        CollapsedForwarding.cc \
        CollapsedForwarding.h \
        CompletionDispatcher.cc \
@@ -364,8 +359,6 @@ squid_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        Generic.h \
@@ -374,10 +367,6 @@ squid_SOURCES = \
        gopher.cc \
        helper.cc \
        helper.h \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        hier_code.h \
        HierarchyLogEntry.h \
        $(HTCPSOURCE) \
@@ -408,16 +397,12 @@ squid_SOURCES = \
        HttpControlMsg.h \
        HttpMsg.cc \
        HttpMsg.h \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        HttpReply.h \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
        HttpRequest.h \
-       HttpRequestMethod.cc \
-       HttpRequestMethod.h \
        ICP.h \
        icp_opcode.h \
        icp_v2.cc \
@@ -437,11 +422,8 @@ squid_SOURCES = \
        main.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       Mem.h \
-       mem.cc \
        mem_node.cc \
        mem_node.h \
-       Mem.h \
        MemBuf.cc \
        MemObject.cc \
        MemObject.h \
@@ -456,8 +438,6 @@ squid_SOURCES = \
        neighbors.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
-       Packer.h \
        Parsing.cc \
        Parsing.h \
        $(XPROF_STATS_SOURCE) \
@@ -539,8 +519,6 @@ squid_SOURCES = \
        StoreStats.h \
        StoreSwapLogData.cc \
        StoreSwapLogData.h \
-       Server.cc \
-       Server.h \
        swap_log_op.h \
        SwapDir.cc \
        SwapDir.h \
@@ -589,7 +567,6 @@ EXTRA_squid_SOURCES = \
 
 noinst_HEADERS = \
        client_side_request.cci \
-       MemBuf.cci \
        MemBuf.h \
        StoreEntryStream.h \
        String.cci \
@@ -623,6 +600,14 @@ squid_LDADD = \
        $(AUTH_LIBS) \
        $(DISK_LIBS) \
        acl/libapi.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       ftp/libftp.la \
+       helper/libhelper.la \
+       http/libsquid-http.la \
+       parser/libsquid-parser.la \
+       dns/libdns.la \
+       security/libsecurity.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
@@ -633,7 +618,6 @@ squid_LDADD = \
        anyp/libanyp.la \
        comm/libcomm.la \
        eui/libeui.la \
-       http/libsquid-http.la \
        icmp/libicmp.la icmp/libicmp-core.la \
        log/liblog.la \
        format/libformat.la \
@@ -647,7 +631,7 @@ squid_LDADD = \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
        $(SNMP_LIBS) \
-       parser/libsquid-parser.la \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -672,12 +656,15 @@ squid_DEPENDENCIES = \
        $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
+       clients/libclients.la \
+       ftp/libftp.la \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        format/libformat.la \
        ipc/libipc.la \
-       mgr/libmgr.la
+       mgr/libmgr.la \
+       servers/libservers.la
 
 if ENABLE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
@@ -687,11 +674,11 @@ squid_LDFLAGS = -export-dynamic -dlopen force
 ## squid_LDFLAGS = -all-static -dlopen self
 ##
 ## LTDL headers require their local include path...
-INCLUDES += $(INCLTDL)
+AM_CPPFLAGS += $(INCLTDL)
 endif
 
 ## Kerberos libraries require their include path...
-INCLUDES += $(KRB5INCS)
+AM_CPPFLAGS += $(KRB5INCS)
 
 
 unlinkd_SOURCES = unlinkd_daemon.cc
@@ -717,7 +704,6 @@ recv_announce_SOURCES = recv-announce.cc
 ## SwapDir wants ConfigOption
 ## tools.cc wants ip/libip.la
 ## client_side.cc wants ip/libip.la
-## mem.cc wants ClientInfo.h
 ## libbase.la wants cbdata.*
 ## libbase.la wants MemBuf.*
 ufsdump_SOURCES = \
@@ -727,10 +713,8 @@ ufsdump_SOURCES = \
        debug.cc \
        int.h \
        int.cc \
-       Mem.h \
-       mem.cc \
+       mem/forward.h \
        MemBuf.cc \
-       MemBuf.cci \
        MemBuf.h \
        Parsing.h \
        store_key_md5.h \
@@ -743,9 +727,8 @@ ufsdump_SOURCES = \
        ufsdump.cc \
        dlink.h \
        dlink.cc \
-       HelperChildConfig.h \
+       helper/ChildConfig.h \
        tests/stub_HelperChildConfig.cc \
-       HttpRequestMethod.cc \
        RemovalPolicy.cc \
        $(WIN32_SOURCE) \
        fd.h \
@@ -970,7 +953,7 @@ cache_cf.o: cf_parser.cci
 
 # cf_gen builds the configuration files.
 cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
-       $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+       $(BUILDCXX) $(BUILDCXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
 
 # squid.conf.default is built by cf_gen when making cf_parser.cci
 squid.conf.default squid.conf.documented: cf_parser.cci
@@ -1070,10 +1053,11 @@ check_PROGRAMS+=\
        tests/testBoilerplate \
        tests/testCacheManager \
        tests/testDiskIO \
+       tests/testDns \
        tests/testEvent \
        tests/testEventLoop \
        tests/test_http_range \
-       tests/testHttpParser \
+       tests/testHttp1Parser \
        tests/testHttpReply \
        tests/testHttpRequest \
        tests/testStore \
@@ -1104,7 +1088,6 @@ TESTS += $(check_PROGRAMS)
 #tests_testX_SOURCES=\
 #      tests/testX.h \
 #      tests/testX.cc \
-#      tests/testMain.cc \
 #      X.h \
 #      X.cc
 #nodist_tests_testX_SOURCES=\
@@ -1149,8 +1132,8 @@ tests_testHttpReply_SOURCES=\
        HttpMsg.h \
        HttpReply.cc \
        HttpReply.h \
-       Mem.h \
-       tests/stub_mem.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        RegexList.h \
        RegexList.cc \
        MemBuf.cc \
@@ -1159,8 +1142,6 @@ tests_testHttpReply_SOURCES=\
        mime_header.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
-       Packer.h \
        SquidString.h \
        SquidTime.h \
        $(SBUF_SOURCE) \
@@ -1175,11 +1156,17 @@ tests_testHttpReply_SOURCES=\
        YesNoNone.h \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_comm.cc \
        tests/stub_debug.cc \
        tests/stub_errorpage.cc \
+       tests/stub_event.cc \
+       tests/stub_fd.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_libformat.cc \
        tests/stub_libauth.cc \
+       tests/stub_libcomm.cc \
+       tests/stub_libmgr.cc \
+       tests/stub_libsslsquid.cc \
        StatCounters.h \
        StatCounters.cc \
        StatHist.h \
@@ -1192,7 +1179,6 @@ tests_testHttpReply_SOURCES=\
        tests/stub_HttpRequest.cc \
        tests/testHttpReply.cc \
        tests/testHttpReply.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        url.cc \
        wordlist.h \
@@ -1201,14 +1187,17 @@ nodist_tests_testHttpReply_SOURCES=\
        $(TESTSOURCES)
 tests_testHttpReply_LDFLAGS = $(LIBADD_DL)
 tests_testHttpReply_LDADD=\
+       CommCalls.o \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
        anyp/libanyp.la \
        ip/libip.la \
        base/libbase.la \
-       $(SSL_LIBS) \
+       ipc/libipc.la \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1234,8 +1223,6 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_fatal.cc \
        FileMap.h \
        filemap.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -1251,7 +1238,6 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        MasterXaction.cc \
@@ -1261,7 +1247,6 @@ tests_testACLMaxUserIP_SOURCES= \
        SquidList.h \
        SquidList.cc \
        mem_node.cc \
-       Packer.cc \
        Parsing.cc \
        SquidMath.cc \
        StatCounters.cc \
@@ -1325,19 +1310,20 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_UdsOp.cc \
        tests/testACLMaxUserIP.cc \
        tests/testACLMaxUserIP.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        url.cc \
        URL.h \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        MemBuf.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testACLMaxUserIP_SOURCES= \
        $(TESTSOURCES)
 tests_testACLMaxUserIP_LDADD= \
+       libsquid.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
@@ -1346,7 +1332,6 @@ tests_testACLMaxUserIP_LDADD= \
        acl/libapi.la \
        anyp/libanyp.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        ipc/libipc.la \
        mgr/libmgr.la \
@@ -1368,14 +1353,17 @@ tests_testACLMaxUserIP_LDFLAGS = $(LIBADD_DL)
 ## involved in writing tests.
 tests_testBoilerplate_SOURCES = \
        tests/testBoilerplate.cc \
-       tests/testMain.cc \
        tests/testBoilerplate.h \
+       tests/stub_debug.cc \
        tests/stub_time.cc
 nodist_tests_testBoilerplate_SOURCES = \
+       tests/stub_cbdata.cc \
+       tests/stub_MemBuf.cc \
        $(TESTSOURCES)
 tests_testBoilerplate_LDADD= \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
+       base/libbase.la \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testBoilerplate_LDFLAGS = $(LIBADD_DL)
@@ -1386,18 +1374,12 @@ tests_testBoilerplate_DEPENDENCIES = \
 tests_testCacheManager_SOURCES = \
        AccessLogEntry.cc \
        debug.cc \
-       HttpParser.cc \
-       HttpParser.h \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
-       Mem.h \
-       tests/stub_mem.cc \
        String.cc \
        tests/testCacheManager.cc \
        tests/testCacheManager.h \
-       tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_store_stats.cc \
@@ -1411,12 +1393,13 @@ tests_testCacheManager_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -1453,18 +1436,12 @@ tests_testCacheManager_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        gopher.h \
        gopher.cc \
        hier_code.h \
        helper.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        $(HTCPSOURCE) \
        HttpStateFlags.h \
        http.cc \
@@ -1493,6 +1470,7 @@ tests_testCacheManager_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -1510,7 +1488,6 @@ tests_testCacheManager_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -1528,7 +1505,6 @@ tests_testCacheManager_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -1592,13 +1568,19 @@ nodist_tests_testCacheManager_SOURCES = \
        $(DISKIO_GEN_SOURCE)
 # comm.cc only requires comm/libcomm.la until fdc_table is dead.
 tests_testCacheManager_LDADD = \
+       libsquid.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        comm/libcomm.la \
@@ -1616,6 +1598,7 @@ tests_testCacheManager_LDADD = \
        ipc/libipc.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1673,7 +1656,6 @@ tests_testDiskIO_SOURCES = \
        HttpHeader.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        SquidList.h \
@@ -1683,11 +1665,8 @@ tests_testDiskIO_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
-       Mem.h \
-       tests/stub_mem.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        refresh.h \
        refresh.cc \
@@ -1760,7 +1739,6 @@ tests_testDiskIO_SOURCES = \
        tests/stub_UdsOp.cc \
        tests/testDiskIO.cc \
        tests/testDiskIO.h \
-       tests/testMain.cc \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
        tests/stub_time.cc \
@@ -1778,16 +1756,15 @@ nodist_tests_testDiskIO_SOURCES= \
        SquidMath.h \
        swap_log_op.cc
 tests_testDiskIO_LDADD = \
+       libsquid.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        SquidConfig.o \
        CommCalls.o \
-       DnsLookupDetails.o \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       libsquid.la \
        comm/libcomm.la \
-       anyp/libanyp.la \
        ip/libip.la \
        fs/libfs.la \
        ipc/libipc.la \
@@ -1795,10 +1772,13 @@ tests_testDiskIO_LDADD = \
        $(DISK_LIBS) \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
+       anyp/libanyp.la \
        mgr/libmgr.la \
        $(SSL_LIBS) \
        ipc/libipc.la \
+       dns/libdns.la \
        base/libbase.la \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1815,7 +1795,23 @@ tests_testDiskIO_DEPENDENCIES = \
        $(SWAP_TEST_DS) \
        $(SQUID_CPPUNIT_LA)
 
-## Tests of the Even module.
+tests_testDns_SOURCES= \
+       tests/testRFC1035.cc \
+       tests/testRFC1035.h
+nodist_tests_testDns_SOURCES= \
+       tests/stub_debug.cc \
+       tests/stub_SBuf.cc \
+       tests/stub_tools.cc
+tests_testDns_LDADD= \
+       dns/libdns.la \
+       base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SQUID_CPPUNIT_LIBS)
+tests_testDns_LDFLAGS= $(LIBADD_DL)
+
 tests_testEvent_SOURCES = \
        AccessLogEntry.cc \
        BodyPipe.cc \
@@ -1827,11 +1823,12 @@ tests_testEvent_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        cache_manager.cc \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -1872,17 +1869,11 @@ tests_testEvent_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -1902,15 +1893,12 @@ tests_testEvent_SOURCES = \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        PeerPoolMgr.h \
        PeerPoolMgr.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -1919,12 +1907,12 @@ tests_testEvent_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -1938,7 +1926,6 @@ tests_testEvent_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -1954,7 +1941,6 @@ tests_testEvent_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        StrList.h \
        StrList.cc \
        $(SBUF_SOURCE) \
@@ -1998,7 +1984,6 @@ tests_testEvent_SOURCES = \
        tests/CapturingStoreEntry.h \
        tests/testEvent.cc \
        tests/testEvent.h \
-       tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_libauth_acls.cc \
@@ -2026,13 +2011,19 @@ nodist_tests_testEvent_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_testEvent_LDADD = \
+       libsquid.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2078,10 +2069,11 @@ tests_testEventLoop_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -2122,17 +2114,11 @@ tests_testEventLoop_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -2152,15 +2138,12 @@ tests_testEventLoop_SOURCES = \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        PeerPoolMgr.h \
        PeerPoolMgr.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -2169,14 +2152,14 @@ tests_testEventLoop_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
        MemBuf.cc \
        MemObject.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        mime.h \
        mime.cc \
@@ -2188,7 +2171,6 @@ tests_testEventLoop_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -2204,7 +2186,6 @@ tests_testEventLoop_SOURCES = \
        tests/stub_redirect.cc \
        refresh.h \
        refresh.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -2218,7 +2199,6 @@ tests_testEventLoop_SOURCES = \
        StatCounters.cc \
        StatHist.h \
        StatHist.cc \
-       Mem.h \
        stmem.cc \
        repl_modules.h \
        store.cc \
@@ -2248,7 +2228,6 @@ tests_testEventLoop_SOURCES = \
        tests/stub_SwapDir.cc \
        tests/testEventLoop.cc \
        tests/testEventLoop.h \
-       tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_libauth_acls.cc \
@@ -2276,13 +2255,19 @@ nodist_tests_testEventLoop_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_testEventLoop_LDADD = \
+       libsquid.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2324,13 +2309,14 @@ tests_test_http_range_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        cache_manager.cc \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -2368,17 +2354,11 @@ tests_test_http_range_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -2398,15 +2378,12 @@ tests_test_http_range_SOURCES = \
        HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        PeerPoolMgr.h \
        PeerPoolMgr.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        int.h \
@@ -2415,14 +2392,14 @@ tests_test_http_range_SOURCES = \
        internal.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
        MemBuf.cc \
        MemObject.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        mime.h \
        mime.cc \
@@ -2434,7 +2411,6 @@ tests_test_http_range_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        peer_digest.cc \
        peer_proxy_negotiate_auth.h \
@@ -2450,7 +2426,6 @@ tests_test_http_range_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -2519,12 +2494,18 @@ nodist_tests_test_http_range_SOURCES = \
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
 tests_test_http_range_LDADD = \
+       libsquid.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
-       libsquid.la \
+       parser/libsquid-parser.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2539,6 +2520,7 @@ tests_test_http_range_LDADD = \
        $(ESI_LIBS) \
        $(SSL_LIBS) \
        ipc/libipc.la \
+       dns/libdns.la \
        base/libbase.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
@@ -2557,15 +2539,14 @@ tests_test_http_range_LDFLAGS = $(LIBADD_DL)
 tests_test_http_range_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
-tests_testHttpParser_SOURCES = \
+tests_testHttp1Parser_SOURCES = \
        Debug.h \
-       HttpParser.cc \
-       HttpParser.h \
        MemBuf.cc \
        MemBuf.h \
        tests/stub_MemObject.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
+       mime_header.cc \
+       mime_header.h \
        String.cc \
        cache_cf.h \
        YesNoNone.h \
@@ -2583,16 +2564,17 @@ tests_testHttpParser_SOURCES = \
        tests/stub_store_stats.cc \
        tools.h \
        tests/stub_tools.cc \
-       tests/testHttpParser.cc \
-       tests/testHttpParser.h \
-       tests/testMain.cc \
+       tests/testHttp1Parser.cc \
+       tests/testHttp1Parser.h \
        tests/stub_time.cc \
        wordlist.h \
        wordlist.cc
-nodist_tests_testHttpParser_SOURCES = \
+nodist_tests_testHttp1Parser_SOURCES = \
        $(TESTSOURCES)
-tests_testHttpParser_LDADD= \
+tests_testHttp1Parser_LDADD= \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
+       anyp/libanyp.la \
        SquidConfig.o \
        base/libbase.la \
        ip/libip.la \
@@ -2600,27 +2582,22 @@ tests_testHttpParser_LDADD= \
        $(SQUID_CPPUNIT_LIBS) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-tests_testHttpParser_LDFLAGS = $(LIBADD_DL)
-tests_testHttpParser_DEPENDENCIES = \
+tests_testHttp1Parser_LDFLAGS = $(LIBADD_DL)
+tests_testHttp1Parser_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
 
 ## Tests of the HttpRequest module.
 tests_testHttpRequest_SOURCES = \
        AccessLogEntry.cc \
-       HttpParser.cc \
-       HttpParser.h \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        String.cc \
        tests/testHttpRequest.h \
        tests/testHttpRequest.cc \
        tests/testHttpRequestMethod.h \
        tests/testHttpRequestMethod.cc \
-       tests/testMain.cc \
        tests/stub_DiskIOModule.cc \
        tests/stub_libauth.cc \
        tests/stub_main_cc.cc \
@@ -2640,10 +2617,11 @@ tests_testHttpRequest_SOURCES = \
        debug.cc \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
+       CachePeer.cc \
+       CachePeer.h \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -2676,17 +2654,11 @@ tests_testHttpRequest_SOURCES = \
        fde.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -2715,6 +2687,7 @@ tests_testHttpRequest_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2732,7 +2705,6 @@ tests_testHttpRequest_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -2751,7 +2723,6 @@ tests_testHttpRequest_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -2811,15 +2782,23 @@ tests_testHttpRequest_SOURCES = \
 nodist_tests_testHttpRequest_SOURCES = \
        $(BUILT_SOURCES)
 tests_testHttpRequest_LDADD = \
+       libsquid.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       helper/libhelper.la \
+       ftp/libftp.la \
+       http/libsquid-http.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
-       libsquid.la \
+       parser/libsquid-parser.la \
        ip/libip.la \
        fs/libfs.la \
        $(SSL_LIBS) \
        ipc/libipc.la \
+       parser/libsquid-parser.la \
+       dns/libdns.la \
        base/libbase.la \
        mgr/libmgr.la \
        anyp/libanyp.la \
@@ -2828,7 +2807,6 @@ tests_testHttpRequest_LDADD = \
        comm/libcomm.la \
        log/liblog.la \
        format/libformat.la \
-       http/libsquid-http.la \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
@@ -2885,7 +2863,6 @@ tests_testStore_SOURCES= \
        HttpHeader.h \
        HttpHeader.cc \
        HttpMsg.cc \
-       HttpRequestMethod.cc \
        RequestFlags.cc \
        RequestFlags.h \
        int.h \
@@ -2894,14 +2871,11 @@ tests_testStore_SOURCES= \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       Mem.h \
-       tests/stub_mem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
        refresh.h \
@@ -2951,6 +2925,7 @@ tests_testStore_SOURCES= \
        tests/stub_libauth.cc \
        tests/stub_libeui.cc \
        tests/stub_libformat.cc \
+       tests/stub_libsslsquid.cc \
        HttpBody.h \
        HttpBody.cc \
        tests/stub_HttpReply.cc \
@@ -2970,7 +2945,6 @@ tests_testStore_SOURCES= \
        Transients.cc \
        tests/stub_tools.cc \
        tests/stub_UdsOp.cc \
-       tests/testMain.cc \
        tests/testStore.cc \
        tests/testStore.h \
        tests/testStoreEntryStream.cc \
@@ -2995,19 +2969,21 @@ nodist_tests_testStore_SOURCES= \
        swap_log_op.cc
 
 tests_testStore_LDADD= \
+       libsquid.la \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        mgr/libmgr.la \
-       $(SSL_LIBS) \
        ipc/libipc.la \
        anyp/libanyp.la \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3016,7 +2992,6 @@ tests_testStore_LDADD= \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
        CommCalls.o \
-       DnsLookupDetails.o \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testStore_LDFLAGS = $(LIBADD_DL)
@@ -3028,20 +3003,19 @@ tests_testStore_DEPENDENCIES = \
 ## libsquid pulls in SquidConfig and children. stub them.
 tests_testString_SOURCES = \
        ClientInfo.h \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        MemBuf.cc \
        String.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
-       tests/testMain.cc \
        tests/testString.cc \
        tests/testString.h \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_cbdata.cc \
        tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        tools.h \
@@ -3083,7 +3057,6 @@ SWAP_TEST_DS =\
 
 tests_testUfs_SOURCES = \
        tests/testUfs.cc \
-       tests/testMain.cc \
        tests/testUfs.h \
        tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
@@ -3153,7 +3126,6 @@ tests_testUfs_SOURCES = \
        store_dir.cc \
        repl_modules.h \
        store.cc \
-       HttpRequestMethod.cc \
        store_key_md5.h \
        store_key_md5.cc \
        Parsing.cc \
@@ -3182,12 +3154,9 @@ tests_testUfs_SOURCES = \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
-       Mem.h \
-       mem.cc \
        ClientInfo.h \
        MemBuf.cc \
        HttpHdrContRange.cc \
-       Packer.cc \
        HttpHeaderFieldStat.h \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -3227,8 +3196,8 @@ nodist_tests_testUfs_SOURCES = \
        swap_log_op.cc
 tests_testUfs_LDADD = \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        CommCalls.o \
-       DnsLookupDetails.o \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@ -3246,8 +3215,10 @@ tests_testUfs_LDADD = \
        ipc/libipc.la \
        comm/libcomm.la \
        anyp/libanyp.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3311,21 +3282,17 @@ tests_testRock_SOURCES = \
        HttpHeaderTools.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       Mem.h \
-       mem.cc \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
        RequestFlags.cc \
@@ -3359,7 +3326,6 @@ tests_testRock_SOURCES = \
        Transients.h \
        Transients.cc \
        tests/testRock.cc \
-       tests/testMain.cc \
        tests/testRock.h \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
@@ -3412,9 +3378,9 @@ nodist_tests_testRock_SOURCES = \
        $(TESTSOURCES)
 tests_testRock_LDADD = \
        http/libsquid-http.la \
+       parser/libsquid-parser.la \
        libsquid.la \
        comm/libcomm.la \
-       anyp/libanyp.la \
        ip/libip.la \
        fs/libfs.la \
        $(COMMON_LIBS) \
@@ -3424,10 +3390,12 @@ tests_testRock_LDADD = \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
+       anyp/libanyp.la \
        eui/libeui.la \
        $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3437,7 +3405,7 @@ tests_testRock_LDADD = \
        $(SSLLIB) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-tests_testRock_LDFLAGS = $(INCLUDES) $(LIBADD_DL)
+tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL)
 tests_testRock_DEPENDENCIES = \
        $(SWAP_TEST_DS)
 
@@ -3455,10 +3423,11 @@ tests_testURL_SOURCES = \
        tests/stub_cache_manager.cc \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
+       CachePeer.cc \
+       CachePeer.h \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -3496,17 +3465,11 @@ tests_testURL_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
-       HelperReply.cc \
-       HelperReply.h \
        hier_code.h \
        $(HTCPSOURCE) \
        http.cc \
@@ -3526,15 +3489,12 @@ tests_testURL_SOURCES = \
        HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
-       HttpParser.cc \
-       HttpParser.h \
        HttpReply.cc \
        PeerPoolMgr.h \
        PeerPoolMgr.cc \
        RequestFlags.h \
        RequestFlags.cc \
        HttpRequest.cc \
-       HttpRequestMethod.cc \
        icp_v2.cc \
        icp_v3.cc \
        $(IPC_SOURCE) \
@@ -3543,14 +3503,14 @@ tests_testURL_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
        multicast.h \
        multicast.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -3562,7 +3522,6 @@ tests_testURL_SOURCES = \
        neighbors.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -3578,7 +3537,6 @@ tests_testURL_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -3632,7 +3590,6 @@ tests_testURL_SOURCES = \
        tests/testURL.h \
        tests/testUriScheme.cc \
        tests/testUriScheme.h \
-       tests/testMain.cc \
        tests/stub_time.cc \
        tests/stub_EventLoop.cc \
        tools.h \
@@ -3652,15 +3609,21 @@ tests_testURL_SOURCES = \
 nodist_tests_testURL_SOURCES = \
        $(BUILT_SOURCES)
 tests_testURL_LDADD = \
+       libsquid.la \
+       clients/libclients.la \
+       servers/libservers.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
+       ftp/libftp.la \
+       parser/libsquid-parser.la \
        anyp/libanyp.la \
        ident/libident.la \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        $(SSL_LIBS) \
@@ -3695,7 +3658,6 @@ tests_testURL_DEPENDENCIES = \
 tests_testSBuf_SOURCES= \
        tests/testSBuf.h \
        tests/testSBuf.cc \
-       tests/testMain.cc \
        tests/SBufFindTest.h \
        tests/SBufFindTest.cc \
        $(SBUF_SOURCE) \
@@ -3703,12 +3665,13 @@ tests_testSBuf_SOURCES= \
        tests/stub_SBufDetailedStats.cc \
        SBufStream.h \
        tests/stub_time.cc \
-       mem.cc \
        tests/stub_debug.cc \
        tests/stub_fatal.cc \
        tests/stub_HelperChildConfig.cc \
+       tests/stub_libmem.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_cbdata.cc \
        tests/stub_store.cc \
        tests/stub_store_stats.cc \
        tests/stub_tools.cc \
@@ -3733,7 +3696,6 @@ tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 tests_testSBufList_SOURCES= \
        tests/testSBufList.h \
        tests/testSBufList.cc \
-       tests/testMain.cc \
        $(SBUF_SOURCE) \
        SBufList.h \
        SBufList.cc \
@@ -3742,7 +3704,6 @@ tests_testSBufList_SOURCES= \
        tests/stub_SBufDetailedStats.cc \
        SBufStream.h \
        tests/stub_time.cc \
-       mem.cc \
        tests/stub_MemObject.cc \
        tests/stub_cbdata.cc \
        tests/stub_comm.cc \
@@ -3751,6 +3712,7 @@ tests_testSBufList_SOURCES= \
        tests/stub_fatal.cc \
        tests/stub_fd.cc \
        tests/stub_HelperChildConfig.cc \
+       tests/stub_libmem.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
        tests/stub_store.cc \
@@ -3777,8 +3739,7 @@ tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        tests/stub_MemBuf.cc \
        tests/stub_time.cc \
        $(SBUF_SOURCE) \
@@ -3788,13 +3749,13 @@ tests_testConfigParser_SOURCES = \
        ConfigParser.cc \
        fatal.h \
        tests/stub_fatal.cc \
-       tests/testMain.cc \
        tests/testConfigParser.cc \
        tests/testConfigParser.h \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_cbdata.cc \
        tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        tools.h \
@@ -3833,8 +3794,7 @@ tests_testStatHist_SOURCES = \
        tests/stub_debug.cc \
        tests/stub_DelayId.cc \
        tests/stub_HelperChildConfig.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        tests/stub_MemObject.cc \
        mime.h \
        tests/stub_mime.cc \
@@ -3846,7 +3806,6 @@ tests_testStatHist_SOURCES = \
        time.cc \
        tools.h \
        tests/stub_tools.cc \
-       tests/testMain.cc \
        tests/testStatHist.cc \
        tests/testStatHist.h
 nodist_tests_testStatHist_SOURCES = \