]> git.ipfire.org Git - thirdparty/squid.git/blobdiff - src/Makefile.am
projects / thirdparty / squid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Broken: define and use stub_libauth.cc
[thirdparty/squid.git] / src / Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 55cd36eb338d802748ca6b118fc9dc99828eb83d..f71c61444c95e57fb4a26e4bef77944d3fad4a55 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,15 +8,8 @@ include $(top_srcdir)/src/Common.am
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-if ENABLE_DNSHELPER
-DNSSOURCE = dns.cc
-DNSHELPER = dnsserver
-else
-DNSSOURCE = dns_internal.cc
-DNSHELPER =
-endif
-
-DNSSOURCE += \
+DNSSOURCE = \
+       dns_internal.cc \
        SquidDns.h \
        DnsLookupDetails.h \
        DnsLookupDetails.cc
@@ -28,7 +21,6 @@ SBUF_SOURCE= \
        OutOfBoundsException.h \
        SBuf.h \
        SBuf.cc \
-       SBuf.cci \
        SBufExceptions.h \
        SBufExceptions.cc
 
@@ -86,7 +78,7 @@ if USE_ESI
 SUBDIRS += esi
 ESI_LOCAL_LIBS = \
        esi/libesi.la \
-       $(top_builddir)/lib/libTrie/src/libTrie.a
+       $(top_builddir)/lib/libTrie/libTrie.a
 ESI_LIBS = $(ESI_LOCAL_LIBS) \
        $(XMLLIB) \
        $(EXPATLIB)
@@ -198,10 +190,8 @@ noinst_LTLIBRARIES = libsquid.la
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \
        unlinkd \
-       dnsserver \
        recv-announce \
        tests/testUfs \
-       tests/testCoss \
        tests/testRock \
        ufsdump
 
@@ -218,7 +208,6 @@ bin_PROGRAMS =
 
 
 libexec_PROGRAMS = \
-       $(DNSHELPER) \
        $(DISK_PROGRAMS) \
        $(UNLINKD)
 
@@ -355,12 +344,12 @@ squid_SOURCES = \
        fde.h \
        FileMap.h \
        filemap.cc \
-       forward.cc \
-       forward.h \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        Generic.h \
        globals.h \
        gopher.h \
@@ -428,6 +417,8 @@ squid_SOURCES = \
        LogTags.h \
        lookup_t.h \
        main.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -474,6 +465,8 @@ squid_SOURCES = \
        send-announce.h \
        send-announce.cc \
        $(SBUF_SOURCE) \
+       SBufStatsAction.h \
+       SBufStatsAction.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -571,11 +564,6 @@ EXTRA_squid_SOURCES = \
        $(all_AUTHMODULES) \
        ConfigOption.h \
        $(DELAY_POOL_ALL_SOURCE) \
-       dns.cc \
-       dnsserver.cc \
-       dns_internal.cc \
-       DnsLookupDetails.cc \
-       DnsLookupDetails.h \
        htcp.cc \
        htcp.h \
        ipc.cc \
@@ -621,7 +609,6 @@ squid_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        $(DISK_LIBS) \
@@ -700,12 +687,6 @@ unlinkd_LDADD = \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 
-## dnsserver is a standalone helper. Do not link to any internal libraries
-dnsserver_SOURCES = dnsserver.cc
-dnsserver_LDADD = \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-
 recv_announce_SOURCES = recv-announce.cc
 
 ## What requires what..
@@ -768,7 +749,6 @@ ufsdump_LDADD = \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -791,7 +771,6 @@ ufsdump_DEPENDENCIES = \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -927,7 +906,6 @@ DEFAULT_PREFIX              = $(prefix)
 DEFAULT_CONFIG_DIR     = $(sysconfdir)
 DEFAULT_CONFIG_FILE    = $(DEFAULT_CONFIG_DIR)/squid.conf
 DEFAULT_MIME_TABLE     = $(DEFAULT_CONFIG_DIR)/mime.conf
