SourceFormat Enforcement

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 400f3153d52f6e9771343a0dc29d7a56e6905aee..6619f467780c85597e4795e8141d59102feb5272 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,9 @@
-#
-#  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
 
@@ -46,8 +47,8 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h \
        LoadableModules.cc
 
-SUBDIRS        = base anyp comm eui acl format fs repl
-DIST_SUBDIRS = base anyp comm eui acl format fs repl
+SUBDIRS        = mem base anyp helper ftp parser comm eui acl format clients servers fs repl
+DIST_SUBDIRS = mem base anyp helper ftp parser comm eui acl format clients servers fs repl
 
 if ENABLE_AUTH
 SUBDIRS += auth
@@ -173,7 +174,7 @@ WIN32_SOURCE =
 WINSVC_SOURCE =
 endif
 
-if USE_IPC_WIN32
+if ENABLE_WIN32_IPC
 IPC_SOURCE = SquidIpc.h ipc_win32.cc
 else
 IPC_SOURCE = SquidIpc.h ipc.cc
@@ -182,13 +183,13 @@ endif
 AIO_WIN32_ALL_SOURCES = \
        DiskIO/AIO/aio_win32.cc \
        DiskIO/AIO/aio_win32.h
-if USE_AIO_WIN32
+if ENABLE_WIN32_AIO
 AIO_WIN32_SOURCES = $(AIO_WIN32_ALL_SOURCES)
 else
 AIO_WIN32_SOURCES =
 endif
 
-if USE_AIOPS_WIN32
+if ENABLE_WIN32_AIOPS
 AIOPS_SOURCE = DiskIO/DiskThreads/aiops_win32.cc \
        DiskIO/DiskThreads/CommIO.cc \
        DiskIO/DiskThreads/CommIO.h
@@ -234,7 +235,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 +265,6 @@ DiskIO/DiskIOModules_gen.cc: Makefile
 libsquid_la_SOURCES = \
        comm.cc \
        comm.h \
-       comm_err_t.h \
        CommCalls.cc \
        CommCalls.h \
        DescriptorSet.cc \
@@ -313,6 +313,7 @@ squid_SOURCES = \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
+       clientStreamForward.h \
        CollapsedForwarding.cc \
        CollapsedForwarding.h \
        CompletionDispatcher.cc \
@@ -364,8 +365,6 @@ squid_SOURCES = \
        filemap.cc \
        fqdncache.h \
        fqdncache.cc \
-       ftp.h \
-       ftp.cc \
        FwdState.cc \
        FwdState.h \
        Generic.h \
@@ -374,10 +373,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 +403,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 +428,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 \
@@ -472,6 +460,8 @@ squid_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       PeerPoolMgr.h \
+       PeerPoolMgr.cc \
        PeerSelectState.h \
        PingData.h \
        protos.h \
@@ -537,8 +527,6 @@ squid_SOURCES = \
        StoreStats.h \
        StoreSwapLogData.cc \
        StoreSwapLogData.h \
-       Server.cc \
-       Server.h \
        swap_log_op.h \
        SwapDir.cc \
        SwapDir.h \
@@ -587,7 +575,6 @@ EXTRA_squid_SOURCES = \
 
 noinst_HEADERS = \
        client_side_request.cci \
-       MemBuf.cci \
        MemBuf.h \
        StoreEntryStream.h \
        String.cci \
@@ -621,6 +608,12 @@ 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 \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
@@ -631,7 +624,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 \
@@ -639,11 +631,13 @@ squid_LDADD = \
        $(DISK_LINKOBJS) \
        $(REPL_OBJS) \
        $(DISK_OS_LIBS) \
+       $(NETTLELIB) \
        $(CRYPTLIB) \
        $(REGEXLIB) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
        $(SNMP_LIBS) \
+       mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -668,14 +662,17 @@ 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 USE_LOADABLE_MODULES
+if ENABLE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
 squid_LDADD += -L$(top_builddir) $(LIBLTDL)
 squid_LDFLAGS = -export-dynamic -dlopen force
