]> 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 cfe2846d0bddadc209b66e9ca82e2918016ba2f3..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
@@ -24,7 +17,12 @@ DNSSOURCE += \
 SBUF_SOURCE= \
        base/InstanceId.h \
        MemBlob.h \
-       MemBlob.cc
+       MemBlob.cc \
+       OutOfBoundsException.h \
+       SBuf.h \
+       SBuf.cc \
+       SBufExceptions.h \
+       SBufExceptions.cc
 
 LOADABLE_MODULES_SOURCES = \
        LoadableModule.h \
@@ -192,10 +190,8 @@ noinst_LTLIBRARIES = libsquid.la
 EXTRA_PROGRAMS = \
        DiskIO/DiskDaemon/diskd \
        unlinkd \
-       dnsserver \
        recv-announce \
        tests/testUfs \
-       tests/testCoss \
        tests/testRock \
        ufsdump
 
@@ -212,7 +208,6 @@ bin_PROGRAMS =
 
 
 libexec_PROGRAMS = \
-       $(DNSHELPER) \
        $(DISK_PROGRAMS) \
        $(UNLINKD)
 
@@ -422,6 +417,8 @@ squid_SOURCES = \
        LogTags.h \
        lookup_t.h \
        main.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -468,6 +465,8 @@ squid_SOURCES = \
        send-announce.h \
        send-announce.cc \
        $(SBUF_SOURCE) \
+       SBufStatsAction.h \
+       SBufStatsAction.cc \
        $(SNMP_SOURCE) \
        SquidMath.h \
        SquidMath.cc \
@@ -565,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 \
@@ -693,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..
@@ -761,7 +749,6 @@ ufsdump_LDADD = \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -784,7 +771,6 @@ ufsdump_DEPENDENCIES = \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -920,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
@@ -1002,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" \
@@ -1089,10 +1073,17 @@ check_PROGRAMS+=\
        tests/testStore \
        tests/testString \
        tests/testURL \
+       tests/testSBuf \
        tests/testConfigParser \
        tests/testStatHist \
-       tests/testVector \
-       $(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)
@@ -1177,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 \
@@ -1203,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 \
@@ -1251,6 +1242,8 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpRequestMethod.cc \
        int.h \
        int.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        SquidList.h \
        SquidList.cc \
        mem_node.cc \
@@ -1296,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 \
@@ -1337,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 \
@@ -1488,6 +1481,8 @@ tests_testCacheManager_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        mem_node.cc \
@@ -1530,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 \
@@ -1587,7 +1583,6 @@ tests_testCacheManager_LDADD = \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -1668,6 +1663,8 @@ tests_testDiskIO_SOURCES = \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
@@ -1728,6 +1725,7 @@ 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 \
@@ -1770,7 +1768,6 @@ tests_testDiskIO_LDADD = \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        libsquid.la \
        comm/libcomm.la \
        anyp/libanyp.la \
@@ -1904,6 +1901,8 @@ tests_testEvent_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -1985,6 +1984,7 @@ 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 \
@@ -2013,7 +2013,6 @@ tests_testEvent_LDADD = \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
-       $(AUTH_LIBS) \
        acl/libapi.la \
        base/libbase.la \
        libsquid.la \
@@ -2152,6 +2151,8 @@ tests_testEventLoop_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -2397,6 +2398,8 @@ tests_test_http_range_SOURCES = \
        ipcache.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemBlob.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -2687,6 +2690,8 @@ tests_testHttpRequest_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        mem_node.cc \
@@ -2860,6 +2865,8 @@ tests_testStore_SOURCES= \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        mem_node.cc \
@@ -3085,6 +3092,8 @@ tests_testUfs_SOURCES = \
        RequestFlags.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        MemObject.cc \
        StoreSwapLogData.cc \
        StoreIOState.cc \
@@ -3271,6 +3280,8 @@ tests_testRock_SOURCES = \
        int.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        Mem.h \
        mem.cc \
        MemBuf.cc \
@@ -3318,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 \
@@ -3333,6 +3344,7 @@ tests_testRock_SOURCES = \
        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 \
@@ -3374,7 +3386,6 @@ tests_testRock_LDADD = \
        acl/libapi.la \
        acl/libstate.la \
        ipc/libipc.la \
-       mgr/libmgr.la \
        base/libbase.la \
        $(SSL_LIBS) \
        $(top_builddir)/lib/libmisccontainers.la \
@@ -3389,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_libeui.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 \
-       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 = \
@@ -3655,6 +3502,8 @@ tests_testURL_SOURCES = \
        internal.cc \
        SquidList.h \
        SquidList.cc \
+       MasterXaction.cc \
+       MasterXaction.h \
        multicast.h \
        multicast.cc \
        Mem.h \
@@ -3801,6 +3650,42 @@ tests_testURL_DEPENDENCIES = \
        $(REPL_OBJS) \
        $(SQUID_CPPUNIT_LA)
 
+tests_testSBuf_SOURCES= \
+       tests/testSBuf.h \
+       tests/testSBuf.cc \
+       tests/testMain.cc \
+       tests/SBufFindTest.h \
+       tests/SBufFindTest.cc \
+       $(SBUF_SOURCE) \
+       SBufStream.h \
+       time.cc \
+       mem.cc \
+       tests/stub_debug.cc \
+       tests/stub_fatal.cc \
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_cache_cf.cc \
+       tests/stub_cache_manager.cc \
+       tests/stub_store.cc \
+       tests/stub_store_stats.cc \
+       tests/stub_tools.cc \
+       SquidString.h \
+       String.cc \
+       wordlist.cc \
+       MemBuf.cc
+nodist_tests_testSBuf_SOURCES=$(TESTSOURCES)
+tests_testSBuf_LDFLAGS = $(LIBADD_DL)
+tests_testSBuf_LDADD=\
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(COMPAT_LIB) \
+       libsquid.la \
+       ip/libip.la \
+       mgr/libmgr.la \
+       base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMMON_LIBS)
+tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
        Mem.h \
Mirror of https://github.com/squid-cache/squid.git