-DEFAULT_DNSSERVER      = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_SSL_CRTD       = $(libexecdir)/`echo ssl_crtd  | sed '$(transform);s/$$/$(EXEEXT)/'`
 DEFAULT_LOG_PREFIX     = $(DEFAULT_LOG_DIR)
 DEFAULT_CACHE_LOG      = $(DEFAULT_LOG_PREFIX)/cache.log
@@ -985,7 +963,7 @@ test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key
 cache_cf.o: cf_parser.cci
 
 # cf_gen builds the configuration files.
-cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+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
 
 # squid.conf.default is built by cf_gen when making cf_parser.cci
@@ -995,7 +973,9 @@ squid.conf.default squid.conf.documented: cf_parser.cci
 cf_parser.cci: cf.data cf_gen$(EXEEXT)
        ./cf_gen$(EXEEXT) cf.data $(srcdir)/cf.data.depend
 
-cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
+# The cf_gen_defines.cci is auto-generated and does not exist when the 
+# dependencies computed. We need to add its include files (autoconf.h) here
+cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre $(top_builddir)/include/autoconf.h
        $(AWK) -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >$@ || ($(RM) -f $@ && exit 1)
 
 
@@ -1007,7 +987,6 @@ cf.data: cf.data.pre Makefile
        -e "s%[@]DEFAULT_ICP_PORT[@]%$(DEFAULT_ICP_PORT)%g" \
        -e "s%[@]DEFAULT_CACHE_EFFECTIVE_USER[@]%$(CACHE_EFFECTIVE_USER)%g" \
        -e "s%[@]DEFAULT_MIME_TABLE[@]%$(DEFAULT_MIME_TABLE)%g" \
-       -e "s%[@]DEFAULT_DNSSERVER[@]%$(DEFAULT_DNSSERVER)%g" \
        -e "s%[@]DEFAULT_SSL_CRTD[@]%$(DEFAULT_SSL_CRTD)%g" \
        -e "s%[@]DEFAULT_UNLINKD[@]%$(DEFAULT_UNLINKD)%g" \
        -e "s%[@]DEFAULT_PINGER[@]%$(DEFAULT_PINGER)%g" \
@@ -1097,7 +1076,14 @@ check_PROGRAMS+=\
        tests/testSBuf \
        tests/testConfigParser \
        tests/testStatHist \
-       $(STORE_TESTS)
+       tests/testVector
+
+if HAVE_FS_ROCK
+check_PROGRAMS += tests/testRock
+endif
+if HAVE_FS_UFS
+check_PROGRAMS += tests/testUfs
+endif
 
 ## NP: required to run the above list. check_PROGRAMS only builds the binaries...
 TESTS += $(check_PROGRAMS)
@@ -1182,6 +1168,7 @@ tests_testHttpReply_SOURCES=\
        tests/stub_errorpage.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_libformat.cc \
+       tests/stub_libauth.cc \
        StatCounters.h \
        StatCounters.cc \
        StatHist.h \
@@ -1208,7 +1195,6 @@ tests_testHttpReply_LDADD=\
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        anyp/libanyp.la \
        ip/libip.la \
        base/libbase.la \
@@ -1256,6 +1242,8 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpRequestMethod.cc \
        int.h \
        int.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        SquidList.h \
        SquidList.cc \
        mem_node.cc \
@@ -1291,6 +1279,7 @@ tests_testACLMaxUserIP_SOURCES= \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
+       tests/stub_client_side.cc \
        tests/stub_debug.cc \
        tests/stub_DelayId.cc \
        tests/stub_DiskIOModule.cc \
@@ -1300,6 +1289,7 @@ tests_testACLMaxUserIP_SOURCES= \
        tests/stub_HttpRequest.cc \
        tests/stub_HttpReply.cc \
        tests/stub_ipc_TypedMsgHdr.cc \
+       tests/stub_libauth.cc \
        tests/stub_libcomm.cc \
        tests/stub_libformat.cc \
        tests/stub_libsslsquid.cc \
@@ -1341,7 +1331,6 @@ tests_testACLMaxUserIP_LDADD= \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        anyp/libanyp.la \
        base/libbase.la \