@@ -683,11 +680,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
@@ -713,7 +710,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 = \
@@ -723,10 +719,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 \
@@ -739,9 +733,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 \
@@ -760,6 +753,7 @@ ufsdump_LDADD = \
        mgr/libmgr.la \
        $(XTRA_OBJS) \
        $(REPL_OBJS) \
+       $(NETTLELIB) \
        $(CRYPTLIB) \
        $(REGEXLIB) \
        $(SSLLIB) \
@@ -965,7 +959,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
@@ -1068,7 +1062,7 @@ check_PROGRAMS+=\
        tests/testEvent \
        tests/testEventLoop \
        tests/test_http_range \
-       tests/testHttpParser \
+       tests/testHttp1Parser \
        tests/testHttpReply \
        tests/testHttpRequest \
        tests/testStore \
@@ -1077,8 +1071,7 @@ check_PROGRAMS+=\
        tests/testSBuf \
        tests/testSBufList \
        tests/testConfigParser \
-       tests/testStatHist \
-       tests/testVector
+       tests/testStatHist
 
 if HAVE_FS_ROCK
 check_PROGRAMS += tests/testRock
@@ -1100,7 +1093,6 @@ TESTS += $(check_PROGRAMS)
 #tests_testX_SOURCES=\
 #      tests/testX.h \
 #      tests/testX.cc \
-#      tests/testMain.cc \
 #      X.h \
 #      X.cc
 #nodist_tests_testX_SOURCES=\
@@ -1145,8 +1137,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 \
@@ -1171,11 +1163,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 \
@@ -1188,7 +1186,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 \
@@ -1197,19 +1194,23 @@ 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 \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
+       $(NETTLELIB) \
        $(SSLLIB) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
@@ -1229,8 +1230,6 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_fatal.cc \
        FileMap.h \
        filemap.cc \
-       HelperChildConfig.h \
-       HelperChildConfig.cc \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -1246,7 +1245,6 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpMsg.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        MasterXaction.cc \
@@ -1320,19 +1318,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 \
@@ -1341,7 +1340,6 @@ tests_testACLMaxUserIP_LDADD= \
        acl/libapi.la \
        anyp/libanyp.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        ipc/libipc.la \
        mgr/libmgr.la \
@@ -1349,6 +1347,7 @@ tests_testACLMaxUserIP_LDADD= \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(DISK_OS_LIBS) \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
@@ -1362,14 +1361,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)
@@ -1380,18 +1382,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 \
@@ -1447,18 +1443,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 \
@@ -1515,12 +1505,13 @@ tests_testCacheManager_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       PeerPoolMgr.h \
+       PeerPoolMgr.cc \
        redirect.h \
        tests/stub_redirect.cc \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -1584,13 +1575,18 @@ 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 \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        comm/libcomm.la \
@@ -1608,9 +1604,11 @@ 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 \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
@@ -1664,7 +1662,6 @@ tests_testDiskIO_SOURCES = \
        HttpHeader.cc \
        HttpMsg.cc \
        HttpReply.cc \
-       HttpRequestMethod.cc \
        int.h \
        int.cc \
        SquidList.h \
@@ -1674,8 +1671,6 @@ tests_testDiskIO_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
-       Mem.h \
-       tests/stub_mem.cc \
        Notes.h \
        Notes.cc \
        Packer.cc \
@@ -1740,6 +1735,7 @@ tests_testDiskIO_SOURCES = \
        tests/stub_MemStore.cc \
        mime.h \
        tests/stub_mime.cc \
+       tests/stub_neighbors.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
        tests/stub_stat.cc \
@@ -1750,7 +1746,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 \
@@ -1768,16 +1763,16 @@ 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 \
@@ -1785,13 +1780,16 @@ tests_testDiskIO_LDADD = \
        $(DISK_LIBS) \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
+       anyp/libanyp.la \
        mgr/libmgr.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 \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
@@ -1861,17 +1859,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 \
@@ -1891,13 +1883,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) \
@@ -1910,8 +1901,7 @@ tests_testEvent_SOURCES = \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -1941,7 +1931,6 @@ tests_testEvent_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        StrList.h \
        StrList.cc \
        $(SBUF_SOURCE) \
