Undo trunk r13270: "Refactor Vector and Stack to STL counterparts"

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 0c76aa246cd5d4ea62c65d4749731ce2dfde3dfb..400f3153d52f6e9771343a0dc29d7a56e6905aee 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ DNSSOURCE = \
        DnsLookupDetails.cc
 
 SBUF_SOURCE= \
+       base/CharacterSet.h \
        base/InstanceId.h \
        MemBlob.h \
        MemBlob.cc \
@@ -312,6 +313,8 @@ squid_SOURCES = \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
+       CollapsedForwarding.cc \
+       CollapsedForwarding.h \
        CompletionDispatcher.cc \
        CompletionDispatcher.h \
        CommRead.h \
@@ -481,6 +484,8 @@ squid_SOURCES = \
        send-announce.h \
        send-announce.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       SBufDetailedStats.cc \
        SBufStatsAction.h \
        SBufStatsAction.cc \
        $(SNMP_SOURCE) \
@@ -537,6 +542,8 @@ squid_SOURCES = \
        swap_log_op.h \
        SwapDir.cc \
        SwapDir.h \
+       Transients.cc \
+       Transients.h \
        MemStore.cc \
        MemStore.h \
        time.cc \
@@ -548,8 +555,6 @@ squid_SOURCES = \
        $(UNLINKDSOURCE) \
        url.cc \
        URL.h \
-       URLScheme.cc \
-       URLScheme.h \
        urn.h \
        urn.cc \
        wccp.h \
@@ -584,7 +589,6 @@ noinst_HEADERS = \
        client_side_request.cci \
        MemBuf.cci \
        MemBuf.h \
-       Store.cci \
        StoreEntryStream.h \
        String.cci \
        SquidString.h \
@@ -621,6 +625,7 @@ squid_LDADD = \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        mgr/libmgr.la \
        anyp/libanyp.la \