@@ -1448,11 +1437,12 @@ tests_testCacheManager_SOURCES = \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        hier_code.h \
@@ -1491,9 +1481,12 @@ tests_testCacheManager_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1532,6 +1525,7 @@ tests_testCacheManager_SOURCES = \
        StatHist.h \
        StrList.h \
        StrList.cc \
+       tests/stub_libauth.cc \
        tests/stub_StatHist.cc \
        stmem.cc \
        repl_modules.h \
@@ -1588,15 +1582,14 @@ tests_testCacheManager_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        comm/libcomm.la \
+       eui/libeui.la \
        icmp/libicmp.la icmp/libicmp-core.la \
        log/liblog.la \
        format/libformat.la \
@@ -1670,6 +1663,8 @@ tests_testDiskIO_SOURCES = \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
@@ -1730,6 +1725,8 @@ tests_testDiskIO_SOURCES = \
        tests/stub_internal.cc \
        tests/stub_ipc.cc \
        tests/stub_ipcache.cc \
+    tests/stub_libauth.cc \
+       tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        tests/stub_libicmp.cc \
        tests/stub_MemStore.cc \
@@ -1770,9 +1767,7 @@ tests_testDiskIO_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        libsquid.la \
        comm/libcomm.la \
        anyp/libanyp.la \
@@ -1857,11 +1852,12 @@ tests_testEvent_SOURCES = \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
@@ -1905,9 +1901,12 @@ tests_testEvent_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -1985,6 +1984,8 @@ tests_testEvent_SOURCES = \
        tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+    tests/stub_libauth.cc \
+       tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        tools.h \
@@ -2011,9 +2012,7 @@ tests_testEvent_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -2103,11 +2102,12 @@ tests_testEventLoop_SOURCES = \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
@@ -2151,6 +2151,9 @@ tests_testEventLoop_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        Mem.h \
@@ -2231,6 +2234,7 @@ tests_testEventLoop_SOURCES = \
        tests/testMain.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        tools.h \
@@ -2257,7 +2261,6 @@ tests_testEventLoop_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2346,11 +2349,12 @@ tests_test_http_range_SOURCES = \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
@@ -2394,6 +2398,9 @@ tests_test_http_range_SOURCES = \
        ipcache.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        Mem.h \
@@ -2470,6 +2477,7 @@ tests_test_http_range_SOURCES = \
        SwapDir.cc \
        tests/test_http_range.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libeui.cc \
        tests/stub_main_cc.cc \
        tests/stub_MemStore.cc \
        tests/stub_store_stats.cc \
@@ -2497,7 +2505,6 @@ tests_test_http_range_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2593,6 +2600,7 @@ tests_testHttpRequest_SOURCES = \
        tests/stub_DiskIOModule.cc \
        tests/stub_main_cc.cc \
        tests/stub_ipc_Forwarder.cc \
+       tests/stub_libeui.cc \
        tests/stub_store_stats.cc \
        time.cc \
        BodyPipe.cc \
@@ -2639,11 +2647,12 @@ tests_testHttpRequest_SOURCES = \
        fd.h \
        fd.cc \
        fde.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
@@ -2681,9 +2690,12 @@ tests_testHttpRequest_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -2775,7 +2787,6 @@ tests_testHttpRequest_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -2854,6 +2865,8 @@ tests_testStore_SOURCES= \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -2908,6 +2921,7 @@ tests_testStore_SOURCES= \
        tests/stub_helper.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_http.cc \
+       tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        HttpBody.h \
        HttpBody.cc \
@@ -2956,7 +2970,6 @@ tests_testStore_LDADD= \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -3027,7 +3040,6 @@ SWAP_TEST_DS =\
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -3049,6 +3061,7 @@ tests_testUfs_SOURCES = \
        tests/stub_HelperChildConfig.cc \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
+       tests/stub_libeui.cc \
        tests/stub_MemStore.cc \
        tests/stub_pconn.cc \
        tests/stub_Port.cc \
@@ -3079,6 +3092,8 @@ tests_testUfs_SOURCES = \
        RequestFlags.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemObject.cc \
        StoreSwapLogData.cc \
        StoreIOState.cc \