@@ -1985,7 +1974,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 \
@@ -2013,13 +2001,18 @@ 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 \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2039,6 +2032,7 @@ tests_testEvent_LDADD = \
        ipc/libipc.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
@@ -2108,17 +2102,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 \
@@ -2138,13 +2126,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) \
@@ -2159,8 +2146,7 @@ tests_testEventLoop_SOURCES = \
        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 +2174,6 @@ tests_testEventLoop_SOURCES = \
        tests/stub_redirect.cc \
        refresh.h \
        refresh.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -2202,7 +2187,6 @@ tests_testEventLoop_SOURCES = \
        StatCounters.cc \
        StatHist.h \
        StatHist.cc \
-       Mem.h \
        stmem.cc \
        repl_modules.h \
        store.cc \
@@ -2232,7 +2216,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 \
@@ -2260,13 +2243,18 @@ 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 \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@ -2286,6 +2274,7 @@ tests_testEventLoop_LDADD = \
        ipc/libipc.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
@@ -2351,17 +2340,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 \
@@ -2381,13 +2364,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 \
@@ -2402,8 +2384,7 @@ tests_test_http_range_SOURCES = \
        MasterXaction.h \
        MemBuf.cc \
        MemObject.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        mime.h \
        mime.cc \
@@ -2431,7 +2412,6 @@ tests_test_http_range_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -2500,12 +2480,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 \
@@ -2526,6 +2512,7 @@ tests_test_http_range_LDADD = \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
@@ -2537,15 +2524,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 \
@@ -2563,16 +2549,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 \
@@ -2580,27 +2567,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 \
@@ -2656,17 +2638,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 \
@@ -2723,13 +2699,14 @@ tests_testHttpRequest_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       PeerPoolMgr.h \
+       PeerPoolMgr.cc \
        redirect.h \
        tests/stub_libauth_acls.cc \
        tests/stub_redirect.cc \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -2789,15 +2766,22 @@ 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 \
        base/libbase.la \
        mgr/libmgr.la \
        anyp/libanyp.la \
@@ -2806,7 +2790,6 @@ tests_testHttpRequest_LDADD = \
        comm/libcomm.la \
        log/liblog.la \
        format/libformat.la \
-       http/libsquid-http.la \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
@@ -2814,6 +2797,7 @@ tests_testHttpRequest_LDADD = \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(DISK_OS_LIBS) \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
@@ -2862,7 +2846,6 @@ tests_testStore_SOURCES= \
        HttpHeader.h \
        HttpHeader.cc \
        HttpMsg.cc \
-       HttpRequestMethod.cc \
        RequestFlags.cc \
        RequestFlags.h \
        int.h \
@@ -2871,8 +2854,6 @@ tests_testStore_SOURCES= \
        SquidList.cc \
        MasterXaction.cc \
        MasterXaction.h \
-       Mem.h \
-       tests/stub_mem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -2928,6 +2909,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 \
@@ -2947,7 +2929,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 \
@@ -2972,22 +2953,24 @@ 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 \
        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 \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
@@ -3004,14 +2987,12 @@ 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 \
@@ -3059,7 +3040,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 \
@@ -3071,6 +3051,7 @@ tests_testUfs_SOURCES = \
        tests/stub_libeui.cc \
        tests/stub_libicmp.cc \
        tests/stub_MemStore.cc \
+       tests/stub_neighbors.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
        tests/stub_UdsOp.cc \
@@ -3128,7 +3109,6 @@ tests_testUfs_SOURCES = \
        store_dir.cc \
        repl_modules.h \
        store.cc \
-       HttpRequestMethod.cc \
        store_key_md5.h \
        store_key_md5.cc \
        Parsing.cc \
@@ -3157,8 +3137,6 @@ tests_testUfs_SOURCES = \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
-       Mem.h \
-       mem.cc \
        ClientInfo.h \
        MemBuf.cc \
        HttpHdrContRange.cc \
@@ -3202,6 +3180,7 @@ 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 \
@@ -3223,9 +3202,11 @@ tests_testUfs_LDADD = \
        anyp/libanyp.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 \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
@@ -3285,15 +3266,12 @@ 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 \
@@ -3333,7 +3311,6 @@ tests_testRock_SOURCES = \
        Transients.h \
        Transients.cc \
        tests/testRock.cc \