@@ -638,7 +643,6 @@ squid_LDADD = \
        $(REGEXLIB) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(SNMP_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
@@ -920,7 +924,7 @@ DEFAULT_ERROR_DIR   = $(datadir)/errors
 # Make location configure settings available to the code
 DEFS += -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -DDEFAULT_SQUID_DATA_DIR=\"$(datadir)\" -DDEFAULT_SQUID_CONFIG_DIR=\"$(sysconfdir)\"
 
-snmp_core.o snmp_agent.o: ../lib/snmplib/libsnmplib.a $(top_srcdir)/include/cache_snmp.h
+snmp_core.o snmp_agent.o: ../lib/snmplib/libsnmplib.la $(top_srcdir)/include/cache_snmp.h
 
 globals.cc: globals.h mk-globals-c.awk
        $(AWK) -f $(srcdir)/mk-globals-c.awk < $(srcdir)/globals.h > $@ || ($(RM) -f $@ && exit 1)
@@ -1071,6 +1075,7 @@ check_PROGRAMS+=\
        tests/testString \
        tests/testURL \
        tests/testSBuf \
+       tests/testSBufList \
        tests/testConfigParser \
        tests/testStatHist \
        tests/testVector
@@ -1154,6 +1159,9 @@ tests_testHttpReply_SOURCES=\
        Packer.h \
        SquidString.h \
        SquidTime.h \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        StrList.h \
        StrList.cc \
@@ -1183,7 +1191,6 @@ tests_testHttpReply_SOURCES=\
        tests/testMain.cc \
        tests/stub_time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc
 nodist_tests_testHttpReply_SOURCES=\
@@ -1211,6 +1218,7 @@ tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 tests_testACLMaxUserIP_SOURCES= \
        cbdata.cc \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        DiskIO/ReadRequest.cc \
@@ -1258,6 +1266,9 @@ tests_testACLMaxUserIP_SOURCES= \
        StrList.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        store_dir.cc \
        StoreIOState.cc \
@@ -1270,6 +1281,7 @@ tests_testACLMaxUserIP_SOURCES= \
        swap_log_op.h \
        tests/stub_SwapDir.cc \
        SwapDir.h \
+       Transients.cc \
        log/access_log.h \
        tests/stub_access_log.cc \
        cache_cf.h \
@@ -1297,6 +1309,7 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_Port.cc \
        repl_modules.h \
        tests/stub_store.cc \
+       tests/stub_store_client.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
@@ -1311,8 +1324,6 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_time.cc \
        url.cc \
        URL.h \
-       URLScheme.cc \
-       URLScheme.h \
        Mem.h \
        tests/stub_mem.cc \
        MemBuf.cc \
@@ -1384,6 +1395,7 @@ tests_testCacheManager_SOURCES = \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_store_stats.cc \
+       tests/stub_EventLoop.cc \
        time.cc \
        BodyPipe.cc \
        cache_manager.cc \
@@ -1407,6 +1419,7 @@ tests_testCacheManager_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -1509,6 +1522,8 @@ tests_testCacheManager_SOURCES = \
        RemovalPolicy.cc \
        Server.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -1548,12 +1563,12 @@ tests_testCacheManager_SOURCES = \
        StoreSwapLogData.cc \
        tools.h \
        tools.cc \
+       Transients.cc \
        tests/stub_tunnel.cc \
        tests/stub_SwapDir.cc \
        MemStore.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
@@ -1614,6 +1629,7 @@ tests_testDiskIO_SOURCES = \
        cbdata.cc \
        client_db.h \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        $(DELAY_POOL_SOURCE) \
@@ -1674,6 +1690,9 @@ tests_testDiskIO_SOURCES = \
        StatHist.h \
        tests/stub_StatHist.cc \
        stmem.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
        tests/stub_StoreMeta.cc \
@@ -1691,6 +1710,7 @@ tests_testDiskIO_SOURCES = \
        StrList.h \
        StrList.cc \
        tests/stub_SwapDir.cc \
+       Transients.cc \
        log/access_log.h \
        tests/stub_access_log.cc \
        tests/stub_acl.cc \
@@ -1722,6 +1742,7 @@ tests_testDiskIO_SOURCES = \
        tests/stub_mime.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
+       tests/stub_stat.cc \
        tests/stub_store_client.cc \
        tests/stub_store_stats.cc \
        store_rebuild.h \
@@ -1735,7 +1756,6 @@ tests_testDiskIO_SOURCES = \
        tests/stub_time.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        $(WIN32_SOURCE) \
        wordlist.h \
        wordlist.cc \
@@ -1766,9 +1786,9 @@ tests_testDiskIO_LDADD = \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
        mgr/libmgr.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -1809,6 +1829,7 @@ tests_testEvent_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -1924,6 +1945,8 @@ tests_testEvent_SOURCES = \
        StrList.h \
        StrList.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.cc \
        SquidMath.h \
@@ -1972,11 +1995,11 @@ tests_testEvent_SOURCES = \
        time.cc \
        tools.h \
        tools.cc \
+       Transients.cc \
        tests/stub_tunnel.cc \
        MemStore.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
@@ -2053,6 +2076,7 @@ tests_testEventLoop_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2166,6 +2190,8 @@ tests_testEventLoop_SOURCES = \
        refresh.cc \
        Server.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2216,11 +2242,11 @@ tests_testEventLoop_SOURCES = \
        time.cc \
        tools.h \
        tools.cc \
+       Transients.cc \
        tests/stub_tunnel.cc \
        MemStore.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
@@ -2296,6 +2322,7 @@ tests_test_http_range_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2406,6 +2433,8 @@ tests_test_http_range_SOURCES = \
        RemovalPolicy.cc \
        Server.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2443,6 +2472,7 @@ tests_test_http_range_SOURCES = \
        StrList.h \
        StrList.cc \
        tests/stub_SwapDir.cc \
+       Transients.cc \
        tests/test_http_range.cc \
        tests/stub_external_acl.cc \
        tests/stub_ipc_Forwarder.cc \
@@ -2450,13 +2480,13 @@ tests_test_http_range_SOURCES = \
        tests/stub_main_cc.cc \
        tests/stub_MemStore.cc \
        tests/stub_store_stats.cc \
+       tests/stub_EventLoop.cc \
        time.cc \
        tools.h \
        tools.cc \
        tests/stub_tunnel.cc \
        $(UNLINKDSOURCE) \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
@@ -2513,16 +2543,24 @@ tests_testHttpParser_SOURCES = \
        HttpParser.h \
        MemBuf.cc \
        MemBuf.h \
+       tests/stub_MemObject.cc \
        Mem.h \
        tests/stub_mem.cc \
        String.cc \
        cache_cf.h \
        YesNoNone.h \
+       $(SBUF_SOURCE) \
+       tests/stub_SBufDetailedStats.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_comm.cc \
+       tests/stub_cbdata.cc \
        tests/stub_debug.cc \
        tests/stub_event.cc \
        tests/stub_HelperChildConfig.cc \
+       tests/stub_stmem.cc \
+       tests/stub_store.cc \
+       tests/stub_store_stats.cc \
        tools.h \
        tests/stub_tools.cc \
        tests/testHttpParser.cc \
@@ -2569,6 +2607,7 @@ tests_testHttpRequest_SOURCES = \
        tests/stub_ipc_Forwarder.cc \
        tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
+       tests/stub_EventLoop.cc \
        time.cc \
        BodyPipe.cc \
        cache_manager.cc \
@@ -2593,6 +2632,7 @@ tests_testHttpRequest_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -2691,6 +2731,8 @@ tests_testHttpRequest_SOURCES = \
        RemovalPolicy.cc \
        Server.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -2729,11 +2771,11 @@ tests_testHttpRequest_SOURCES = \
        event.cc \
        tools.h \
        tools.cc \
+       Transients.cc \
        tests/stub_tunnel.cc \
        tests/stub_SwapDir.cc \
        MemStore.cc \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
@@ -2754,6 +2796,7 @@ tests_testHttpRequest_LDADD = \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
        mgr/libmgr.la \
@@ -2767,7 +2810,6 @@ tests_testHttpRequest_LDADD = \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -2791,6 +2833,7 @@ tests_testStore_SOURCES= \
        tests/stub_CacheDigest.cc \
        cbdata.cc \
        ClientInfo.h \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        $(DELAY_POOL_SOURCE) \
@@ -2856,6 +2899,9 @@ tests_testStore_SOURCES= \
        StoreSwapLogData.cc \
        store_key_md5.h \
        store_key_md5.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        StrList.h \
        StrList.cc \
@@ -2891,12 +2937,14 @@ tests_testStore_SOURCES= \
        mime.h \
        tests/stub_mime.cc \
        tests/stub_Port.cc \
+       tests/stub_stat.cc \
        tests/stub_store_client.cc \
        tests/stub_store_stats.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_swapout.cc \
        tools.h \
+       Transients.cc \
        tests/stub_tools.cc \
        tests/stub_UdsOp.cc \
        tests/testMain.cc \
@@ -2914,7 +2962,6 @@ tests_testStore_SOURCES= \
        tests/TestSwapDir.h \
        tests/stub_time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc
 
@@ -2935,9 +2982,9 @@ tests_testStore_LDADD= \
        ip/libip.la \
        fs/libfs.la \
        mgr/libmgr.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        anyp/libanyp.la \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -2961,6 +3008,9 @@ tests_testString_SOURCES = \
        tests/stub_mem.cc \
        MemBuf.cc \
        String.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        tests/testMain.cc \
        tests/testString.cc \
        tests/testString.h \
@@ -3013,10 +3063,13 @@ tests_testUfs_SOURCES = \
        tests/testUfs.h \
        tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
+       tests/stub_CollapsedForwarding.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
+       tests/stub_ipcache.cc \
        tests/stub_libeui.cc \
+       tests/stub_libicmp.cc \
        tests/stub_MemStore.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
@@ -3024,6 +3077,7 @@ tests_testUfs_SOURCES = \
        internal.h \
        tests/stub_internal.cc \
        tests/stub_libformat.cc \
+       tests/stub_stat.cc \
        store_rebuild.h \
        tests/stub_store_rebuild.cc \
        tests/stub_store_stats.cc \
@@ -3047,6 +3101,7 @@ tests_testUfs_SOURCES = \
        RequestFlags.cc \
        SquidList.h \
        SquidList.cc \
+       Transients.cc \
        MasterXaction.cc \
        MasterXaction.h \
        MemObject.cc \
@@ -3085,6 +3140,9 @@ tests_testUfs_SOURCES = \
        tests/stub_cache_cf.cc \
        tests/stub_helper.cc \
        cbdata.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        tests/stub_debug.cc \
        tests/stub_client_side_request.cc \
@@ -3132,7 +3190,6 @@ tests_testUfs_SOURCES = \
        tests/testStoreSupport.cc \
        tests/testStoreSupport.h \
        time.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc \
        $(DISKIO_SOURCE)
@@ -3160,8 +3217,8 @@ tests_testUfs_LDADD = \
        $(DISK_LIBS) \
        $(DISK_OS_LIBS) \
        acl/libapi.la \
-       ipc/libipc.la \
        $(SSL_LIBS) \
+       ipc/libipc.la \
        comm/libcomm.la \
        anyp/libanyp.la \
        base/libbase.la \
@@ -3195,6 +3252,8 @@ testRefCount_LDADD = \
 tests_testRock_SOURCES = \
        cbdata.cc \
        CacheDigest.h \
+       CollapsedForwarding.h \
+       CollapsedForwarding.cc \
        tests/stub_CacheDigest.cc \
        ConfigOption.cc \
        ConfigParser.cc \
@@ -3204,7 +3263,7 @@ tests_testRock_SOURCES = \
        EventLoop.cc \
        event.cc \
        fatal.h \
-       tests/stub_fatal.cc \
+       fatal.cc \
        fd.h \
        fd.cc \
        fde.h \
@@ -3251,6 +3310,7 @@ tests_testRock_SOURCES = \
        tests/stub_StatHist.cc \
        stmem.cc \
        repl_modules.h \
+       tests/stub_stat.cc \
        store.cc \
        StoreFileSystem.cc \
        StoreIOState.cc \
@@ -3263,10 +3323,15 @@ tests_testRock_SOURCES = \
        store_key_md5.cc \
        store_swapmeta.cc \
        store_swapout.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        StrList.h \
        StrList.cc \
        SwapDir.cc \
+       Transients.h \
+       Transients.cc \
        tests/testRock.cc \
        tests/testMain.cc \
        tests/testRock.h \
@@ -3307,7 +3372,6 @@ tests_testRock_SOURCES = \
        tests/stub_tools.cc \
        time.cc \
        url.cc \
-       URLScheme.cc \
        wordlist.h \
        wordlist.cc \
        $(DELAY_POOL_SOURCE) \
@@ -3333,9 +3397,10 @@ tests_testRock_LDADD = \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
+       eui/libeui.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        base/libbase.la \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3374,6 +3439,7 @@ tests_testURL_SOURCES = \
        client_side_request.cc \
        ClientInfo.h \
        clientStream.cc \
+       tests/stub_CollapsedForwarding.cc \
        ConfigOption.cc \
        ConfigParser.cc \
        CpuAffinityMap.cc \
@@ -3484,6 +3550,8 @@ tests_testURL_SOURCES = \
        RemovalPolicy.cc \
        Server.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -3520,6 +3588,7 @@ tests_testURL_SOURCES = \
        String.cc \
        StrList.h \
        StrList.cc \
+       Transients.cc \
        tests/stub_SwapDir.cc \
        MemStore.cc \
        tests/stub_debug.cc \
@@ -3531,15 +3600,15 @@ tests_testURL_SOURCES = \
        tests/stub_store_stats.cc \
        tests/testURL.cc \
        tests/testURL.h \
-       tests/testURLScheme.cc \
-       tests/testURLScheme.h \
+       tests/testUriScheme.cc \
+       tests/testUriScheme.h \
        tests/testMain.cc \
        tests/stub_time.cc \
+       tests/stub_EventLoop.cc \
        tools.h \
        tools.cc \
        tests/stub_tunnel.cc \
        url.cc \
-       URLScheme.cc \
        urn.h \
        urn.cc \
        wccp2.h \
@@ -3564,6 +3633,7 @@ tests_testURL_LDADD = \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
+       $(SSL_LIBS) \
        ipc/libipc.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
@@ -3576,7 +3646,6 @@ tests_testURL_LDADD = \
        $(REPL_OBJS) \
        $(ADAPTATION_LIBS) \
        $(ESI_LIBS) \
-       $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
@@ -3599,9 +3668,11 @@ tests_testSBuf_SOURCES= \
        tests/SBufFindTest.h \
        tests/SBufFindTest.cc \
        $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        SBufStream.h \
        tests/stub_time.cc \
-       tests/stub_mem.cc \
+       mem.cc \
        tests/stub_debug.cc \
        tests/stub_fatal.cc \
        tests/stub_HelperChildConfig.cc \
@@ -3617,16 +3688,61 @@ tests_testSBuf_SOURCES= \
 nodist_tests_testSBuf_SOURCES=$(TESTSOURCES)
 tests_testSBuf_LDFLAGS = $(LIBADD_DL)
 tests_testSBuf_LDADD=\
+       base/libbase.la \
+       libsquid.la \
+       ip/libip.la \
+       mgr/libmgr.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(REGEXLIB) \
        $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
        $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+
+tests_testSBufList_SOURCES= \
+       tests/testSBufList.h \
+       tests/testSBufList.cc \
+       tests/testMain.cc \
+       $(SBUF_SOURCE) \
+       SBufList.h \
+       SBufList.cc \
+       SBufAlgos.h \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
+       SBufStream.h \
+       tests/stub_time.cc \
+       mem.cc \
+       tests/stub_MemObject.cc \
+       tests/stub_cbdata.cc \
+       tests/stub_comm.cc \
+       tests/stub_debug.cc \
+       tests/stub_event.cc \
+       tests/stub_fatal.cc \
+       tests/stub_fd.cc \
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_cache_cf.cc \
+       tests/stub_cache_manager.cc \
+       tests/stub_store.cc \
+       tests/stub_stmem.cc \
+       tests/stub_store_stats.cc \
+       tests/stub_tools.cc \
+       SquidString.h \
+       StatCounters.cc \
+       String.cc \
+       tests/stub_wordlist.cc \
+       tests/stub_MemBuf.cc
+nodist_tests_testSBufList_SOURCES=$(TESTSOURCES)
+tests_testSBufList_LDFLAGS = $(LIBADD_DL)
+tests_testSBufList_LDADD=\
+       base/libbase.la \
        libsquid.la \
        ip/libip.la \
        mgr/libmgr.la \
-       base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
-       $(COMMON_LIBS)
-tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+       $(SQUID_CPPUNIT_LIBS) \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
@@ -3634,6 +3750,9 @@ tests_testConfigParser_SOURCES = \
        tests/stub_mem.cc \
        tests/stub_MemBuf.cc \
        tests/stub_time.cc \
+       $(SBUF_SOURCE) \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
        String.cc \
        ConfigParser.cc \
        fatal.h \