@@ -3182,7 +3197,6 @@ tests_testUfs_LDADD = \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
-       eui/libeui.la \
        acl/libstate.la \
        $(AUTH_LIBS) \
        acl/libapi.la \
@@ -3266,6 +3280,8 @@ tests_testRock_SOURCES = \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        MemBuf.cc \
@@ -3313,8 +3329,8 @@ tests_testRock_SOURCES = \
        cache_cf.h \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
-       tests/stub_cache_manager.cc \
        client_db.h \
+       tests/stub_cache_manager.cc \
        tests/stub_client_db.cc \
        tests/stub_client_side_request.cc \
        tests/stub_debug.cc \
@@ -3325,8 +3341,10 @@ tests_testRock_SOURCES = \
        tests/stub_icp.cc \
        tests/stub_ipc.cc \
        tests/stub_ipcache.cc \
+       tests/stub_libeui.cc \
        tests/stub_libformat.cc \
        tests/stub_libicmp.cc \
+       tests/stub_libmgr.cc \
        tests/stub_MemStore.cc \
        mime.h \
        tests/stub_mime.cc \
@@ -3367,9 +3385,7 @@ tests_testRock_LDADD = \
        acl/libacls.la \
        acl/libapi.la \
        acl/libstate.la \
-       eui/libeui.la \
        ipc/libipc.la \
-       mgr/libmgr.la \
        base/libbase.la \
        $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
@@ -3384,170 +3400,6 @@ tests_testRock_LDFLAGS = $(INCLUDES) $(LIBADD_DL)
 tests_testRock_DEPENDENCIES = \
        $(SWAP_TEST_DS)
 