-       tests/testMain.cc \
        tests/testRock.h \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
@@ -3362,6 +3339,7 @@ tests_testRock_SOURCES = \
        tests/stub_MemStore.cc \
        mime.h \
        tests/stub_mime.cc \
+       tests/stub_neighbors.cc \
        tests/stub_Port.cc \
        tests/stub_pconn.cc \
        tests/stub_store_client.cc \
@@ -3385,9 +3363,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) \
@@ -3397,19 +3375,22 @@ 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 \
+       $(NETTLELIB) \
        $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
-tests_testRock_LDFLAGS = $(INCLUDES) $(LIBADD_DL)
+tests_testRock_LDFLAGS = $(AM_CPPFLAGS) $(LIBADD_DL)
 tests_testRock_DEPENDENCIES = \
        $(SWAP_TEST_DS)
 
@@ -3468,17 +3449,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 \
@@ -3498,13 +3473,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) \
@@ -3519,8 +3493,7 @@ tests_testURL_SOURCES = \
        MasterXaction.h \
        multicast.h \
        multicast.cc \
-       Mem.h \
-       tests/stub_mem.cc \
+       tests/stub_libmem.cc \
        mem_node.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -3548,7 +3521,6 @@ tests_testURL_SOURCES = \
        refresh.h \
        refresh.cc \
        RemovalPolicy.cc \
-       Server.cc \
        $(SBUF_SOURCE) \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
@@ -3602,7 +3574,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 \
@@ -3622,7 +3593,13 @@ 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 \
@@ -3630,7 +3607,6 @@ tests_testURL_LDADD = \
        acl/libstate.la \
        acl/libapi.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        $(SSL_LIBS) \
@@ -3649,6 +3625,7 @@ tests_testURL_LDADD = \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
+       $(NETTLELIB) \
        $(COMPAT_LIB) \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
@@ -3664,7 +3641,6 @@ tests_testURL_DEPENDENCIES = \
 tests_testSBuf_SOURCES= \
        tests/testSBuf.h \
        tests/testSBuf.cc \
-       tests/testMain.cc \
        tests/SBufFindTest.h \
        tests/SBufFindTest.cc \
        $(SBUF_SOURCE) \
@@ -3672,10 +3648,10 @@ 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_store.cc \
@@ -3702,7 +3678,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 \
@@ -3711,7 +3686,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 \
@@ -3720,6 +3694,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 \
@@ -3746,8 +3721,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) \
@@ -3757,7 +3731,6 @@ tests_testConfigParser_SOURCES = \
        ConfigParser.cc \
        fatal.h \
        tests/stub_fatal.cc \
-       tests/testMain.cc \
        tests/testConfigParser.cc \
        tests/testConfigParser.h \
        cache_cf.h \
@@ -3791,6 +3764,9 @@ tests_testStatHist_SOURCES = \
        fatal.h \
        tests/stub_fatal.cc \
        tests/stub_MemBuf.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        StatHist.cc \
        StatHist.h \
        String.cc \
@@ -3799,8 +3775,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 \
@@ -3809,9 +3784,9 @@ tests_testStatHist_SOURCES = \
        repl_modules.h \
        tests/stub_store.cc \
        tests/stub_store_stats.cc \
+       time.cc \
        tools.h \
        tests/stub_tools.cc \
-       tests/testMain.cc \
        tests/testStatHist.cc \
        tests/testStatHist.h
 nodist_tests_testStatHist_SOURCES = \
@@ -3826,21 +3801,6 @@ tests_testStatHist_LDADD = \
        $(COMPAT_LIB)
 tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
 
-tests_testVector_SOURCES = \
-       tests/testVector.cc \
-       tests/testMain.cc \
-       tests/testVector.h
-nodist_tests_testVector_SOURCES = \
-       $(TESTSOURCES)
-tests_testVector_LDADD= \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-tests_testVector_LDFLAGS = $(LIBADD_DL)
-tests_testVector_DEPENDENCIES = \
-       $(SQUID_CPPUNIT_LA)
-
-
 TESTS += testHeaders
 
 ## Special Universal .h dependency test script