-tests_testCoss_SOURCES = \
-       tests/testCoss.cc \
-       tests/testMain.cc \
-       tests/testCoss.h \
-       tests/stub_cache_manager.cc \
-       client_db.h \
-       tests/stub_client_db.cc \
-       tests/stub_debug.cc \
-       tests/stub_HelperChildConfig.cc \
-       internal.h \
-       tests/stub_internal.cc \
-       tests/stub_ipc.cc \
-       tests/stub_pconn.cc \
-       store_rebuild.h \
-       tests/stub_store_rebuild.cc \
-       tests/stub_store_stats.cc \
-       fatal.h \
-       tests/stub_fatal.cc \
-       fd.h \
-       fd.cc \
-       fde.h \
-       fde.cc \
-       disk.h \
-       disk.cc \
-       FileMap.h \
-       filemap.cc \
-       HttpBody.h \
-       HttpBody.cc \
-       HttpReply.cc \
-       int.h \
-       int.cc \
-       SquidList.h \
-       SquidList.cc \
-       MemObject.cc \
-       StoreSwapLogData.cc \
-       StoreIOState.cc \
-       StoreMeta.cc \
-       StoreMetaMD5.cc \
-       StoreMetaSTD.cc \
-       StoreMetaSTDLFS.cc \
-       StoreMetaUnpacker.cc \
-       StoreMetaURL.cc \
-       StoreMetaVary.cc \
-       StoreFileSystem.cc \
-       store_io.cc \
-       store_swapout.cc \
-       store_swapmeta.cc \
-       $(UNLINKDSOURCE) \
-       $(WIN32_SOURCE) \
-       event.cc \
-       $(DELAY_POOL_SOURCE) \
-       CacheDigest.h \
-       CacheDigest.cc \
-       ConfigParser.cc \
-       EventLoop.cc \
-       HttpMsg.cc \
-       RemovalPolicy.cc \
-       store_dir.cc \
-       repl_modules.h \
-       store.cc \
-       HttpRequestMethod.cc \
-       store_key_md5.h \
-       store_key_md5.cc \
-       Parsing.cc \
-       ConfigOption.cc \
-       SwapDir.cc \
-       tests/stub_acl.cc \
-       cache_cf.h \
-       YesNoNone.h \
-       tests/stub_cache_cf.cc \
-       tests/stub_helper.cc \
-       cbdata.cc \
-       String.cc \
-       tests/stub_client_side_request.cc \
-       tests/stub_http.cc \
-       mem_node.cc \
-       stmem.cc \
-       mime.h \
-       tests/stub_mime.cc \
-       HttpHeaderFieldInfo.h \
-       HttpHeaderTools.h \
-       HttpHeaderTools.cc \
-       HttpHeader.h \
-       HttpHeader.cc \
-       Mem.h \
-       mem.cc \
-       ClientInfo.h \
-       MemBuf.cc \
-       HttpHdrContRange.cc \
-       Packer.cc \
-       HttpHeaderFieldStat.h \
-       HttpHdrCc.h \
-       HttpHdrCc.cc \
-       HttpHdrCc.cci \
-       HttpHdrSc.cc \
-       HttpHdrScTarget.cc \
-       url.cc \
-       StatCounters.h \
-       StatCounters.cc \
-       StatHist.h \
-       tests/stub_StatHist.cc \
-       tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc \
-       log/access_log.h \
-       tests/stub_access_log.cc \
-       refresh.h \
-       refresh.cc \
-       tests/stub_MemStore.cc \
-       tests/stub_Port.cc \
-       tests/stub_store_client.cc \
-       tests/stub_store_stats.cc \
-       tools.h \
-       tests/stub_tools.cc \
-       tests/stub_UdsOp.cc \
-       tests/testStoreSupport.cc \
-       tests/testStoreSupport.h \
-       time.cc \
-       URLScheme.cc \
-       wordlist.h \
-       wordlist.cc \
-       $(DISKIO_SOURCE)
-
-nodist_tests_testCoss_SOURCES = \
-       swap_log_op.cc \
-       SquidMath.cc \
-       SquidMath.h \
-       $(TESTSOURCES) \
-       $(DISKIO_GEN_SOURCE)
-tests_testCoss_LDADD = \
-       anyp/libanyp.la \
-       libsquid.la \
-       $(REGEXLIB) \
-       $(AUTH_ACL_LIBS) \
-       ident/libident.la \
-       acl/libacls.la \
-       eui/libeui.la \
-       acl/libstate.la \
-       $(AUTH_LIBS) \
-       acl/libapi.la \
-       libsquid.la \
-       comm/libcomm.la \
-       ip/libip.la \
-       fs/libfs.la \
-       mgr/libmgr.la \
-       $(REPL_OBJS) \
-       $(DISK_LIBS) \
-       $(DISK_OS_LIBS) \
-       $(COMMON_LIBS) \
-       $(SSL_LIBS) \
-       acl/libapi.la \
-       ipc/libipc.la \
-       base/libbase.la \
-       $(top_builddir)/lib/libmisccontainers.la \
-       $(top_builddir)/lib/libmiscencoding.la \
-       $(top_builddir)/lib/libmiscutil.la \
-       $(SQUID_CPPUNIT_LIBS) \
-       $(REGEXLIB) \
-       $(SSLLIB) \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-tests_testCoss_LDFLAGS = $(LIBADD_DL)
-tests_testCoss_DEPENDENCIES = \
-       $(SWAP_TEST_DS)
-
 ## Tests of the URL module.
 ## TODO: Trim this down once the insanity is over.
 tests_testURL_SOURCES = \
@@ -3601,11 +3453,12 @@ tests_testURL_SOURCES = \
        fde.cc \
        FileMap.h \
        filemap.cc \
-       forward.cc \
        fqdncache.h \
        fqdncache.cc \
        ftp.h \
        ftp.cc \
+       FwdState.cc \
+       FwdState.h \
        gopher.h \
        gopher.cc \
        helper.cc \
@@ -3649,11 +3502,14 @@ tests_testURL_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        Mem.h \
        mem.cc \
        mem_node.cc \
+       MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
        mime.h \
@@ -3910,6 +3766,21 @@ tests_testStatHist_LDADD = \
        $(COMPAT_LIB)
 tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
 
+tests_testVector_SOURCES = \
+       tests/testVector.cc \
+       tests/testMain.cc \
+       tests/testVector.h \
+       time.cc
+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
 
Mirror of https://github.com/squid-cache/squid.git