From: squidadm Date: Sat, 20 Jun 2020 21:05:22 +0000 (+0000) Subject: Source Format Enforcement (#665) X-Git-Tag: 4.15-20210522-snapshot~91 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa5639dc31d5a12e5a7e25706985331182df1095;p=thirdparty%2Fsquid.git Source Format Enforcement (#665) Does not contain astyle-driven changes. Makefile changes are what commit 2a06115 mistakenly claimed to contain. --- diff --git a/compat/Makefile.am b/compat/Makefile.am index 9ecfe3bb79..7141d627ab 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -16,25 +16,25 @@ include $(top_srcdir)/src/Common.am noinst_LTLIBRARIES = libcompatsquid.la libcompatsquid_la_SOURCES = \ + GnuRegex.c \ + GnuRegex.h \ assert.cc \ assert.h \ cmsg.h \ compat.cc \ compat.h \ compat_shared.h \ - cpu.h \ cppunit.h \ + cpu.h \ debug.cc \ debug.h \ - eui64_aton.h \ eui64_aton.c \ + eui64_aton.h \ fdsetsize.h \ getaddrinfo.cc \ getaddrinfo.h \ getnameinfo.cc \ getnameinfo.h \ - GnuRegex.c \ - GnuRegex.h \ inet_ntop.cc \ inet_ntop.h \ inet_pton.cc \ @@ -42,19 +42,37 @@ libcompatsquid_la_SOURCES = \ initgroups.h \ memrchr.cc \ memrchr.h \ + mswindows.cc \ openssl.h \ + os/aix.h \ + os/android.h \ + os/dragonfly.h \ + os/freebsd.h \ + os/hpux.h \ + os/linux.h \ + os/macosx.h \ + os/mswindows.h \ + os/netbsd.h \ + os/next.h \ + os/openbsd.h \ + os/opensolaris_10_netdb.h \ + os/os2.h \ + os/qnx.h \ + os/sgi.h \ + os/solaris.h \ + os/sunos.h \ osdetect.h \ psignal.h \ shm.cc \ shm.h \ - statvfs.h \ statvfs.cc \ + statvfs.h \ stdio.h \ stdvarargs.h \ + strnrchr.c \ + strnrchr.h \ strnstr.cc \ strtoll.h \ - strnrchr.h \ - strnrchr.c \ tempnam.h \ types.h \ valgrind.h \ @@ -66,35 +84,16 @@ libcompatsquid_la_SOURCES = \ xstring.cc \ xstring.h \ xstrto.cc \ - xstrto.h \ - \ - os/aix.h \ - os/android.h \ - os/dragonfly.h \ - os/freebsd.h \ - os/hpux.h \ - os/linux.h \ - os/macosx.h \ - os/mswindows.h \ - mswindows.cc \ - os/netbsd.h \ - os/next.h \ - os/openbsd.h \ - os/opensolaris_10_netdb.h \ - os/os2.h \ - os/qnx.h \ - os/sgi.h \ - os/solaris.h \ - os/sunos.h + xstrto.h libcompatsquid_la_LIBADD= $(LTLIBOBJS) check_PROGRAMS += testPreCompiler TESTS += testPreCompiler -testPreCompiler_SOURCES= \ - testPreCompiler.h \ - testPreCompiler.cc +testPreCompiler_SOURCES = \ + testPreCompiler.cc \ + testPreCompiler.h testPreCompiler_LDADD= $(LIBCPPUNIT_LIBS) testPreCompiler_LDFLAGS= diff --git a/lib/Makefile.am b/lib/Makefile.am index 370ac8d501..4f6745b39a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -66,13 +66,13 @@ libmisccontainers_la_SOURCES = \ hash.cc libmiscutil_la_SOURCES = \ + $(SNPRINTFSOURCE) \ + Splay.cc \ getfullhostname.c \ heap.c \ iso3307.c \ radix.c \ rfc1123.c \ - $(SNPRINTFSOURCE) \ - Splay.cc \ stub_memaccount.c \ util.c \ xusleep.c @@ -81,9 +81,9 @@ TESTS += tests/testRFC1738 check_PROGRAMS += tests/testRFC1738 -tests_testRFC1738_SOURCES= \ - tests/testRFC1738.h \ - tests/testRFC1738.cc +tests_testRFC1738_SOURCES = \ + tests/testRFC1738.cc \ + tests/testRFC1738.h tests_testRFC1738_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/lib/libTrie/Makefile.am b/lib/libTrie/Makefile.am index 29df8fc132..5257647eb1 100644 --- a/lib/libTrie/Makefile.am +++ b/lib/libTrie/Makefile.am @@ -15,8 +15,9 @@ noinst_LIBRARIES = libTrie.a noinst_HEADERS = Trie.h TrieNode.h TrieCharTransform.h -libTrie_a_SOURCES = Trie.cc \ +libTrie_a_SOURCES = \ + Trie.cc \ Trie.h \ + TrieCharTransform.h \ TrieNode.cc \ - TrieNode.h \ - TrieCharTransform.h + TrieNode.h diff --git a/lib/rfcnb/Makefile.am b/lib/rfcnb/Makefile.am index cfe0ec6f63..1686b09d4d 100644 --- a/lib/rfcnb/Makefile.am +++ b/lib/rfcnb/Makefile.am @@ -13,14 +13,13 @@ noinst_LTLIBRARIES = librfcnb.la librfcnb_la_SOURCES = \ byteorder.h \ - rfcnb.h \ rfcnb-common.h \ rfcnb-error.h \ - rfcnb-priv.h \ - rfcnb-util.h \ - rfcnb-io.h \ rfcnb-io.c \ + rfcnb-io.h \ + rfcnb-priv.h \ rfcnb-util.c \ rfcnb-util.h \ + rfcnb.h \ session.c \ std-includes.h diff --git a/lib/smblib/Makefile.am b/lib/smblib/Makefile.am index 1a7918ab71..6f0e22baa6 100644 --- a/lib/smblib/Makefile.am +++ b/lib/smblib/Makefile.am @@ -14,13 +14,13 @@ noinst_LTLIBRARIES = libsmblib.la libsmblib_la_SOURCES = \ md4.c \ md4.h \ - smblib.c \ - smblib.h \ + smbdes.c \ + smbdes.h \ + smbencrypt.c \ + smbencrypt.h \ smblib-common.h \ smblib-priv.h \ smblib-util.c \ - smbencrypt.c \ - smbencrypt.h \ - smbdes.c \ - smbdes.h \ + smblib.c \ + smblib.h \ std-defines.h diff --git a/lib/snmplib/Makefile.am b/lib/snmplib/Makefile.am index c29257e669..31d4331851 100644 --- a/lib/snmplib/Makefile.am +++ b/lib/snmplib/Makefile.am @@ -17,11 +17,18 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include noinst_LTLIBRARIES = libsnmplib.la -libsnmplib_la_SOURCES = asn1.c parse.c snmp_vars.c \ - coexistance.c snmp_api.c snmp_error.c \ - mib.c snmp_api_error.c \ +libsnmplib_la_SOURCES = \ + asn1.c \ + coexistance.c \ + mib.c \ + parse.c \ + snmp_api.c \ + snmp_api_error.c \ + snmp_error.c \ snmp_msg.c \ - snmp_pdu.c snmplib_debug.c + snmp_pdu.c \ + snmp_vars.c \ + snmplib_debug.c VERSION = 3.4 DEFS = -DSQUID_SNMP=1 diff --git a/src/DiskIO/AIO/Makefile.am b/src/DiskIO/AIO/Makefile.am index c09be953a5..a8283978eb 100644 --- a/src/DiskIO/AIO/Makefile.am +++ b/src/DiskIO/AIO/Makefile.am @@ -11,13 +11,13 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libAIO.la libAIO_la_SOURCES = \ - async_io.h \ AIODiskFile.cc \ AIODiskFile.h \ AIODiskIOModule.cc \ AIODiskIOModule.h \ AIODiskIOStrategy.cc \ - AIODiskIOStrategy.h + AIODiskIOStrategy.h \ + async_io.h if ENABLE_WIN32_AIO libAIO_la_SOURCES += \ diff --git a/src/DiskIO/DiskDaemon/Makefile.am b/src/DiskIO/DiskDaemon/Makefile.am index 20ec9b1963..6ab279f64f 100644 --- a/src/DiskIO/DiskDaemon/Makefile.am +++ b/src/DiskIO/DiskDaemon/Makefile.am @@ -12,15 +12,15 @@ noinst_LTLIBRARIES = libDiskDaemon.la libexec_PROGRAMS = diskd libDiskDaemon_la_SOURCES = \ - diomsg.h \ + DiskDaemonDiskIOModule.cc \ + DiskDaemonDiskIOModule.h \ DiskdAction.cc \ DiskdAction.h \ DiskdFile.cc \ DiskdFile.h \ DiskdIOStrategy.cc \ DiskdIOStrategy.h \ - DiskDaemonDiskIOModule.cc \ - DiskDaemonDiskIOModule.h + diomsg.h diskd_SOURCES = diskd.cc nodist_diskd_SOURCES = time.cc diff --git a/src/DiskIO/DiskThreads/Makefile.am b/src/DiskIO/DiskThreads/Makefile.am index 52d933a1f4..2618e30c7f 100644 --- a/src/DiskIO/DiskThreads/Makefile.am +++ b/src/DiskIO/DiskThreads/Makefile.am @@ -11,7 +11,6 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libDiskThreads.la libDiskThreads_la_SOURCES = \ - async_io.cc \ CommIO.cc \ CommIO.h \ DiskThreads.h \ @@ -20,7 +19,8 @@ libDiskThreads_la_SOURCES = \ DiskThreadsDiskIOModule.cc \ DiskThreadsDiskIOModule.h \ DiskThreadsIOStrategy.cc \ - DiskThreadsIOStrategy.h + DiskThreadsIOStrategy.h \ + async_io.cc if ENABLE_WIN32_AIOPS libDiskThreads_la_SOURCES += aiops_win32.cc diff --git a/src/HttpUpgradeProtocolAccess.cc b/src/HttpUpgradeProtocolAccess.cc index 212119a9ce..e8a8de5e36 100644 --- a/src/HttpUpgradeProtocolAccess.cc +++ b/src/HttpUpgradeProtocolAccess.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2019 The Squid Software Foundation and contributors + * Copyright (C) 1996-2020 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/HttpUpgradeProtocolAccess.h b/src/HttpUpgradeProtocolAccess.h index 3721c7256b..c232ccee29 100644 --- a/src/HttpUpgradeProtocolAccess.h +++ b/src/HttpUpgradeProtocolAccess.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2019 The Squid Software Foundation and contributors + * Copyright (C) 1996-2020 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/Makefile.am b/src/Makefile.am index 89748f9263..5caacaf1f5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,10 +26,10 @@ STOREMETA_SOURCE = \ StoreMetaVary.h LOADABLE_MODULES_SOURCES = \ - LoadableModule.h \ LoadableModule.cc \ - LoadableModules.h \ - LoadableModules.cc + LoadableModule.h \ + LoadableModules.cc \ + LoadableModules.h SUBDIRS = mem base anyp helper dns ftp parser comm eui acl format clients sbuf servers fs repl store DiskIO proxyp DIST_SUBDIRS = mem base anyp helper dns ftp parser comm eui acl format clients sbuf servers fs repl store DiskIO proxyp @@ -192,67 +192,57 @@ cf_gen.$(OBJEXT): cf_gen_defines.cci AM_CPPFLAGS += -I$(top_builddir)/src -ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc +ACL_REGISTRATION_SOURCES = \ + AclRegs.cc \ + AuthReg.cc # common library for all the binaries and tests. This is kindof a catch all # and smaller libraries split from this are encouraged. Using lt convenience # libraries, dependencies should not be a problem either. libsquid_la_SOURCES = \ - comm.cc \ - comm.h \ CommCalls.cc \ CommCalls.h \ DescriptorSet.cc \ DescriptorSet.h \ + SquidConfig.cc \ SquidConfig.h \ - SquidConfig.cc + comm.cc \ + comm.h squid_SOURCES = \ $(ACL_REGISTRATION_SOURCES) \ + $(DELAY_POOL_SOURCE) \ + $(DNSSOURCE) \ + $(HTCPSOURCE) \ + $(IPC_SOURCE) \ + $(SNMP_SOURCE) \ + $(STOREMETA_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ + $(WINSVC_SOURCE) \ + $(XPROF_STATS_SOURCE) \ AccessLogEntry.cc \ AccessLogEntry.h \ AsyncEngine.cc \ AsyncEngine.h \ - cache_cf.h \ AuthReg.h \ - RefreshPattern.h \ - cache_cf.cc \ - CacheDigest.h \ + BodyPipe.cc \ + BodyPipe.h \ CacheDigest.cc \ - cache_manager.cc \ - NeighborTypeDomainList.h \ + CacheDigest.h \ + CacheManager.h \ CachePeer.cc \ CachePeer.h \ - CacheManager.h \ - carp.h \ - carp.cc \ - cbdata.cc \ - cbdata.h \ - client_db.h \ - client_db.cc \ - client_side.h \ - client_side.cc \ - client_side.h \ - client_side_reply.cc \ - client_side_reply.h \ - client_side_request.cc \ - client_side_request.h \ - ClientInfo.h \ - BodyPipe.cc \ - BodyPipe.h \ ClientInfo.h \ ClientRequestContext.h \ - clientStream.cc \ - clientStream.h \ - clientStreamForward.h \ CollapsedForwarding.cc \ CollapsedForwarding.h \ CollapsingHistory.h \ + CommRead.h \ CommandLine.cc \ CommandLine.h \ CompletionDispatcher.cc \ CompletionDispatcher.h \ - CommRead.h \ ConfigOption.cc \ ConfigParser.cc \ ConfigParser.h \ @@ -262,261 +252,271 @@ squid_SOURCES = \ CpuAffinityMap.h \ CpuAffinitySet.cc \ CpuAffinitySet.h \ - debug.cc \ Debug.h \ - defines.h \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ - dlink.h \ - dlink.cc \ - $(DNSSOURCE) \ Downloader.cc \ Downloader.h \ - enums.h \ - err_type.h \ - err_detail_type.h \ - errorpage.cc \ - errorpage.h \ ETag.cc \ ETag.h \ - event.cc \ - event.h \ - EventLoop.h \ EventLoop.cc \ - external_acl.cc \ + EventLoop.h \ ExternalACL.h \ ExternalACLEntry.cc \ ExternalACLEntry.h \ - FadingCounter.h \ FadingCounter.cc \ - fatal.h \ - fatal.cc \ - fd.h \ - fd.cc \ - fde.cc \ - fde.h \ + FadingCounter.h \ FileMap.h \ - filemap.cc \ - fqdncache.h \ - fqdncache.cc \ FwdState.cc \ FwdState.h \ Generic.h \ - globals.h \ - gopher.h \ - gopher.cc \ HappyConnOpener.cc \ HappyConnOpener.h \ - helper.cc \ - helper.h \ - hier_code.h \ HierarchyLogEntry.h \ - $(HTCPSOURCE) \ - HttpUpgradeProtocolAccess.cc \ - HttpUpgradeProtocolAccess.h \ - http.cc \ - http.h \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ + HttpBody.cc \ + HttpBody.h \ + HttpControlMsg.cc \ + HttpControlMsg.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ + HttpHdrContRange.cc \ + HttpHdrContRange.h \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrSc.h \ HttpHdrScTarget.cc \ HttpHdrScTarget.h \ - HttpHdrContRange.cc \ - HttpHdrContRange.h \ - HttpHeaderStat.h \ - HttpHeader.h \ HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ HttpHeaderMask.h \ HttpHeaderRange.h \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ + HttpHeaderStat.h \ HttpHeaderTools.cc \ - HttpBody.h \ - HttpBody.cc \ - HttpControlMsg.cc \ - HttpControlMsg.h \ + HttpHeaderTools.h \ HttpReply.cc \ HttpReply.h \ - RequestFlags.h \ - RequestFlags.cc \ HttpRequest.cc \ HttpRequest.h \ + HttpUpgradeProtocolAccess.cc \ + HttpUpgradeProtocolAccess.h \ ICP.h \ - icp_opcode.h \ - icp_v2.cc \ - icp_v3.cc \ - Instance.h \ Instance.cc \ - int.h \ - int.cc \ - internal.h \ - internal.cc \ - $(IPC_SOURCE) \ - ipcache.cc \ - ipcache.h \ + Instance.h \ + IoStats.h \ LogTags.cc \ LogTags.h \ - lookup_t.h \ - main.cc \ MasterXaction.cc \ MasterXaction.h \ - mem_node.cc \ - mem_node.h \ MemBuf.cc \ MemObject.cc \ MemObject.h \ + MemStore.cc \ + MemStore.h \ MessageSizes.h \ - mime.h \ - mime.cc \ - mime_header.h \ - mime_header.cc \ - multicast.h \ - multicast.cc \ - neighbors.h \ - neighbors.cc \ - Notes.h \ + NeighborTypeDomainList.h \ Notes.cc \ + Notes.h \ Parsing.cc \ Parsing.h \ - $(XPROF_STATS_SOURCE) \ - pconn.cc \ - pconn.h \ PeerDigest.h \ - peer_digest.cc \ - peer_proxy_negotiate_auth.h \ - peer_proxy_negotiate_auth.cc \ - peer_select.cc \ - peer_sourcehash.h \ - peer_sourcehash.cc \ - peer_userhash.h \ - peer_userhash.cc \ - PeerPoolMgr.h \ PeerPoolMgr.cc \ + PeerPoolMgr.h \ PeerSelectState.h \ PingData.h \ Pipeline.cc \ Pipeline.h \ - protos.h \ - redirect.h \ - redirect.cc \ - refresh.h \ - refresh.cc \ + RefreshPattern.h \ RemovalPolicy.cc \ RemovalPolicy.h \ + RequestFlags.cc \ + RequestFlags.h \ ResolvedPeers.cc \ ResolvedPeers.h \ - send-announce.h \ - send-announce.cc \ - SBufStatsAction.h \ SBufStatsAction.cc \ - sbuf/StringConvert.h \ - $(SNMP_SOURCE) \ - SquidMath.h \ + SBufStatsAction.h \ SquidMath.cc \ + SquidMath.h \ SquidNew.cc \ - IoStats.h \ - stat.h \ - stat.cc \ - StatCounters.h \ StatCounters.cc \ - StatHist.h \ + StatCounters.h \ StatHist.cc \ - String.cc \ - StrList.h \ - StrList.cc \ - stmem.cc \ - stmem.h \ - repl_modules.h \ - store.cc \ + StatHist.h \ Store.h \ + StoreClient.h \ StoreFileSystem.cc \ StoreFileSystem.h \ - store_io.cc \ StoreIOBuffer.h \ StoreIOState.cc \ StoreIOState.h \ - store_client.cc \ - StoreClient.h \ - store_digest.h \ - store_digest.cc \ - store_key_md5.h \ - store_key_md5.cc \ - store_log.h \ - store_log.cc \ - store_rebuild.h \ - store_rebuild.cc \ - store_swapin.h \ - store_swapin.cc \ - store_swapmeta.cc \ - store_swapout.cc \ StoreMetaUnpacker.cc \ StoreMetaUnpacker.h \ - $(STOREMETA_SOURCE) \ StoreSearch.h \ StoreStats.cc \ StoreStats.h \ StoreSwapLogData.cc \ StoreSwapLogData.h \ - swap_log_op.h \ + StrList.cc \ + StrList.h \ + String.cc \ + TimeOrTag.h \ Transients.cc \ Transients.h \ - MemStore.cc \ - MemStore.h \ - time.cc \ - TimeOrTag.h \ - tools.h \ - tools.cc \ - tunnel.cc \ - typedefs.h \ - $(UNLINKDSOURCE) \ - urn.h \ - urn.cc \ - wccp.h \ - wccp.cc \ - wccp2.h \ - wccp2.cc \ - whois.h \ - whois.cc \ - wordlist.h \ - wordlist.cc \ - XactionInitiator.h \ XactionInitiator.cc \ + XactionInitiator.h \ XactionStep.h \ - $(WIN32_SOURCE) \ - $(WINSVC_SOURCE) - -EXTRA_squid_SOURCES = \ - $(all_AUTHMODULES) \ - ConfigOption.h \ - $(DELAY_POOL_ALL_SOURCE) \ - htcp.cc \ - htcp.h \ - ipc.cc \ - ipc_win32.cc \ - ProfStats.cc \ - $(SNMP_ALL_SOURCE) \ - $(UNLINKDSOURCE) \ - $(WIN32_ALL_SOURCE) \ - $(LOADABLE_MODULES_SOURCES) - -noinst_HEADERS = \ - MemBuf.h \ - SquidString.h \ - SquidTime.h - -BUILT_SOURCES = \ - cf_gen_defines.cci \ - cf_parser.cci \ - err_type.cc \ - err_detail_type.cc \ - globals.cc \ - hier_code.cc \ - icp_opcode.cc \ - lookup_t.cc \ + cache_cf.cc \ + cache_cf.h \ + cache_manager.cc \ + carp.cc \ + carp.h \ + cbdata.cc \ + cbdata.h \ + clientStream.cc \ + clientStream.h \ + clientStreamForward.h \ + client_db.cc \ + client_db.h \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_reply.h \ + client_side_request.cc \ + client_side_request.h \ + debug.cc \ + defines.h \ + dlink.cc \ + dlink.h \ + enums.h \ + err_detail_type.h \ + err_type.h \ + errorpage.cc \ + errorpage.h \ + event.cc \ + event.h \ + external_acl.cc \ + fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + fde.h \ + filemap.cc \ + fqdncache.cc \ + fqdncache.h \ + fs_io.cc \ + fs_io.h \ + globals.h \ + gopher.cc \ + gopher.h \ + helper.cc \ + helper.h \ + hier_code.h \ + http.cc \ + http.h \ + icp_opcode.h \ + icp_v2.cc \ + icp_v3.cc \ + int.cc \ + int.h \ + internal.cc \ + internal.h \ + ipcache.cc \ + ipcache.h \ + lookup_t.h \ + main.cc \ + mem_node.cc \ + mem_node.h \ + mime.cc \ + mime.h \ + mime_header.cc \ + mime_header.h \ + multicast.cc \ + multicast.h \ + neighbors.cc \ + neighbors.h \ + pconn.cc \ + pconn.h \ + peer_digest.cc \ + peer_proxy_negotiate_auth.cc \ + peer_proxy_negotiate_auth.h \ + peer_select.cc \ + peer_sourcehash.cc \ + peer_sourcehash.h \ + peer_userhash.cc \ + peer_userhash.h \ + protos.h \ + redirect.cc \ + redirect.h \ + refresh.cc \ + refresh.h \ + repl_modules.h \ + sbuf/StringConvert.h \ + send-announce.cc \ + send-announce.h \ + stat.cc \ + stat.h \ + stmem.cc \ + stmem.h \ + store.cc \ + store_client.cc \ + store_digest.cc \ + store_digest.h \ + store_io.cc \ + store_key_md5.cc \ + store_key_md5.h \ + store_log.cc \ + store_log.h \ + store_rebuild.cc \ + store_rebuild.h \ + store_swapin.cc \ + store_swapin.h \ + store_swapmeta.cc \ + store_swapout.cc \ + swap_log_op.h \ + time.cc \ + tools.cc \ + tools.h \ + tunnel.cc \ + typedefs.h \ + urn.cc \ + urn.h \ + wccp.cc \ + wccp.h \ + wccp2.cc \ + wccp2.h \ + whois.cc \ + whois.h \ + wordlist.cc \ + wordlist.h + +EXTRA_squid_SOURCES = \ + $(DELAY_POOL_ALL_SOURCE) \ + $(LOADABLE_MODULES_SOURCES) \ + $(SNMP_ALL_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_ALL_SOURCE) \ + $(all_AUTHMODULES) \ + ConfigOption.h \ + ProfStats.cc \ + htcp.cc \ + htcp.h \ + ipc.cc \ + ipc_win32.cc + +noinst_HEADERS = \ + MemBuf.h \ + SquidString.h \ + SquidTime.h + +BUILT_SOURCES = \ + cf_gen_defines.cci \ + cf_parser.cci \ + err_detail_type.cc \ + err_type.cc \ + globals.cc \ + hier_code.cc \ + icp_opcode.cc \ + lookup_t.cc \ repl_modules.cc \ swap_log_op.cc @@ -617,32 +617,32 @@ recv_announce_SOURCES = recv-announce.cc ## libbase.la wants cbdata.* ## libbase.la wants MemBuf.* ufsdump_SOURCES = \ + $(WIN32_SOURCE) \ ClientInfo.h \ - cbdata.h \ - cbdata.cc \ - debug.cc \ - int.h \ - int.cc \ - mem/forward.h \ + tests/stub_HelperChildConfig.cc \ MemBuf.cc \ MemBuf.h \ Parsing.h \ - store_key_md5.h \ - store_key_md5.cc \ + RemovalPolicy.cc \ + SquidNew.cc \ tests/stub_StoreMeta.cc \ StoreMetaUnpacker.cc \ String.cc \ - SquidNew.cc \ - tests/stub_time.cc \ - ufsdump.cc \ - dlink.h \ + cbdata.cc \ + cbdata.h \ + debug.cc \ dlink.cc \ - helper/ChildConfig.h \ - tests/stub_HelperChildConfig.cc \ - RemovalPolicy.cc \ - $(WIN32_SOURCE) \ + dlink.h \ + tests/stub_fd.cc \ fd.h \ - tests/stub_fd.cc + helper/ChildConfig.h \ + int.cc \ + int.h \ + mem/forward.h \ + store_key_md5.cc \ + store_key_md5.h \ + tests/stub_time.cc \ + ufsdump.cc ufsdump_LDADD = \ ident/libident.la \ acl/libacls.la \ @@ -940,10 +940,10 @@ tests_testLookupTable_SOURCES = \ tests/testLookupTable.cc \ tests/testLookupTable.h nodist_tests_testLookupTable_SOURCES = \ + tests/stub_SBufDetailedStats.cc \ base/LookupTable.h \ tests/stub_debug.cc \ - tests/stub_libmem.cc \ - tests/stub_SBufDetailedStats.cc + tests/stub_libmem.cc tests_testLookupTable_LDADD = \ sbuf/libsbuf.la \ base/libbase.la \ @@ -969,9 +969,9 @@ tests_testYesNoNone_SOURCES = \ tests/testYesNoNone.cc \ tests/testYesNoNone.h nodist_tests_testYesNoNone_SOURCES = \ + tests/stub_SBuf.cc \ base/YesNoNone.h \ - tests/stub_debug.cc \ - tests/stub_SBuf.cc + tests/stub_debug.cc tests_testYesNoNone_LDADD = \ base/libbase.la \ $(LIBCPPUNIT_LIBS) \ @@ -988,18 +988,18 @@ tests_testURL_SOURCES = \ tests/testUriScheme.cc \ tests/testUriScheme.h nodist_tests_testURL_SOURCES = \ - anyp/Uri.h \ - anyp/UriScheme.h \ + tests/stub_HelperChildConfig.cc \ + tests/stub_HttpHeader.cc \ + tests/stub_HttpRequest.cc \ + tests/stub_StatHist.cc \ String.cc \ tests/stub_access_log.cc \ + anyp/Uri.h \ + anyp/UriScheme.h \ tests/stub_cbdata.cc \ tests/stub_debug.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_HttpHeader.cc \ - tests/stub_HttpRequest.cc \ tests/stub_libhttp.cc \ - tests/stub_libmem.cc \ - tests/stub_StatHist.cc + tests/stub_libmem.cc tests_testURL_LDADD = \ libsquid.la \ proxyp/libproxyp.la \ @@ -1035,10 +1035,10 @@ tests_testTokenizer_SOURCES = \ tests/testTokenizer.cc \ tests/testTokenizer.h nodist_tests_testTokenizer_SOURCES = \ - parser/Tokenizer.h \ + tests/stub_StatHist.cc \ tests/stub_debug.cc \ tests/stub_libmem.cc \ - tests/stub_StatHist.cc + parser/Tokenizer.h tests_testTokenizer_LDADD = \ parser/libparser.la \ sbuf/libsbuf.la \ @@ -1052,14 +1052,14 @@ tests_testTokenizer_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testSBuf tests_testSBuf_SOURCES = \ - tests/SBufFindTest.cc \ - tests/SBufFindTest.h \ tests/testSBuf.cc \ - tests/testSBuf.h + tests/testSBuf.h \ + tests/SBufFindTest.cc \ + tests/SBufFindTest.h nodist_tests_testSBuf_SOURCES = \ + tests/stub_StatHist.cc \ tests/stub_debug.cc \ - tests/stub_libmem.cc \ - tests/stub_StatHist.cc + tests/stub_libmem.cc tests_testSBuf_LDADD = \ sbuf/libsbuf.la \ base/libbase.la \ @@ -1073,9 +1073,9 @@ tests_testSBufList_SOURCES = \ tests/testSBufList.cc \ tests/testSBufList.h nodist_tests_testSBufList_SOURCES = \ + tests/stub_StatHist.cc \ tests/stub_debug.cc \ - tests/stub_libmem.cc \ - tests/stub_StatHist.cc + tests/stub_libmem.cc tests_testSBufList_LDADD = \ sbuf/libsbuf.la \ base/libbase.la \ @@ -1089,8 +1089,8 @@ tests_testString_SOURCES = \ tests/testString.cc \ tests/testString.h nodist_tests_testString_SOURCES = \ - String.cc \ tests/stub_SBuf.cc \ + String.cc \ tests/stub_debug.cc \ tests/stub_libmem.cc tests_testString_LDADD = \ @@ -1105,133 +1105,133 @@ tests_testString_LDFLAGS = $(LIBADD_DL) if ENABLE_FS_ROCK check_PROGRAMS += tests/testRock tests_testRock_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(STOREMETA_SOURCE) \ + $(UNLINKDSOURCE) \ AccessLogEntry.cc \ AccessLogEntry.h \ - tests/stub_CachePeer.cc \ - cbdata.cc \ + tests/stub_CacheDigest.cc \ CacheDigest.h \ - CollapsedForwarding.h \ + tests/stub_CachePeer.cc \ CollapsedForwarding.cc \ - tests/stub_CacheDigest.cc \ + CollapsedForwarding.h \ ConfigOption.cc \ ConfigParser.cc \ - fs_io.h \ - fs_io.cc \ ETag.cc \ EventLoop.cc \ - event.cc \ FadingCounter.cc \ - fatal.h \ - fatal.cc \ - fd.h \ - fd.cc \ - fde.h \ - fde.cc \ FileMap.h \ - filemap.cc \ - HttpHeaderFieldStat.h \ - HttpBody.h \ + tests/stub_HelperChildConfig.cc \ HttpBody.cc \ + HttpBody.h \ HttpHdrCc.cc \ HttpHdrContRange.cc \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ - HttpHeader.h \ HttpHeader.cc \ + HttpHeader.h \ HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ + HttpHeaderFieldStat.h \ HttpHeaderTools.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - int.h \ - int.cc \ + tests/stub_HttpRequest.cc \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ MemBuf.cc \ MemObject.cc \ MemStore.cc \ - mem_node.cc \ - Notes.h \ Notes.cc \ + Notes.h \ Parsing.cc \ + tests/stub_Port.cc \ RemovalPolicy.cc \ RequestFlags.cc \ RequestFlags.h \ ResolvedPeers.cc \ ResolvedPeers.h \ - StatCounters.h \ + tests/testRock.cc \ + tests/testRock.h \ + tests/stub_SBufDetailedStats.cc \ StatCounters.cc \ - StatHist.h \ + StatCounters.h \ tests/stub_StatHist.cc \ - stmem.cc \ - repl_modules.h \ - tests/stub_stat.cc \ - store.cc \ + StatHist.h \ StoreFileSystem.cc \ StoreIOState.cc \ StoreMetaUnpacker.cc \ - $(STOREMETA_SOURCE) \ + tests/testStoreSupport.cc \ + tests/testStoreSupport.h \ StoreSwapLogData.cc \ - store_io.cc \ - store_key_md5.h \ - store_key_md5.cc \ - store_swapmeta.cc \ - store_swapout.cc \ - tests/stub_SBufDetailedStats.cc \ - String.cc \ - StrList.h \ StrList.cc \ - Transients.h \ + StrList.h \ + String.cc \ Transients.cc \ - tests/testRock.cc \ - tests/testRock.h \ - tests/testStoreSupport.cc \ - tests/testStoreSupport.h \ - log/access_log.h \ + Transients.h \ tests/stub_access_log.cc \ - cache_cf.h \ tests/stub_cache_cf.cc \ + cache_cf.h \ tests/stub_cache_manager.cc \ + cbdata.cc \ tests/stub_client_db.cc \ tests/stub_client_side_request.cc \ tests/stub_debug.cc \ tests/stub_errorpage.cc \ - tests/stub_HelperChildConfig.cc \ + event.cc \ + fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + fde.h \ + filemap.cc \ + fs_io.cc \ + fs_io.h \ tests/stub_http.cc \ - tests/stub_HttpRequest.cc \ - tests/stub_libauth.cc \ tests/stub_icp.cc \ + int.cc \ + int.h \ tests/stub_ipc.cc \ tests/stub_ipcache.cc \ + tests/stub_libanyp.cc \ + tests/stub_libauth.cc \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ tests/stub_liblog.cc \ tests/stub_libmgr.cc \ tests/stub_libsecurity.cc \ - mime.h \ + log/access_log.h \ + mem_node.cc \ tests/stub_mime.cc \ + mime.h \ tests/stub_neighbors.cc \ - tests/stub_Port.cc \ tests/stub_pconn.cc \ + repl_modules.h \ + tests/stub_stat.cc \ + stmem.cc \ + store.cc \ tests/stub_store_client.cc \ - store_rebuild.h \ + store_io.cc \ + store_key_md5.cc \ + store_key_md5.h \ tests/stub_store_rebuild.cc \ + store_rebuild.h \ tests/stub_store_stats.cc \ - tools.h \ - tests/stub_tools.cc \ + store_swapmeta.cc \ + store_swapout.cc \ time.cc \ - tests/stub_libanyp.cc \ - wordlist.h \ + tests/stub_tools.cc \ + tools.h \ wordlist.cc \ - $(DELAY_POOL_SOURCE) \ - $(UNLINKDSOURCE) + wordlist.h nodist_tests_testRock_SOURCES = \ $(TESTSOURCES) \ - hier_code.cc \ SquidMath.cc \ SquidMath.h \ + hier_code.cc \ swap_log_op.cc tests_testRock_LDADD = \ http/libhttp.la \ @@ -1276,139 +1276,139 @@ endif if ENABLE_FS_UFS check_PROGRAMS += tests/testUfs tests_testUfs_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(STOREMETA_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ AccessLogEntry.cc \ AccessLogEntry.h \ - tests/testUfs.cc \ - tests/testUfs.h \ + tests/stub_CacheDigest.cc \ + CacheDigest.h \ tests/stub_CachePeer.cc \ - tests/stub_cache_manager.cc \ - tests/stub_client_db.cc \ + ClientInfo.h \ 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_liblog.cc \ - tests/stub_neighbors.cc \ - tests/stub_pconn.cc \ - tests/stub_Port.cc \ - tests/stub_UdsOp.cc \ - internal.h \ - tests/stub_internal.cc \ - tests/stub_libformat.cc \ - tests/stub_libsecurity.cc \ - tests/stub_stat.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 \ - client_db.h \ + ConfigOption.cc \ + ConfigParser.cc \ + ETag.cc \ + EventLoop.cc \ FadingCounter.cc \ - fs_io.h \ - fs_io.cc \ FileMap.h \ - filemap.cc \ - HttpBody.h \ + tests/stub_HelperChildConfig.cc \ HttpBody.cc \ + HttpBody.h \ + HttpHdrCc.cc \ + HttpHdrCc.h \ + HttpHdrContRange.cc \ + HttpHdrRange.cc \ + HttpHdrSc.cc \ + HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ + HttpHeaderTools.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - int.h \ - int.cc \ + tests/stub_HttpRequest.cc \ LogTags.cc \ - RequestFlags.h \ - RequestFlags.cc \ - Transients.cc \ MasterXaction.cc \ MasterXaction.h \ + MemBuf.cc \ MemObject.cc \ MemStore.cc \ - Notes.h \ Notes.cc \ - StoreSwapLogData.cc \ + Notes.h \ + Parsing.cc \ + tests/stub_Port.cc \ + RemovalPolicy.cc \ + RequestFlags.cc \ + RequestFlags.h \ + tests/stub_SBufDetailedStats.cc \ + StatCounters.cc \ + StatCounters.h \ + StatHist.cc \ + StatHist.h \ + StoreFileSystem.cc \ StoreIOState.cc \ StoreMetaUnpacker.cc \ - $(STOREMETA_SOURCE) \ - StoreFileSystem.cc \ - store_io.cc \ - store_swapout.cc \ - store_swapmeta.cc \ - $(UNLINKDSOURCE) \ - $(WIN32_SOURCE) \ - event.cc \ - $(DELAY_POOL_SOURCE) \ - CacheDigest.h \ - tests/stub_CacheDigest.cc \ - ConfigParser.cc \ - EventLoop.cc \ - RemovalPolicy.cc \ - repl_modules.h \ - store.cc \ - store_key_md5.h \ - store_key_md5.cc \ - Parsing.cc \ - ConfigOption.cc \ + tests/testStoreSupport.cc \ + tests/testStoreSupport.h \ + StoreSwapLogData.cc \ + StrList.cc \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/stub_UdsOp.cc \ + tests/testUfs.cc \ + tests/testUfs.h \ + tests/stub_access_log.cc \ tests/stub_acl.cc \ - cache_cf.h \ tests/stub_cache_cf.cc \ - tests/stub_helper.cc \ + cache_cf.h \ + tests/stub_cache_manager.cc \ cbdata.cc \ - tests/stub_SBufDetailedStats.cc \ - String.cc \ - tests/stub_debug.cc \ + tests/stub_client_db.cc \ + client_db.h \ tests/stub_client_side_request.cc \ + tests/stub_debug.cc \ + tests/stub_errorpage.cc \ + event.cc \ + tests/stub_fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + fde.h \ + filemap.cc \ + fs_io.cc \ + fs_io.h \ + tests/stub_helper.cc \ tests/stub_http.cc \ + tests/stub_icp.cc \ + int.cc \ + int.h \ + tests/stub_internal.cc \ + internal.h \ + tests/stub_ipc.cc \ + tests/stub_ipcache.cc \ + tests/stub_libanyp.cc \ tests/stub_libauth.cc \ + tests/stub_libeui.cc \ + tests/stub_libformat.cc \ + tests/stub_libicmp.cc \ + tests/stub_liblog.cc \ + tests/stub_libsecurity.cc \ + log/access_log.h \ mem_node.cc \ - stmem.cc \ - mime.h \ tests/stub_mime.cc \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ - HttpHeaderTools.cc \ - HttpHeader.h \ - HttpHeader.cc \ - ClientInfo.h \ - MemBuf.cc \ - HttpHdrContRange.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ - HttpHdrCc.cc \ - HttpHdrSc.cc \ - HttpHdrScTarget.cc \ - tests/stub_libanyp.cc \ - StatCounters.h \ - StatCounters.cc \ - StatHist.h \ - StatHist.cc \ - StrList.h \ - StrList.cc \ - HttpHdrRange.cc \ - ETag.cc \ - tests/stub_errorpage.cc \ - tests/stub_HttpRequest.cc \ - log/access_log.h \ - tests/stub_access_log.cc \ - refresh.h \ + mime.h \ + tests/stub_neighbors.cc \ + tests/stub_pconn.cc \ refresh.cc \ + refresh.h \ + repl_modules.h \ + tests/stub_stat.cc \ + stmem.cc \ + store.cc \ tests/stub_store_client.cc \ - tools.h \ - tests/stub_tools.cc \ - tests/testStoreSupport.cc \ - tests/testStoreSupport.h \ + store_io.cc \ + store_key_md5.cc \ + store_key_md5.h \ + tests/stub_store_rebuild.cc \ + store_rebuild.h \ + tests/stub_store_stats.cc \ + store_swapmeta.cc \ + store_swapout.cc \ time.cc \ - wordlist.h \ - wordlist.cc + tests/stub_tools.cc \ + tools.h \ + wordlist.cc \ + wordlist.h nodist_tests_testUfs_SOURCES = \ $(TESTSOURCES) \ - hier_code.cc \ SquidMath.cc \ SquidMath.h \ + hier_code.cc \ swap_log_op.cc tests_testUfs_LDADD = \ http/libhttp.la \ @@ -1458,133 +1458,133 @@ endif check_PROGRAMS += tests/testStore ## why so many sources? well httpHeaderTools requites ACLChecklist & friends. ## first line - what we are testing. -tests_testStore_SOURCES= \ - CacheDigest.h \ +tests_testStore_SOURCES = \ + $(DELAY_POOL_SOURCE) \ tests/stub_CacheDigest.cc \ - cbdata.cc \ + CacheDigest.h \ ClientInfo.h \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ ETag.cc \ - event.cc \ EventLoop.cc \ - fatal.h \ - tests/stub_fatal.cc \ FileMap.h \ - filemap.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ + tests/stub_HelperChildConfig.cc \ + HttpBody.cc \ + HttpBody.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ + HttpHeaderFieldStat.h \ HttpHeaderTools.cc \ - HttpHeader.h \ - HttpHeader.cc \ - RequestFlags.cc \ - RequestFlags.h \ - int.h \ - int.cc \ + HttpHeaderTools.h \ + tests/stub_HttpReply.cc \ + tests/stub_HttpRequest.cc \ MasterXaction.cc \ MasterXaction.h \ - mem_node.cc \ MemBuf.cc \ MemObject.cc \ MemStore.cc \ - Notes.h \ Notes.cc \ + Notes.h \ + tests/testPackableStream.cc \ + tests/testPackableStream.h \ Parsing.cc \ + tests/stub_Port.cc \ RemovalPolicy.cc \ - refresh.h \ - refresh.cc \ - StatCounters.h \ + RequestFlags.cc \ + RequestFlags.h \ + tests/stub_SBufDetailedStats.cc \ StatCounters.cc \ - StatHist.h \ + StatCounters.h \ StatHist.cc \ - stmem.cc \ - repl_modules.h \ - store.cc \ - store_io.cc \ - store_swapout.cc \ + StatHist.h \ + tests/testStore.cc \ + tests/testStore.h \ + tests/testStoreController.cc \ + tests/testStoreController.h \ + tests/testStoreHashIndex.cc \ + tests/testStoreHashIndex.h \ StoreIOState.cc \ tests/stub_StoreMeta.cc \ StoreMetaUnpacker.cc \ + tests/testStoreSupport.cc \ + tests/testStoreSupport.h \ StoreSwapLogData.cc \ - store_key_md5.h \ - store_key_md5.cc \ - tests/stub_SBufDetailedStats.cc \ - String.cc \ - StrList.h \ StrList.cc \ - tests/CapturingStoreEntry.h \ - log/access_log.h \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/stub_UdsOp.cc \ tests/stub_access_log.cc \ tests/stub_acl.cc \ - cache_cf.h \ tests/stub_cache_cf.cc \ + cache_cf.h \ tests/stub_cache_manager.cc \ + cbdata.cc \ tests/stub_client_side_request.cc \ tests/stub_comm.cc \ tests/stub_debug.cc \ tests/stub_errorpage.cc \ + event.cc \ + tests/stub_fatal.cc \ + fatal.h \ + tests/stub_fd.cc \ fd.h \ fde.h \ - tests/stub_fd.cc \ + filemap.cc \ + fs_io.cc \ + fs_io.h \ tests/stub_helper.cc \ - tests/stub_HelperChildConfig.cc \ tests/stub_http.cc \ + int.cc \ + int.h \ + tests/stub_libanyp.cc \ tests/stub_libauth.cc \ - tests/stub_libeui.cc \ + tests/stub_libcomm.cc \ tests/stub_libdiskio.cc \ + tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libsecurity.cc \ tests/stub_libsslsquid.cc \ - HttpBody.h \ - HttpBody.cc \ - tests/stub_HttpReply.cc \ - tests/stub_HttpRequest.cc \ - tests/stub_libcomm.cc \ - mime.h \ + log/access_log.h \ + mem_node.cc \ tests/stub_mime.cc \ - tests/stub_Port.cc \ + mime.h \ + refresh.cc \ + refresh.h \ + repl_modules.h \ tests/stub_stat.cc \ + stmem.cc \ + store.cc \ tests/stub_store_client.cc \ - tests/stub_store_stats.cc \ - store_rebuild.h \ + store_io.cc \ + store_key_md5.cc \ + store_key_md5.h \ tests/stub_store_rebuild.cc \ + store_rebuild.h \ + tests/stub_store_stats.cc \ + store_swapout.cc \ tests/stub_store_swapout.cc \ - tools.h \ - Transients.cc \ - tests/stub_tools.cc \ - tests/stub_UdsOp.cc \ - tests/testPackableStream.cc \ - tests/testPackableStream.h \ - tests/testStore.cc \ - tests/testStore.h \ - tests/testStoreController.cc \ - tests/testStoreController.h \ - tests/testStoreHashIndex.cc \ - tests/testStoreHashIndex.h \ - tests/testStoreSupport.cc \ - tests/testStoreSupport.h \ + tests/CapturingStoreEntry.h \ tests/TestSwapDir.cc \ tests/TestSwapDir.h \ tests/stub_time.cc \ - tests/stub_libanyp.cc \ - wordlist.h \ - wordlist.cc -nodist_tests_testStore_SOURCES= \ + tests/stub_tools.cc \ + tools.h \ + wordlist.cc \ + wordlist.h +nodist_tests_testStore_SOURCES = \ + $(TESTSOURCES) \ SquidMath.cc \ SquidMath.h \ - swap_log_op.cc \ - $(TESTSOURCES) + swap_log_op.cc tests_testStore_LDADD= \ libsquid.la \ http/libhttp.la \ @@ -1620,144 +1620,144 @@ tests_testStore_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testDiskIO tests_testDiskIO_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ AccessLogEntry.cc \ AccessLogEntry.h \ - CacheDigest.h \ tests/stub_CacheDigest.cc \ + CacheDigest.h \ tests/stub_CachePeer.cc \ - cbdata.cc \ - client_db.h \ ClientInfo.h \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ - $(DELAY_POOL_SOURCE) \ - FadingCounter.cc \ - fs_io.h \ - fs_io.cc \ + tests/testDiskIO.cc \ + tests/testDiskIO.h \ tests/stub_ETag.cc \ EventLoop.cc \ - event.cc \ - fatal.h \ - tests/stub_fatal.cc \ - fd.h \ - fd.cc \ - fde.h \ - fde.cc \ + FadingCounter.cc \ FileMap.h \ - filemap.cc \ - HttpBody.h \ + tests/stub_HelperChildConfig.cc \ HttpBody.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ + HttpBody.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ + HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ - HttpHdrRange.cc \ + HttpHeader.cc \ + HttpHeader.h \ HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ + HttpHeaderFieldStat.h \ HttpHeaderTools.cc \ - HttpHeader.h \ - HttpHeader.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - int.h \ - int.cc \ + tests/stub_HttpRequest.cc \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ MemBuf.cc \ MemObject.cc \ - mem_node.cc \ - Notes.h \ + tests/stub_MemStore.cc \ Notes.cc \ + Notes.h \ Parsing.cc \ - refresh.h \ - refresh.cc \ + tests/stub_Port.cc \ RemovalPolicy.cc \ - RequestFlags.h \ RequestFlags.cc \ + RequestFlags.h \ ResolvedPeers.cc \ ResolvedPeers.h \ - tests/stub_libsecurity.cc \ - StatCounters.h \ + tests/stub_SBufDetailedStats.cc \ StatCounters.cc \ - StatHist.h \ + StatCounters.h \ tests/stub_StatHist.cc \ - stmem.cc \ - tests/stub_SBufDetailedStats.cc \ + StatHist.h \ StoreFileSystem.cc \ StoreIOState.cc \ tests/stub_StoreMeta.cc \ StoreMetaUnpacker.cc \ + tests/testStoreSupport.cc \ + tests/testStoreSupport.h \ StoreSwapLogData.cc \ - store_io.cc \ - store_key_md5.h \ - store_key_md5.cc \ - store_swapout.cc \ - store_swapmeta.cc \ - repl_modules.h \ - store.cc \ - String.cc \ - StrList.h \ StrList.cc \ - tests/stub_libstore.cc \ + StrList.h \ + String.cc \ Transients.cc \ - log/access_log.h \ + tests/stub_UdsOp.cc \ tests/stub_access_log.cc \ tests/stub_acl.cc \ - cache_cf.h \ tests/stub_cache_cf.cc \ + cache_cf.h \ tests/stub_cache_manager.cc \ + cbdata.cc \ tests/stub_client_db.cc \ - client_side_request.h \ + client_db.h \ tests/stub_client_side_request.cc \ + client_side_request.h \ tests/stub_debug.cc \ tests/stub_errorpage.cc \ + event.cc \ + tests/stub_fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + fde.h \ + filemap.cc \ + fs_io.cc \ + fs_io.h \ tests/stub_helper.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_HttpRequest.cc \ tests/stub_http.cc \ tests/stub_icp.cc \ - internal.h \ + int.cc \ + int.h \ tests/stub_internal.cc \ + internal.h \ tests/stub_ipc.cc \ tests/stub_ipcache.cc \ - tests/stub_libauth_acls.cc \ + tests/stub_libanyp.cc \ tests/stub_libauth.cc \ + tests/stub_libauth_acls.cc \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ tests/stub_liblog.cc \ - tests/stub_MemStore.cc \ - mime.h \ + tests/stub_libsecurity.cc \ + tests/stub_libstore.cc \ + log/access_log.h \ + mem_node.cc \ tests/stub_mime.cc \ + mime.h \ tests/stub_neighbors.cc \ tests/stub_pconn.cc \ - tests/stub_Port.cc \ + refresh.cc \ + refresh.h \ + repl_modules.h \ tests/stub_stat.cc \ + stmem.cc \ + store.cc \ tests/stub_store_client.cc \ - tests/stub_store_stats.cc \ - store_rebuild.h \ + store_io.cc \ + store_key_md5.cc \ + store_key_md5.h \ tests/stub_store_rebuild.cc \ - tests/stub_UdsOp.cc \ - tests/testDiskIO.cc \ - tests/testDiskIO.h \ - tests/testStoreSupport.cc \ - tests/testStoreSupport.h \ + store_rebuild.h \ + tests/stub_store_stats.cc \ + store_swapmeta.cc \ + store_swapout.cc \ tests/stub_time.cc \ - $(UNLINKDSOURCE) \ - tests/stub_libanyp.cc \ - $(WIN32_SOURCE) \ - wordlist.h \ - wordlist.cc \ + tests/stub_tools.cc \ tools.h \ - tests/stub_tools.cc -nodist_tests_testDiskIO_SOURCES= \ + wordlist.cc \ + wordlist.h +nodist_tests_testDiskIO_SOURCES = \ $(TESTSOURCES) \ - hier_code.cc \ SquidMath.cc \ SquidMath.h \ + hier_code.cc \ swap_log_op.cc tests_testDiskIO_LDADD = \ libsquid.la \ @@ -1805,26 +1805,26 @@ tests_testACLMaxUserIP_SOURCES = \ tests/testACLMaxUserIP.h nodist_tests_testACLMaxUserIP_SOURCES = \ ConfigParser.cc \ - dlink.cc \ - globals.cc \ + tests/stub_HelperChildConfig.cc \ + tests/stub_HttpHeader.cc \ + tests/stub_HttpRequest.cc \ + tests/stub_MemBuf.cc \ Parsing.cc \ + tests/stub_StatHist.cc \ String.cc \ tests/stub_access_log.cc \ tests/stub_cache_cf.cc \ tests/stub_cbdata.cc \ tests/stub_client_side.cc \ tests/stub_debug.cc \ + dlink.cc \ tests/stub_errorpage.cc \ tests/stub_fatal.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_HttpHeader.cc \ - tests/stub_HttpRequest.cc \ + globals.cc \ tests/stub_libauth.cc \ tests/stub_libhttp.cc \ tests/stub_libmem.cc \ - tests/stub_libsecurity.cc \ - tests/stub_MemBuf.cc \ - tests/stub_StatHist.cc + tests/stub_libsecurity.cc tests_testACLMaxUserIP_LDADD = \ $(AUTH_ACL_LIBS) \ acl/libapi.la \ @@ -1850,26 +1850,21 @@ endif check_PROGRAMS += tests/test_http_range tests_test_http_range_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(DNSSOURCE) \ + $(HTCPSOURCE) \ + $(IPC_SOURCE) \ + $(SNMP_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ AccessLogEntry.cc \ - BodyPipe.cc \ - cache_cf.h \ AuthReg.h \ - RefreshPattern.h \ + BodyPipe.cc \ + tests/stub_CacheDigest.cc \ + CacheDigest.h \ CachePeer.cc \ CachePeer.h \ - cache_manager.cc \ - CacheDigest.h \ - tests/stub_CacheDigest.cc \ - carp.h \ - tests/stub_carp.cc \ - cbdata.cc \ - tests/stub_client_db.cc \ - client_side.h \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ ClientInfo.h \ - clientStream.cc \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ @@ -1877,166 +1872,171 @@ tests_test_http_range_SOURCES = \ CpuAffinityMap.h \ CpuAffinitySet.cc \ CpuAffinitySet.h \ + tests/stub_ETag.cc \ + tests/stub_EventLoop.cc \ + FadingCounter.cc \ + FileMap.h \ + FwdState.cc \ + FwdState.h \ + HappyConnOpener.cc \ + HappyConnOpener.h \ + HttpBody.cc \ + HttpBody.h \ + tests/stub_HttpControlMsg.cc \ + HttpHdrCc.cc \ + HttpHdrCc.h \ + HttpHdrContRange.cc \ + HttpHdrRange.cc \ + HttpHdrSc.cc \ + HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ + HttpHeaderTools.cc \ + HttpHeaderTools.h \ + HttpReply.cc \ + HttpRequest.cc \ + tests/stub_HttpUpgradeProtocolAccess.cc \ + IoStats.h \ + LogTags.cc \ + MasterXaction.cc \ + MasterXaction.h \ + MemBuf.cc \ + MemObject.cc \ + tests/stub_MemStore.cc \ + Notes.cc \ + Notes.h \ + Parsing.cc \ + PeerPoolMgr.cc \ + PeerPoolMgr.h \ + Pipeline.cc \ + Pipeline.h \ + RefreshPattern.h \ + RemovalPolicy.cc \ + RequestFlags.cc \ + RequestFlags.h \ + ResolvedPeers.cc \ + ResolvedPeers.h \ + tests/stub_SBufDetailedStats.cc \ + SquidMath.cc \ + SquidMath.h \ + StatCounters.cc \ + StatCounters.h \ + StatHist.cc \ + StatHist.h \ + StoreFileSystem.cc \ + StoreIOState.cc \ + tests/stub_StoreMeta.cc \ + StoreMetaUnpacker.cc \ + StoreSwapLogData.cc \ + StrList.cc \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/test_http_range.cc \ + tests/stub_cache_cf.cc \ + cache_cf.h \ + cache_manager.cc \ + tests/stub_carp.cc \ + carp.h \ + cbdata.cc \ + clientStream.cc \ + tests/stub_client_db.cc \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_request.cc \ debug.cc \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ - dlink.h \ dlink.cc \ - $(DNSSOURCE) \ + dlink.h \ errorpage.cc \ - tests/stub_ETag.cc \ - event.cc \ - FadingCounter.cc \ - fatal.h \ - tests/stub_libauth.cc \ + event.cc \ + tests/stub_external_acl.cc \ tests/stub_fatal.cc \ - fd.h \ + fatal.h \ fd.cc \ + fd.h \ fde.cc \ - FileMap.h \ filemap.cc \ - fqdncache.h \ fqdncache.cc \ - FwdState.cc \ - FwdState.h \ - gopher.h \ + fqdncache.h \ + fs_io.cc \ + fs_io.h \ tests/stub_gopher.cc \ - HappyConnOpener.cc \ - HappyConnOpener.h \ + gopher.h \ helper.cc \ hier_code.h \ - $(HTCPSOURCE) \ http.cc \ - HttpBody.h \ - HttpBody.cc \ - tests/stub_HttpControlMsg.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ - HttpHdrCc.cc \ - HttpHdrContRange.cc \ - HttpHdrRange.cc \ - HttpHdrSc.cc \ - HttpHdrScTarget.cc \ - HttpHeader.h \ - HttpHeader.cc \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ - HttpHeaderTools.cc \ - HttpReply.cc \ - PeerPoolMgr.h \ - PeerPoolMgr.cc \ - RequestFlags.h \ - RequestFlags.cc \ - HttpRequest.cc \ icp_v2.cc \ icp_v3.cc \ - int.h \ int.cc \ - internal.h \ + int.h \ internal.cc \ - $(IPC_SOURCE) \ + internal.h \ + tests/stub_ipc_Forwarder.cc \ ipcache.cc \ - LogTags.cc \ - MasterXaction.cc \ - MasterXaction.h \ - MemBuf.cc \ - MemObject.cc \ + tests/stub_libauth.cc \ + tests/stub_libdiskio.cc \ + tests/stub_libeui.cc \ tests/stub_libmem.cc \ + tests/stub_libsecurity.cc \ + tests/stub_libstore.cc \ + tests/stub_main_cc.cc \ mem_node.cc \ - mime.h \ mime.cc \ - mime_header.h \ + mime.h \ mime_header.cc \ - multicast.h \ + mime_header.h \ multicast.cc \ - neighbors.h \ + multicast.h \ neighbors.cc \ - Notes.cc \ - Notes.h \ - Parsing.cc \ + neighbors.h \ + pconn.cc \ peer_digest.cc \ - peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ + peer_proxy_negotiate_auth.h \ peer_select.cc \ - peer_sourcehash.h \ peer_sourcehash.cc \ - peer_userhash.h \ + peer_sourcehash.h \ peer_userhash.cc \ - Pipeline.cc \ - Pipeline.h \ - pconn.cc \ - redirect.h \ + peer_userhash.h \ tests/stub_redirect.cc \ - refresh.h \ + redirect.h \ refresh.cc \ - RemovalPolicy.cc \ - ResolvedPeers.cc \ - ResolvedPeers.h \ - tests/stub_SBufDetailedStats.cc \ - $(SNMP_SOURCE) \ - SquidMath.h \ - SquidMath.cc \ - IoStats.h \ - stat.h \ + refresh.h \ + repl_modules.h \ stat.cc \ - StatCounters.h \ - StatCounters.cc \ - StatHist.h \ - StatHist.cc \ + stat.h \ stmem.cc \ - repl_modules.h \ store.cc \ store_client.cc \ - store_digest.h \ tests/stub_store_digest.cc \ - store_key_md5.h \ - store_key_md5.cc \ + store_digest.h \ store_io.cc \ - store_log.h \ + store_key_md5.cc \ + store_key_md5.h \ store_log.cc \ - store_rebuild.h \ + store_log.h \ store_rebuild.cc \ - store_swapin.h \ + store_rebuild.h \ + tests/stub_store_stats.cc \ store_swapin.cc \ + store_swapin.h \ store_swapmeta.cc \ store_swapout.cc \ - StoreFileSystem.cc \ - StoreIOState.cc \ - tests/stub_StoreMeta.cc \ - StoreMetaUnpacker.cc \ - StoreSwapLogData.cc \ - String.cc \ - StrList.h \ - StrList.cc \ - tests/stub_libstore.cc \ - Transients.cc \ - tests/test_http_range.cc \ - tests/stub_cache_cf.cc \ - tests/stub_external_acl.cc \ - tests/stub_HttpUpgradeProtocolAccess.cc \ - tests/stub_ipc_Forwarder.cc \ - tests/stub_libdiskio.cc \ - tests/stub_libeui.cc \ - tests/stub_libsecurity.cc \ - tests/stub_main_cc.cc \ - tests/stub_MemStore.cc \ - tests/stub_store_stats.cc \ - tests/stub_EventLoop.cc \ time.cc \ - tools.h \ tools.cc \ + tools.h \ tests/stub_tunnel.cc \ - $(UNLINKDSOURCE) \ - urn.h \ urn.cc \ - wccp2.h \ + urn.h \ tests/stub_wccp2.cc \ - whois.h \ + wccp2.h \ tests/stub_whois.cc \ - $(WIN32_SOURCE) \ - wordlist.h \ - wordlist.cc + whois.h \ + wordlist.cc \ + wordlist.h nodist_tests_test_http_range_SOURCES = \ $(BUILT_SOURCES) tests_test_http_range_LDADD = \ @@ -2086,34 +2086,34 @@ tests_test_http_range_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testHttp1Parser tests_testHttp1Parser_SOURCES = \ Debug.h \ + tests/stub_HelperChildConfig.cc \ + tests/testHttp1Parser.cc \ + tests/testHttp1Parser.h \ MemBuf.cc \ MemBuf.h \ tests/stub_MemObject.cc \ - mime_header.cc \ - mime_header.h \ - String.cc \ - cache_cf.h \ tests/stub_SBufDetailedStats.cc \ + String.cc \ tests/stub_cache_cf.cc \ + cache_cf.h \ tests/stub_cache_manager.cc \ - tests/stub_comm.cc \ tests/stub_cbdata.cc \ + tests/stub_comm.cc \ tests/stub_debug.cc \ tests/stub_event.cc \ - tests/stub_HelperChildConfig.cc \ + tests/stub_libanyp.cc \ tests/stub_libmem.cc \ tests/stub_libsecurity.cc \ + mime_header.cc \ + mime_header.h \ tests/stub_stmem.cc \ tests/stub_store.cc \ tests/stub_store_stats.cc \ - tools.h \ - tests/stub_tools.cc \ - tests/testHttp1Parser.cc \ - tests/testHttp1Parser.h \ tests/stub_time.cc \ - tests/stub_libanyp.cc \ - wordlist.h \ - wordlist.cc + tests/stub_tools.cc \ + tools.h \ + wordlist.cc \ + wordlist.h nodist_tests_testHttp1Parser_SOURCES = \ $(TESTSOURCES) tests_testHttp1Parser_LDADD= \ @@ -2132,18 +2132,16 @@ tests_testHttp1Parser_LDADD= \ tests_testHttp1Parser_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testHttpReply -tests_testHttpReply_SOURCES=\ - cbdata.cc \ - cbdata.h \ +tests_testHttpReply_SOURCES = \ ConfigParser.cc \ tests/stub_ETag.cc \ - fatal.h \ - tests/stub_fatal.cc \ - HttpBody.h \ + tests/stub_HelperChildConfig.cc \ HttpBody.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ + HttpBody.h \ + HttpControlMsg.cc \ + HttpControlMsg.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ HttpHdrContRange.h \ HttpHdrRange.cc \ @@ -2151,64 +2149,66 @@ tests_testHttpReply_SOURCES=\ HttpHdrSc.h \ HttpHdrScTarget.cc \ HttpHdrScTarget.h \ - HttpHeader.h \ HttpHeader.cc \ - HttpHeaderMask.h \ + HttpHeader.h \ HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ + HttpHeaderFieldStat.h \ + HttpHeaderMask.h \ HttpHeaderTools.cc \ - HttpControlMsg.cc \ - HttpControlMsg.h \ + HttpHeaderTools.h \ HttpReply.cc \ + tests/testHttpReply.cc \ HttpReply.h \ + tests/testHttpReply.h \ + tests/stub_HttpRequest.cc \ MasterXaction.cc \ MasterXaction.h \ MemBuf.cc \ MemBuf.h \ - mime_header.h \ - mime_header.cc \ - Notes.h \ Notes.cc \ + Notes.h \ + tests/stub_SBufDetailedStats.cc \ SquidString.h \ SquidTime.h \ - tests/stub_SBufDetailedStats.cc \ - String.cc \ - StrList.h \ + StatCounters.cc \ + StatCounters.h \ + tests/stub_StatHist.cc \ + StatHist.h \ StrList.cc \ - log/access_log.h \ + StrList.h \ + String.cc \ tests/stub_access_log.cc \ - cache_cf.h \ tests/stub_cache_cf.cc \ + cache_cf.h \ tests/stub_cache_manager.cc \ + cbdata.cc \ + cbdata.h \ tests/stub_comm.cc \ tests/stub_debug.cc \ tests/stub_errorpage.cc \ tests/stub_event.cc \ + tests/stub_fatal.cc \ + fatal.h \ tests/stub_fd.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_libformat.cc \ + tests/stub_libanyp.cc \ tests/stub_libauth.cc \ tests/stub_libcomm.cc \ + tests/stub_libformat.cc \ tests/stub_libmgr.cc \ tests/stub_libsecurity.cc \ tests/stub_libsslsquid.cc \ - StatCounters.h \ - StatCounters.cc \ - StatHist.h \ - tests/stub_StatHist.cc \ + log/access_log.h \ + mime_header.cc \ + mime_header.h \ repl_modules.h \ tests/stub_store.cc \ tests/stub_store_stats.cc \ - tools.h \ - tests/stub_tools.cc \ - tests/stub_HttpRequest.cc \ - tests/testHttpReply.cc \ - tests/testHttpReply.h \ tests/stub_time.cc \ - tests/stub_libanyp.cc \ - wordlist.h \ - wordlist.cc -nodist_tests_testHttpReply_SOURCES=\ + tests/stub_tools.cc \ + tools.h \ + wordlist.cc \ + wordlist.h +nodist_tests_testHttpReply_SOURCES = \ $(TESTSOURCES) \ hier_code.cc tests_testHttpReply_LDADD=\ @@ -2231,49 +2231,25 @@ tests_testHttpReply_LDADD=\ $(SSLLIB) \ $(LIBCPPUNIT_LIBS) \ $(COMPAT_LIB) \ - $(XTRA_LIBS) -tests_testHttpReply_LDFLAGS = $(LIBADD_DL) - -check_PROGRAMS += tests/testHttpRequest -tests_testHttpRequest_SOURCES = \ - AccessLogEntry.cc \ - RequestFlags.h \ - RequestFlags.cc \ - HttpRequest.cc \ - tests/stub_libmem.cc \ - String.cc \ - tests/testHttpRequest.h \ - tests/testHttpRequest.cc \ - tests/testHttpRequestMethod.h \ - tests/testHttpRequestMethod.cc \ - tests/stub_libauth.cc \ - tests/stub_main_cc.cc \ - tests/stub_ipc_Forwarder.cc \ - tests/stub_libdiskio.cc \ - tests/stub_libeui.cc \ - tests/stub_store_stats.cc \ - tests/stub_EventLoop.cc \ - time.cc \ - BodyPipe.cc \ - cache_manager.cc \ - cache_cf.h \ + $(XTRA_LIBS) +tests_testHttpReply_LDFLAGS = $(LIBADD_DL) + +check_PROGRAMS += tests/testHttpRequest +tests_testHttpRequest_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(DNSSOURCE) \ + $(HTCPSOURCE) \ + $(IPC_SOURCE) \ + $(SNMP_SOURCE) \ + $(WIN32_SOURCE) \ + AccessLogEntry.cc \ AuthReg.h \ - RefreshPattern.h \ - debug.cc \ - CacheDigest.h \ + BodyPipe.cc \ tests/stub_CacheDigest.cc \ + CacheDigest.h \ CachePeer.cc \ CachePeer.h \ - carp.h \ - tests/stub_carp.cc \ - cbdata.cc \ - tests/stub_client_db.cc \ - client_side.h \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ ClientInfo.h \ - clientStream.cc \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ @@ -2281,150 +2257,174 @@ tests_testHttpRequest_SOURCES = \ CpuAffinityMap.h \ CpuAffinitySet.cc \ CpuAffinitySet.h \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ - dlink.h \ - dlink.cc \ - $(DNSSOURCE) \ - errorpage.cc \ tests/stub_ETag.cc \ - external_acl.cc \ + tests/stub_EventLoop.cc \ ExternalACLEntry.cc \ - fatal.h \ - tests/stub_fatal.cc \ - fd.h \ - fd.cc \ - fde.cc \ - fqdncache.h \ - fqdncache.cc \ + FadingCounter.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - tests/stub_gopher.cc \ HappyConnOpener.cc \ HappyConnOpener.h \ - helper.cc \ - hier_code.h \ - $(HTCPSOURCE) \ - http.cc \ - HttpBody.h \ HttpBody.cc \ + HttpBody.h \ tests/stub_HttpControlMsg.cc \ - HttpHeader.h \ - HttpHeader.cc \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ - HttpHeaderTools.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ + HttpHeaderTools.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - icp_v2.cc \ - icp_v3.cc \ - $(IPC_SOURCE) \ - ipcache.cc \ - int.h \ - int.cc \ - internal.h \ - internal.cc \ + HttpRequest.cc \ + tests/testHttpRequest.cc \ + tests/testHttpRequest.h \ + tests/testHttpRequestMethod.cc \ + tests/testHttpRequestMethod.h \ + tests/stub_HttpUpgradeProtocolAccess.cc \ + IoStats.h \ LogTags.cc \ - tests/stub_libsecurity.cc \ MasterXaction.cc \ MasterXaction.h \ - multicast.h \ - multicast.cc \ - mem_node.cc \ MemBuf.cc \ MemObject.cc \ - mime.h \ - mime.cc \ - mime_header.h \ - mime_header.cc \ - neighbors.h \ - neighbors.cc \ + MemStore.cc \ Notes.cc \ Notes.h \ Parsing.cc \ - pconn.cc \ - peer_digest.cc \ - peer_proxy_negotiate_auth.h \ - peer_proxy_negotiate_auth.cc \ - peer_select.cc \ - peer_sourcehash.h \ - peer_sourcehash.cc \ - peer_userhash.h \ - peer_userhash.cc \ - PeerPoolMgr.h \ PeerPoolMgr.cc \ + PeerPoolMgr.h \ Pipeline.cc \ Pipeline.h \ - redirect.h \ - tests/stub_libauth_acls.cc \ - tests/stub_redirect.cc \ - refresh.h \ - refresh.cc \ + RefreshPattern.h \ RemovalPolicy.cc \ + RequestFlags.cc \ + RequestFlags.h \ ResolvedPeers.cc \ ResolvedPeers.h \ tests/stub_SBufDetailedStats.cc \ - $(SNMP_SOURCE) \ - SquidMath.h \ SquidMath.cc \ - IoStats.h \ - stat.h \ - stat.cc \ - StatCounters.h \ + SquidMath.h \ StatCounters.cc \ - StatHist.h \ + StatCounters.h \ StatHist.cc \ - stmem.cc \ + StatHist.h \ + StoreFileSystem.cc \ + StoreIOState.cc \ + tests/stub_StoreMeta.cc \ + StoreMetaUnpacker.cc \ + StoreSwapLogData.cc \ + StrList.cc \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/stub_cache_cf.cc \ + cache_cf.h \ + cache_manager.cc \ + tests/stub_carp.cc \ + carp.h \ + cbdata.cc \ + clientStream.cc \ + tests/stub_client_db.cc \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_request.cc \ + debug.cc \ + dlink.cc \ + dlink.h \ + errorpage.cc \ + event.cc \ + external_acl.cc \ + tests/stub_fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + fqdncache.cc \ + fqdncache.h \ + fs_io.cc \ + fs_io.h \ + tests/stub_gopher.cc \ + gopher.h \ + helper.cc \ + hier_code.h \ + http.cc \ + icp_v2.cc \ + icp_v3.cc \ + int.cc \ + int.h \ + internal.cc \ + internal.h \ + tests/stub_ipc_Forwarder.cc \ + ipcache.cc \ + tests/stub_libauth.cc \ + tests/stub_libauth_acls.cc \ + tests/stub_libdiskio.cc \ + tests/stub_libeui.cc \ + tests/stub_libmem.cc \ + tests/stub_libsecurity.cc \ + tests/stub_libstore.cc \ + tests/stub_main_cc.cc \ + mem_node.cc \ + mime.cc \ + mime.h \ + mime_header.cc \ + mime_header.h \ + multicast.cc \ + multicast.h \ + neighbors.cc \ + neighbors.h \ + pconn.cc \ + peer_digest.cc \ + peer_proxy_negotiate_auth.cc \ + peer_proxy_negotiate_auth.h \ + peer_select.cc \ + peer_sourcehash.cc \ + peer_sourcehash.h \ + peer_userhash.cc \ + peer_userhash.h \ + tests/stub_redirect.cc \ + redirect.h \ + refresh.cc \ + refresh.h \ repl_modules.h \ + stat.cc \ + stat.h \ + stmem.cc \ store.cc \ store_client.cc \ - store_digest.h \ tests/stub_store_digest.cc \ + store_digest.h \ store_io.cc \ - store_key_md5.h \ store_key_md5.cc \ - store_log.h \ + store_key_md5.h \ store_log.cc \ - store_rebuild.h \ + store_log.h \ store_rebuild.cc \ - store_swapin.h \ + store_rebuild.h \ + tests/stub_store_stats.cc \ store_swapin.cc \ + store_swapin.h \ store_swapmeta.cc \ store_swapout.cc \ - StoreFileSystem.cc \ - StoreIOState.cc \ - tests/stub_StoreMeta.cc \ - StoreMetaUnpacker.cc \ - StoreSwapLogData.cc \ - StrList.h \ - StrList.cc \ - event.cc \ - tools.h \ + time.cc \ tools.cc \ - Transients.cc \ - tests/stub_cache_cf.cc \ - tests/stub_HttpUpgradeProtocolAccess.cc \ + tools.h \ tests/stub_tunnel.cc \ - tests/stub_libstore.cc \ - MemStore.cc \ - urn.h \ urn.cc \ - wccp2.h \ + urn.h \ tests/stub_wccp2.cc \ - whois.h \ + wccp2.h \ tests/stub_whois.cc \ - FadingCounter.cc \ - $(WIN32_SOURCE) \ - wordlist.h \ - wordlist.cc + whois.h \ + wordlist.cc \ + wordlist.h nodist_tests_testHttpRequest_SOURCES = \ $(BUILT_SOURCES) tests_testHttpRequest_LDADD = \ @@ -2478,9 +2478,9 @@ tests_testIpAddress_SOURCES = \ tests/testIpAddress.cc \ tests/testIpAddress.h nodist_tests_testIpAddress_SOURCES = \ + tests/stub_SBuf.cc \ tests/stub_debug.cc \ tests/stub_libmem.cc \ - tests/stub_SBuf.cc \ tests/stub_tools.cc tests_testIpAddress_LDADD = \ ip/libip.la \ @@ -2495,16 +2495,16 @@ tests_testIpAddress_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testIcmp # icmp/libicmpcore.la is used by pinger so SHOULD NOT require more dependancies! :-( tests_testIcmp_SOURCES = \ - tests/testIcmp.h \ - tests/testIcmp.cc + tests/testIcmp.cc \ + tests/testIcmp.h nodist_tests_testIcmp_SOURCES = \ - icmp/Icmp.h \ + tests/stub_SBuf.cc \ SquidTime.h \ tests/stub_debug.cc \ + globals.cc \ + icmp/Icmp.h \ tests/stub_libmem.cc \ - tests/stub_SBuf.cc \ - time.cc \ - globals.cc + time.cc tests_testIcmp_LDADD=\ icmp/libicmpcore.la \ ip/libip.la \ @@ -2519,12 +2519,12 @@ tests_testNetDb_SOURCES = \ tests/testNetDb.cc \ tests/testNetDb.h nodist_tests_testNetDb_SOURCES = \ + tests/stub_SBuf.cc \ SquidTime.h \ tests/stub_debug.cc \ + globals.cc \ tests/stub_libmem.cc \ - tests/stub_SBuf.cc \ - time.cc \ - globals.cc + time.cc tests_testNetDb_LDADD = \ icmp/libicmp.la \ ip/libip.la \ @@ -2539,39 +2539,23 @@ tests_testNetDb_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testCacheManager tests_testCacheManager_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(DNSSOURCE) \ + $(HTCPSOURCE) \ + $(IPC_SOURCE) \ + $(SNMP_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ AccessLogEntry.cc \ - debug.cc \ - RequestFlags.h \ - RequestFlags.cc \ - HttpRequest.cc \ - String.cc \ + AuthReg.h \ + BodyPipe.cc \ + tests/stub_CacheDigest.cc \ + CacheDigest.h \ tests/testCacheManager.cc \ tests/testCacheManager.h \ - tests/stub_main_cc.cc \ - tests/stub_HttpControlMsg.cc \ - tests/stub_ipc_Forwarder.cc \ - tests/stub_store_stats.cc \ - tests/stub_EventLoop.cc \ - time.cc \ - BodyPipe.cc \ - cache_manager.cc \ - cache_cf.h \ - AuthReg.h \ - RefreshPattern.h \ CachePeer.cc \ CachePeer.h \ - CacheDigest.h \ - tests/stub_CacheDigest.cc \ - carp.h \ - tests/stub_carp.cc \ - cbdata.cc \ - tests/stub_client_db.cc \ - client_side.h \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ ClientInfo.h \ - clientStream.cc \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ @@ -2579,154 +2563,170 @@ tests_testCacheManager_SOURCES = \ CpuAffinityMap.h \ CpuAffinitySet.cc \ CpuAffinitySet.h \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ - dlink.h \ - dlink.cc \ - $(DNSSOURCE) \ - errorpage.cc \ tests/stub_ETag.cc \ - event.cc \ - external_acl.cc \ + tests/stub_EventLoop.cc \ ExternalACLEntry.cc \ - fatal.h \ - tests/stub_fatal.cc \ - fd.h \ - fd.cc \ - fde.cc \ + FadingCounter.cc \ FileMap.h \ - filemap.cc \ - fqdncache.h \ - fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - tests/stub_gopher.cc \ HappyConnOpener.cc \ HappyConnOpener.h \ - hier_code.h \ - helper.cc \ - $(HTCPSOURCE) \ - http.cc \ - HttpBody.h \ HttpBody.cc \ - HttpHeader.h \ - HttpHeader.cc \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ - HttpHeaderTools.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ + HttpBody.h \ + tests/stub_HttpControlMsg.cc \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ + HttpHeaderTools.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - icp_v2.cc \ - icp_v3.cc \ - $(IPC_SOURCE) \ - ipcache.cc \ - int.h \ - int.cc \ - internal.h \ - internal.cc \ + HttpRequest.cc \ + tests/stub_HttpUpgradeProtocolAccess.cc \ + IoStats.h \ LogTags.cc \ - tests/stub_libsecurity.cc \ MasterXaction.cc \ MasterXaction.h \ - multicast.h \ - multicast.cc \ - mem_node.cc \ MemBuf.cc \ MemObject.cc \ - mime.h \ - mime.cc \ - mime_header.h \ - mime_header.cc \ - neighbors.h \ - neighbors.cc \ + MemStore.cc \ Notes.cc \ Notes.h \ Parsing.cc \ - pconn.cc \ - peer_digest.cc \ - peer_proxy_negotiate_auth.h \ - peer_proxy_negotiate_auth.cc \ - peer_select.cc \ - peer_sourcehash.h \ - peer_sourcehash.cc \ - peer_userhash.h \ - peer_userhash.cc \ - PeerPoolMgr.h \ PeerPoolMgr.cc \ + PeerPoolMgr.h \ Pipeline.cc \ Pipeline.h \ - redirect.h \ - tests/stub_redirect.cc \ - refresh.h \ - refresh.cc \ + RefreshPattern.h \ RemovalPolicy.cc \ - ResolvedPeers.h \ + RequestFlags.cc \ + RequestFlags.h \ ResolvedPeers.cc \ + ResolvedPeers.h \ tests/stub_SBufDetailedStats.cc \ - $(SNMP_SOURCE) \ - SquidMath.h \ SquidMath.cc \ - IoStats.h \ - stat.h \ - stat.cc \ - StatCounters.h \ + SquidMath.h \ StatCounters.cc \ + StatCounters.h \ + tests/stub_StatHist.cc \ StatHist.h \ - StrList.h \ + StoreFileSystem.cc \ + StoreIOState.cc \ + tests/stub_StoreMeta.cc \ + StoreMetaUnpacker.cc \ + StoreSwapLogData.cc \ StrList.cc \ - tests/stub_libauth_acls.cc \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/stub_cache_cf.cc \ + cache_cf.h \ + cache_manager.cc \ + tests/stub_carp.cc \ + carp.h \ + cbdata.cc \ + clientStream.cc \ + tests/stub_client_db.cc \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_request.cc \ + debug.cc \ + dlink.cc \ + dlink.h \ + errorpage.cc \ + event.cc \ + external_acl.cc \ + tests/stub_fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + filemap.cc \ + fqdncache.cc \ + fqdncache.h \ + fs_io.cc \ + fs_io.h \ + tests/stub_gopher.cc \ + gopher.h \ + helper.cc \ + hier_code.h \ + http.cc \ + icp_v2.cc \ + icp_v3.cc \ + int.cc \ + int.h \ + internal.cc \ + internal.h \ + tests/stub_ipc_Forwarder.cc \ + ipcache.cc \ tests/stub_libauth.cc \ + tests/stub_libauth_acls.cc \ tests/stub_libdiskio.cc \ - tests/stub_StatHist.cc \ - stmem.cc \ + tests/stub_libsecurity.cc \ + tests/stub_libstore.cc \ + tests/stub_main_cc.cc \ + mem_node.cc \ + mime.cc \ + mime.h \ + mime_header.cc \ + mime_header.h \ + multicast.cc \ + multicast.h \ + neighbors.cc \ + neighbors.h \ + pconn.cc \ + peer_digest.cc \ + peer_proxy_negotiate_auth.cc \ + peer_proxy_negotiate_auth.h \ + peer_select.cc \ + peer_sourcehash.cc \ + peer_sourcehash.h \ + peer_userhash.cc \ + peer_userhash.h \ + tests/stub_redirect.cc \ + redirect.h \ + refresh.cc \ + refresh.h \ repl_modules.h \ + stat.cc \ + stat.h \ + stmem.cc \ store.cc \ store_client.cc \ - store_digest.h \ tests/stub_store_digest.cc \ + store_digest.h \ store_io.cc \ - store_key_md5.h \ store_key_md5.cc \ - store_log.h \ + store_key_md5.h \ store_log.cc \ - store_rebuild.h \ + store_log.h \ store_rebuild.cc \ - store_swapin.h \ + store_rebuild.h \ + tests/stub_store_stats.cc \ store_swapin.cc \ + store_swapin.h \ store_swapmeta.cc \ store_swapout.cc \ - StoreFileSystem.cc \ - StoreIOState.cc \ - tests/stub_StoreMeta.cc \ - StoreMetaUnpacker.cc \ - StoreSwapLogData.cc \ - tools.h \ + time.cc \ tools.cc \ - Transients.cc \ - tests/stub_cache_cf.cc \ - tests/stub_HttpUpgradeProtocolAccess.cc \ + tools.h \ tests/stub_tunnel.cc \ - tests/stub_libstore.cc \ - MemStore.cc \ - $(UNLINKDSOURCE) \ - urn.h \ urn.cc \ - wccp2.h \ + urn.h \ tests/stub_wccp2.cc \ - whois.h \ + wccp2.h \ tests/stub_whois.cc \ - FadingCounter.cc \ - $(WIN32_SOURCE) \ - wordlist.h \ - wordlist.cc + whois.h \ + wordlist.cc \ + wordlist.h nodist_tests_testCacheManager_SOURCES = \ $(BUILT_SOURCES) # comm.cc only requires comm/libcomm.la until fdc_table is dead. @@ -2777,33 +2777,33 @@ tests_testCacheManager_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testStatHist tests_testStatHist_SOURCES = \ - tests/stub_cbdata.cc \ - fatal.h \ - tests/stub_fatal.cc \ + tests/stub_DelayId.cc \ + tests/stub_HelperChildConfig.cc \ tests/stub_MemBuf.cc \ + tests/stub_MemObject.cc \ tests/stub_SBufDetailedStats.cc \ StatHist.cc \ + tests/testStatHist.cc \ StatHist.h \ + tests/testStatHist.h \ String.cc \ tests/stub_cache_manager.cc \ + tests/stub_cbdata.cc \ tests/stub_comm.cc \ tests/stub_debug.cc \ - tests/stub_DelayId.cc \ - tests/stub_HelperChildConfig.cc \ + tests/stub_fatal.cc \ + fatal.h \ tests/stub_libmem.cc \ - tests/stub_MemObject.cc \ - mime.h \ tests/stub_mime.cc \ + mime.h \ tests/stub_pconn.cc \ - tests/stub_stmem.cc \ repl_modules.h \ + tests/stub_stmem.cc \ tests/stub_store.cc \ tests/stub_store_stats.cc \ time.cc \ - tools.h \ tests/stub_tools.cc \ - tests/testStatHist.cc \ - tests/testStatHist.h + tools.h nodist_tests_testStatHist_SOURCES = \ $(TESTSOURCES) tests_testStatHist_LDADD = \ @@ -2820,25 +2820,25 @@ tests_testStatHist_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testConfigParser tests_testConfigParser_SOURCES = \ ClientInfo.h \ - tests/stub_MemBuf.cc \ - tests/stub_time.cc \ - tests/stub_SBufDetailedStats.cc \ - String.cc \ ConfigParser.cc \ - fatal.h \ - tests/stub_fatal.cc \ tests/testConfigParser.cc \ tests/testConfigParser.h \ - cache_cf.h \ + tests/stub_HelperChildConfig.cc \ + tests/stub_MemBuf.cc \ + tests/stub_SBufDetailedStats.cc \ + String.cc \ tests/stub_cache_cf.cc \ + cache_cf.h \ tests/stub_cbdata.cc \ tests/stub_debug.cc \ + tests/stub_fatal.cc \ + fatal.h \ tests/stub_libmem.cc \ - tests/stub_HelperChildConfig.cc \ - tools.h \ + tests/stub_time.cc \ tests/stub_tools.cc \ - wordlist.h \ - wordlist.cc + tools.h \ + wordlist.cc \ + wordlist.h nodist_tests_testConfigParser_SOURCES = \ $(TESTSOURCES) tests_testConfigParser_LDADD = \ @@ -2858,26 +2858,21 @@ tests_testConfigParser_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testEvent tests_testEvent_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(DNSSOURCE) \ + $(HTCPSOURCE) \ + $(IPC_SOURCE) \ + $(SNMP_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ AccessLogEntry.cc \ + AuthReg.h \ BodyPipe.cc \ - CacheDigest.h \ tests/stub_CacheDigest.cc \ - cache_cf.h \ - AuthReg.h \ - RefreshPattern.h \ + CacheDigest.h \ CachePeer.cc \ CachePeer.h \ - cache_manager.cc \ - carp.h \ - tests/stub_carp.cc \ - cbdata.cc \ - tests/stub_client_db.cc \ - client_side.h \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ ClientInfo.h \ - clientStream.cc \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ @@ -2885,171 +2880,176 @@ tests_testEvent_SOURCES = \ CpuAffinityMap.h \ CpuAffinitySet.cc \ CpuAffinitySet.h \ - debug.cc \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ - dlink.h \ - dlink.cc \ - $(DNSSOURCE) \ - errorpage.cc \ tests/stub_ETag.cc \ - event.cc \ - EventLoop.h \ + tests/testEvent.cc \ + tests/testEvent.h \ EventLoop.cc \ - external_acl.cc \ + EventLoop.h \ ExternalACLEntry.cc \ FadingCounter.cc \ - fatal.h \ - tests/stub_fatal.cc \ - fd.h \ - fd.cc \ - fde.cc \ FileMap.h \ - filemap.cc \ - fqdncache.h \ - fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - tests/stub_gopher.cc \ HappyConnOpener.cc \ HappyConnOpener.h \ - helper.cc \ - hier_code.h \ - $(HTCPSOURCE) \ - http.cc \ - HttpBody.h \ HttpBody.cc \ + HttpBody.h \ tests/stub_HttpControlMsg.cc \ - HttpHeader.h \ - HttpHeader.cc \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ - HttpHeaderTools.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ + HttpHeaderTools.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - PeerPoolMgr.h \ + HttpRequest.cc \ + tests/stub_HttpUpgradeProtocolAccess.cc \ + IoStats.h \ + LogTags.cc \ + MasterXaction.cc \ + MasterXaction.h \ + MemBuf.cc \ + MemObject.cc \ + MemStore.cc \ + Notes.cc \ + Notes.h \ + Parsing.cc \ PeerPoolMgr.cc \ - RequestFlags.h \ + PeerPoolMgr.h \ + Pipeline.cc \ + Pipeline.h \ + RefreshPattern.h \ + RemovalPolicy.cc \ RequestFlags.cc \ - HttpRequest.cc \ + RequestFlags.h \ + ResolvedPeers.cc \ + ResolvedPeers.h \ + tests/stub_SBufDetailedStats.cc \ + SquidMath.cc \ + SquidMath.h \ + StatCounters.cc \ + StatCounters.h \ + StatHist.cc \ + StatHist.h \ + StoreFileSystem.cc \ + StoreIOState.cc \ + tests/stub_StoreMeta.cc \ + StoreMetaUnpacker.cc \ + StoreSwapLogData.cc \ + StrList.cc \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/stub_cache_cf.cc \ + cache_cf.h \ + cache_manager.cc \ + tests/stub_carp.cc \ + carp.h \ + cbdata.cc \ + clientStream.cc \ + tests/stub_client_db.cc \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_request.cc \ + debug.cc \ + dlink.cc \ + dlink.h \ + errorpage.cc \ + event.cc \ + external_acl.cc \ + tests/stub_fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + filemap.cc \ + fqdncache.cc \ + fqdncache.h \ + fs_io.cc \ + fs_io.h \ + tests/stub_gopher.cc \ + gopher.h \ + helper.cc \ + hier_code.h \ + http.cc \ icp_v2.cc \ icp_v3.cc \ - $(IPC_SOURCE) \ - ipcache.cc \ - int.h \ int.cc \ - internal.h \ + int.h \ internal.cc \ - LogTags.cc \ - tests/stub_libsecurity.cc \ - MasterXaction.cc \ - MasterXaction.h \ + internal.h \ + tests/stub_ipc_Forwarder.cc \ + ipcache.cc \ + tests/stub_libauth.cc \ + tests/stub_libauth_acls.cc \ + tests/stub_libdiskio.cc \ + tests/stub_libeui.cc \ tests/stub_libmem.cc \ + tests/stub_libsecurity.cc \ + tests/stub_libstore.cc \ + tests/stub_main_cc.cc \ mem_node.cc \ - MemBuf.cc \ - MemObject.cc \ - mime.h \ mime.cc \ - mime_header.h \ + mime.h \ mime_header.cc \ - multicast.h \ + mime_header.h \ multicast.cc \ - neighbors.h \ + multicast.h \ neighbors.cc \ - Notes.cc \ - Notes.h \ - Parsing.cc \ + neighbors.h \ pconn.cc \ peer_digest.cc \ - peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ + peer_proxy_negotiate_auth.h \ peer_select.cc \ - peer_sourcehash.h \ peer_sourcehash.cc \ - peer_userhash.h \ + peer_sourcehash.h \ peer_userhash.cc \ - Pipeline.cc \ - Pipeline.h \ - redirect.h \ + peer_userhash.h \ tests/stub_redirect.cc \ - refresh.h \ + redirect.h \ refresh.cc \ - RemovalPolicy.cc \ - ResolvedPeers.h \ - ResolvedPeers.cc \ - StrList.h \ - StrList.cc \ - tests/stub_SBufDetailedStats.cc \ - $(SNMP_SOURCE) \ - SquidMath.cc \ - SquidMath.h \ - IoStats.h \ - stat.h \ + refresh.h \ + repl_modules.h \ stat.cc \ - StatCounters.h \ - StatCounters.cc \ - StatHist.h \ - StatHist.cc \ + stat.h \ stmem.cc \ - repl_modules.h \ store.cc \ store_client.cc \ - store_digest.h \ tests/stub_store_digest.cc \ + store_digest.h \ store_io.cc \ - store_key_md5.h \ store_key_md5.cc \ - store_log.h \ + store_key_md5.h \ store_log.cc \ - store_rebuild.h \ + store_log.h \ store_rebuild.cc \ - store_swapin.h \ + store_rebuild.h \ + tests/stub_store_stats.cc \ store_swapin.cc \ + store_swapin.h \ store_swapmeta.cc \ store_swapout.cc \ - StoreFileSystem.cc \ - StoreIOState.cc \ - tests/stub_StoreMeta.cc \ - StoreMetaUnpacker.cc \ - StoreSwapLogData.cc \ - String.cc \ - tests/stub_cache_cf.cc \ - tests/stub_HttpUpgradeProtocolAccess.cc \ - tests/stub_libstore.cc \ tests/CapturingStoreEntry.h \ - tests/testEvent.cc \ - tests/testEvent.h \ - tests/stub_main_cc.cc \ - tests/stub_ipc_Forwarder.cc \ - tests/stub_libauth_acls.cc \ - tests/stub_libauth.cc \ - tests/stub_libdiskio.cc \ - tests/stub_libeui.cc \ - tests/stub_store_stats.cc \ time.cc \ - tools.h \ tools.cc \ - Transients.cc \ + tools.h \ tests/stub_tunnel.cc \ - MemStore.cc \ - $(UNLINKDSOURCE) \ - urn.h \ urn.cc \ - wccp2.h \ + urn.h \ tests/stub_wccp2.cc \ - whois.h \ + wccp2.h \ tests/stub_whois.cc \ - $(WIN32_SOURCE) \ - wordlist.h \ - wordlist.cc + whois.h \ + wordlist.cc \ + wordlist.h nodist_tests_testEvent_SOURCES = \ $(BUILT_SOURCES) tests_testEvent_LDADD = \ @@ -3097,26 +3097,21 @@ tests_testEvent_LDFLAGS = $(LIBADD_DL) check_PROGRAMS += tests/testEventLoop tests_testEventLoop_SOURCES = \ + $(DELAY_POOL_SOURCE) \ + $(DNSSOURCE) \ + $(HTCPSOURCE) \ + $(IPC_SOURCE) \ + $(SNMP_SOURCE) \ + $(UNLINKDSOURCE) \ + $(WIN32_SOURCE) \ AccessLogEntry.cc \ + AuthReg.h \ BodyPipe.cc \ - CacheDigest.h \ tests/stub_CacheDigest.cc \ - cache_manager.cc \ - cache_cf.h \ - AuthReg.h \ - RefreshPattern.h \ + CacheDigest.h \ CachePeer.cc \ CachePeer.h \ - carp.h \ - tests/stub_carp.cc \ - cbdata.cc \ - tests/stub_client_db.cc \ - client_side.h \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ ClientInfo.h \ - clientStream.cc \ tests/stub_CollapsedForwarding.cc \ ConfigOption.cc \ ConfigParser.cc \ @@ -3124,170 +3119,175 @@ tests_testEventLoop_SOURCES = \ CpuAffinityMap.h \ CpuAffinitySet.cc \ CpuAffinitySet.h \ - debug.cc \ - $(DELAY_POOL_SOURCE) \ - fs_io.h \ - fs_io.cc \ - dlink.h \ - dlink.cc \ - $(DNSSOURCE) \ - errorpage.cc \ tests/stub_ETag.cc \ - EventLoop.h \ EventLoop.cc \ - event.cc \ - external_acl.cc \ + tests/testEventLoop.cc \ + EventLoop.h \ + tests/testEventLoop.h \ ExternalACLEntry.cc \ FadingCounter.cc \ - fatal.h \ - tests/stub_fatal.cc \ - fd.h \ - fd.cc \ - fde.cc \ FileMap.h \ - filemap.cc \ - fqdncache.h \ - fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - tests/stub_gopher.cc \ HappyConnOpener.cc \ HappyConnOpener.h \ - helper.cc \ - hier_code.h \ - $(HTCPSOURCE) \ - http.cc \ - HttpBody.h \ HttpBody.cc \ + HttpBody.h \ tests/stub_HttpControlMsg.cc \ - HttpHeader.h \ - HttpHeader.cc \ - HttpHeaderFieldInfo.h \ - HttpHeaderTools.h \ - HttpHeaderTools.cc \ - HttpHeaderFieldStat.h \ - HttpHdrCc.h \ HttpHdrCc.cc \ + HttpHdrCc.h \ HttpHdrContRange.cc \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderFieldInfo.h \ + HttpHeaderFieldStat.h \ + HttpHeaderTools.cc \ + HttpHeaderTools.h \ HttpReply.cc \ - PeerPoolMgr.h \ - PeerPoolMgr.cc \ - RequestFlags.h \ - RequestFlags.cc \ HttpRequest.cc \ - icp_v2.cc \ - icp_v3.cc \ - $(IPC_SOURCE) \ - ipcache.cc \ - int.h \ - int.cc \ - internal.h \ - internal.cc \ + tests/stub_HttpUpgradeProtocolAccess.cc \ + IoStats.h \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ MemBuf.cc \ MemObject.cc \ + MemStore.cc \ + Notes.cc \ + Notes.h \ + Parsing.cc \ + PeerPoolMgr.cc \ + PeerPoolMgr.h \ + Pipeline.cc \ + Pipeline.h \ + RefreshPattern.h \ + RemovalPolicy.cc \ + RequestFlags.cc \ + RequestFlags.h \ + ResolvedPeers.cc \ + ResolvedPeers.h \ + tests/stub_SBufDetailedStats.cc \ + SquidMath.cc \ + SquidMath.h \ + StatCounters.cc \ + StatCounters.h \ + StatHist.cc \ + StatHist.h \ + StoreFileSystem.cc \ + StoreIOState.cc \ + tests/stub_StoreMeta.cc \ + StoreMetaUnpacker.cc \ + StoreSwapLogData.cc \ + StrList.cc \ + StrList.h \ + String.cc \ + Transients.cc \ + tests/stub_cache_cf.cc \ + cache_cf.h \ + cache_manager.cc \ + tests/stub_carp.cc \ + carp.h \ + cbdata.cc \ + clientStream.cc \ + tests/stub_client_db.cc \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_request.cc \ + debug.cc \ + dlink.cc \ + dlink.h \ + errorpage.cc \ + event.cc \ + external_acl.cc \ + tests/stub_fatal.cc \ + fatal.h \ + fd.cc \ + fd.h \ + fde.cc \ + filemap.cc \ + fqdncache.cc \ + fqdncache.h \ + fs_io.cc \ + fs_io.h \ + tests/stub_gopher.cc \ + gopher.h \ + helper.cc \ + hier_code.h \ + http.cc \ + icp_v2.cc \ + icp_v3.cc \ + int.cc \ + int.h \ + internal.cc \ + internal.h \ + tests/stub_ipc_Forwarder.cc \ + ipcache.cc \ + tests/stub_libauth.cc \ + tests/stub_libauth_acls.cc \ + tests/stub_libdiskio.cc \ + tests/stub_libeui.cc \ tests/stub_libmem.cc \ + tests/stub_libsecurity.cc \ + tests/stub_libstore.cc \ + tests/stub_main_cc.cc \ mem_node.cc \ - mime.h \ mime.cc \ - mime_header.h \ + mime.h \ mime_header.cc \ - multicast.h \ + mime_header.h \ multicast.cc \ - neighbors.h \ + multicast.h \ neighbors.cc \ - Notes.cc \ - Notes.h \ - Parsing.cc \ + neighbors.h \ pconn.cc \ peer_digest.cc \ - peer_proxy_negotiate_auth.h \ peer_proxy_negotiate_auth.cc \ + peer_proxy_negotiate_auth.h \ peer_select.cc \ - peer_sourcehash.h \ peer_sourcehash.cc \ - peer_userhash.h \ + peer_sourcehash.h \ peer_userhash.cc \ - Pipeline.cc \ - Pipeline.h \ - RemovalPolicy.cc \ - ResolvedPeers.cc \ - ResolvedPeers.h \ - redirect.h \ + peer_userhash.h \ tests/stub_redirect.cc \ - refresh.h \ + redirect.h \ refresh.cc \ - tests/stub_SBufDetailedStats.cc \ - $(SNMP_SOURCE) \ - SquidMath.h \ - SquidMath.cc \ - IoStats.h \ - stat.h \ + refresh.h \ + repl_modules.h \ stat.cc \ - StatCounters.h \ - StatCounters.cc \ - StatHist.h \ - StatHist.cc \ + stat.h \ stmem.cc \ - repl_modules.h \ store.cc \ store_client.cc \ - store_digest.h \ tests/stub_store_digest.cc \ + store_digest.h \ store_io.cc \ - store_key_md5.h \ store_key_md5.cc \ - store_log.h \ + store_key_md5.h \ store_log.cc \ - store_rebuild.h \ + store_log.h \ store_rebuild.cc \ - store_swapin.h \ + store_rebuild.h \ + tests/stub_store_stats.cc \ store_swapin.cc \ + store_swapin.h \ store_swapmeta.cc \ store_swapout.cc \ - StoreFileSystem.cc \ - StoreIOState.cc \ - tests/stub_StoreMeta.cc \ - StoreMetaUnpacker.cc \ - StoreSwapLogData.cc \ - String.cc \ - StrList.h \ - StrList.cc \ - tests/stub_cache_cf.cc \ - tests/stub_HttpUpgradeProtocolAccess.cc \ - tests/stub_libstore.cc \ - tests/testEventLoop.cc \ - tests/testEventLoop.h \ - tests/stub_main_cc.cc \ - tests/stub_ipc_Forwarder.cc \ - tests/stub_libauth_acls.cc \ - tests/stub_libauth.cc \ - tests/stub_libdiskio.cc \ - tests/stub_libeui.cc \ - tests/stub_libsecurity.cc \ - tests/stub_store_stats.cc \ time.cc \ - tools.h \ tools.cc \ - Transients.cc \ + tools.h \ tests/stub_tunnel.cc \ - MemStore.cc \ - $(UNLINKDSOURCE) \ - urn.h \ urn.cc \ - wccp2.h \ + urn.h \ tests/stub_wccp2.cc \ - whois.h \ + wccp2.h \ tests/stub_whois.cc \ - $(WIN32_SOURCE) \ - wordlist.h \ - wordlist.cc + whois.h \ + wordlist.cc \ + wordlist.h nodist_tests_testEventLoop_SOURCES = \ $(BUILT_SOURCES) tests_testEventLoop_LDADD = \ diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am index 050432524c..8e53973231 100644 --- a/src/acl/Makefile.am +++ b/src/acl/Makefile.am @@ -20,39 +20,32 @@ libapi_la_SOURCES = \ BoolOps.h \ Checklist.cc \ Checklist.h \ - forward.h \ InnerNode.cc \ InnerNode.h \ - Options.h \ Options.cc \ + Options.h \ Tree.cc \ - Tree.h + Tree.h \ + forward.h ## Data-dependent Squid/transaction state used by specific ACLs. ## Does not refer to specific ACLs to avoid circular dependencies. libstate_la_SOURCES = \ + Address.cc \ + Address.h \ CharacterSetOption.h \ Data.h \ - Strategy.h \ - Strategised.cc \ - Strategised.h \ FilledChecklist.cc \ FilledChecklist.h \ - Address.h \ - Address.cc + Strategised.cc \ + Strategised.h \ + Strategy.h ## data-specific ACLs libacls_la_SOURCES = \ - IntRange.cc \ - IntRange.h \ - RegexData.cc \ - RegexData.h \ - StringData.cc \ - StringData.h \ - Time.cc \ - Time.h \ - TimeData.cc \ - TimeData.h \ + AclDenyInfoList.h \ + AclSizeLimit.cc \ + AclSizeLimit.h \ AllOf.cc \ AllOf.h \ AnnotateClient.cc \ @@ -69,10 +62,10 @@ libacls_la_SOURCES = \ AtStep.h \ AtStepData.cc \ AtStepData.h \ - ConnectionsEncrypted.cc \ - ConnectionsEncrypted.h \ ConnMark.cc \ ConnMark.h \ + ConnectionsEncrypted.cc \ + ConnectionsEncrypted.h \ DestinationAsn.h \ DestinationDomain.cc \ DestinationDomain.h \ @@ -82,14 +75,16 @@ libacls_la_SOURCES = \ DomainData.h \ ExtUser.cc \ ExtUser.h \ + Gadgets.cc \ + Gadgets.h \ HasComponent.cc \ HasComponent.h \ HasComponentData.cc \ HasComponentData.h \ - HierCodeData.cc \ - HierCodeData.h \ HierCode.cc \ HierCode.h \ + HierCodeData.cc \ + HierCodeData.h \ HttpHeaderData.cc \ HttpHeaderData.h \ HttpRepHeader.cc \ @@ -98,6 +93,8 @@ libacls_la_SOURCES = \ HttpReqHeader.h \ HttpStatus.cc \ HttpStatus.h \ + IntRange.cc \ + IntRange.h \ Ip.cc \ Ip.h \ LocalIp.cc \ @@ -107,23 +104,25 @@ libacls_la_SOURCES = \ MaxConnection.cc \ MaxConnection.h \ Method.cc \ + Method.h \ MethodData.cc \ MethodData.h \ - Method.h \ MyPortName.cc \ MyPortName.h \ - Note.h \ Note.cc \ - NoteData.h \ + Note.h \ NoteData.cc \ + NoteData.h \ PeerName.cc \ PeerName.h \ Protocol.cc \ + Protocol.h \ ProtocolData.cc \ ProtocolData.h \ - Protocol.h \ Random.cc \ Random.h \ + RegexData.cc \ + RegexData.h \ ReplyHeaderStrategy.h \ ReplyMimeType.h \ RequestHeaderStrategy.h \ @@ -133,12 +132,18 @@ libacls_la_SOURCES = \ SourceDomain.h \ SourceIp.cc \ SourceIp.h \ - SquidError.h \ SquidError.cc \ + SquidError.h \ SquidErrorData.cc \ SquidErrorData.h \ + StringData.cc \ + StringData.h \ Tag.cc \ Tag.h \ + Time.cc \ + Time.h \ + TimeData.cc \ + TimeData.h \ TransactionInitiator.cc \ TransactionInitiator.h \ Url.cc \ @@ -150,12 +155,7 @@ libacls_la_SOURCES = \ UrlPort.cc \ UrlPort.h \ UserData.cc \ - UserData.h \ - AclDenyInfoList.h \ - Gadgets.cc \ - Gadgets.h \ - AclSizeLimit.cc \ - AclSizeLimit.h + UserData.h ## Add conditional sources ## TODO: move these to their respective dirs when those dirs are created diff --git a/src/acl/external/LDAP_group/Makefile.am b/src/acl/external/LDAP_group/Makefile.am index 64da39e2ae..51c22a13a2 100644 --- a/src/acl/external/LDAP_group/Makefile.am +++ b/src/acl/external/LDAP_group/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= ext_ldap_group_acl man_MANS= ext_ldap_group_acl.8 -ext_ldap_group_acl_SOURCES= \ +ext_ldap_group_acl_SOURCES = \ ext_ldap_group_acl.cc ext_ldap_group_acl_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/acl/external/LM_group/Makefile.am b/src/acl/external/LM_group/Makefile.am index 2b7945f10c..83ee03512d 100644 --- a/src/acl/external/LM_group/Makefile.am +++ b/src/acl/external/LM_group/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= ext_lm_group_acl man_MANS= ext_lm_group_acl.8 -ext_lm_group_acl_SOURCES= ext_lm_group_acl.cc +ext_lm_group_acl_SOURCES = ext_lm_group_acl.cc ext_lm_group_acl_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ diff --git a/src/acl/external/file_userip/Makefile.am b/src/acl/external/file_userip/Makefile.am index 1297bc0e0a..45ef077f0c 100644 --- a/src/acl/external/file_userip/Makefile.am +++ b/src/acl/external/file_userip/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = ext_file_userip_acl man_MANS = ext_file_userip_acl.8 -ext_file_userip_acl_SOURCES= \ +ext_file_userip_acl_SOURCES = \ ext_file_userip_acl.cc ext_file_userip_acl_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/acl/external/kerberos_ldap_group/Makefile.am b/src/acl/external/kerberos_ldap_group/Makefile.am index c6fd1d019d..f9f07f0ca7 100644 --- a/src/acl/external/kerberos_ldap_group/Makefile.am +++ b/src/acl/external/kerberos_ldap_group/Makefile.am @@ -23,14 +23,14 @@ ext_kerberos_ldap_group_acl_SOURCES = \ kerberos_ldap_group.cc \ support.h \ support_group.cc \ - support_netbios.cc \ - support_member.cc \ support_krb5.cc \ support_ldap.cc \ - support_sasl.cc \ - support_resolv.cc \ + support_log.cc \ support_lserver.cc \ - support_log.cc + support_member.cc \ + support_netbios.cc \ + support_resolv.cc \ + support_sasl.cc ext_kerberos_ldap_group_acl_LDFLAGS = ext_kerberos_ldap_group_acl_LDADD = \ diff --git a/src/acl/external/session/Makefile.am b/src/acl/external/session/Makefile.am index 20056c743b..57462da98b 100644 --- a/src/acl/external/session/Makefile.am +++ b/src/acl/external/session/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= ext_session_acl man_MANS= ext_session_acl.8 -ext_session_acl_SOURCES= \ +ext_session_acl_SOURCES = \ ext_session_acl.cc ext_session_acl_LDADD = \ $(COMPAT_LIB) \ diff --git a/src/acl/external/time_quota/Makefile.am b/src/acl/external/time_quota/Makefile.am index 0751d5825c..a97221d8f6 100644 --- a/src/acl/external/time_quota/Makefile.am +++ b/src/acl/external/time_quota/Makefile.am @@ -12,7 +12,7 @@ man_MANS= ext_time_quota_acl.8 DEFS += -DDEFAULT_QUOTA_DB=\"$(localstatedir)/ext_time_quota.db\" -ext_time_quota_acl_SOURCES= \ +ext_time_quota_acl_SOURCES = \ ext_time_quota_acl.cc ext_time_quota_acl_LDADD = \ $(COMPAT_LIB) \ diff --git a/src/acl/external/unix_group/Makefile.am b/src/acl/external/unix_group/Makefile.am index dbee181601..2d5dc2127d 100644 --- a/src/acl/external/unix_group/Makefile.am +++ b/src/acl/external/unix_group/Makefile.am @@ -11,7 +11,7 @@ libexec_PROGRAMS = ext_unix_group_acl man_MANS = ext_unix_group_acl.8 EXTRA_DIST = ext_unix_group_acl.8 required.m4 -ext_unix_group_acl_SOURCES= \ +ext_unix_group_acl_SOURCES = \ check_group.cc ext_unix_group_acl_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am index c44688ba22..6384d409a9 100644 --- a/src/adaptation/Makefile.am +++ b/src/adaptation/Makefile.am @@ -26,7 +26,8 @@ libadaptation_la_SOURCES = \ DynamicGroupCfg.h \ Elements.cc \ Elements.h \ - forward.h \ + History.cc \ + History.h \ Initiate.cc \ Initiate.h \ Initiator.cc \ @@ -39,12 +40,11 @@ libadaptation_la_SOURCES = \ Service.h \ ServiceConfig.cc \ ServiceConfig.h \ - ServiceGroups.cc \ - ServiceGroups.h \ ServiceFilter.cc \ ServiceFilter.h \ - History.cc \ - History.h + ServiceGroups.cc \ + ServiceGroups.h \ + forward.h libadaptation_la_LIBADD = diff --git a/src/adaptation/ecap/Makefile.am b/src/adaptation/ecap/Makefile.am index 9ed26975aa..d34dca617e 100644 --- a/src/adaptation/ecap/Makefile.am +++ b/src/adaptation/ecap/Makefile.am @@ -11,18 +11,17 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libecapsquid.la libecapsquid_la_SOURCES = \ - Config.h \ Config.cc \ - Host.h \ + Config.h \ Host.cc \ - MessageRep.h \ + Host.h \ MessageRep.cc \ - ServiceRep.h \ + MessageRep.h \ + Registry.h \ ServiceRep.cc \ - XactionRep.h \ + ServiceRep.h \ XactionRep.cc \ - \ - Registry.h + XactionRep.h # add libecap using its pkg-config-produced configuration variables libecapsquid_la_CXXFLAGS = $(EXT_LIBECAP_CFLAGS) diff --git a/src/adaptation/icap/Makefile.am b/src/adaptation/icap/Makefile.am index 2066eba555..8819ead4c5 100644 --- a/src/adaptation/icap/Makefile.am +++ b/src/adaptation/icap/Makefile.am @@ -13,24 +13,24 @@ noinst_LTLIBRARIES = libicap.la libicap_la_SOURCES = \ Client.cc \ Client.h \ - InOut.h \ Config.cc \ Config.h \ Elements.cc \ Elements.h \ - Options.cc \ - Options.h \ - ServiceRep.cc \ - ServiceRep.h \ + History.cc \ + History.h \ + InOut.h \ Launcher.cc \ Launcher.h \ + ModXact.cc \ + ModXact.h \ OptXact.cc \ OptXact.h \ + Options.cc \ + Options.h \ + ServiceRep.cc \ + ServiceRep.h \ Xaction.cc \ Xaction.h \ - ModXact.cc \ - ModXact.h \ icap_log.cc \ - icap_log.h \ - History.cc \ - History.h + icap_log.h diff --git a/src/anyp/Makefile.am b/src/anyp/Makefile.am index 9f59546328..ff6dc18fd5 100644 --- a/src/anyp/Makefile.am +++ b/src/anyp/Makefile.am @@ -11,7 +11,6 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libanyp.la libanyp_la_SOURCES = \ - forward.h \ PortCfg.cc \ PortCfg.h \ ProtocolType.cc \ @@ -21,7 +20,8 @@ libanyp_la_SOURCES = \ Uri.cc \ Uri.h \ UriScheme.cc \ - UriScheme.h + UriScheme.h \ + forward.h ProtocolType.cc: ProtocolType.h $(top_srcdir)/src/mk-string-arrays.awk ($(AWK) -f $(top_srcdir)/src/mk-string-arrays.awk <$(srcdir)/ProtocolType.h | sed -e 's%PROTO_%%' >$@) || ($(RM) -f $@ && exit 1) diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 0b8832a9c3..cbc97be3e2 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -17,15 +17,12 @@ noinst_LTLIBRARIES = libauth.la libacls.la ## authentication framework; this library is always built libauth_la_SOURCES = \ - Type.h \ - Type.cc \ Config.cc \ Config.h \ - CredentialsCache.h \ - CredentialsCache.cc \ CredentialState.cc \ CredentialState.h \ - forward.h \ + CredentialsCache.cc \ + CredentialsCache.h \ Gadgets.cc \ Gadgets.h \ QueueNode.h \ @@ -33,16 +30,19 @@ libauth_la_SOURCES = \ Scheme.h \ SchemeConfig.cc \ SchemeConfig.h \ - SchemesConfig.h \ SchemesConfig.cc \ - State.h \ + SchemesConfig.h \ State.cc \ - toUtf.h \ - toUtf.cc \ - User.h \ + State.h \ + Type.cc \ + Type.h \ User.cc \ + User.h \ + UserRequest.cc \ UserRequest.h \ - UserRequest.cc + forward.h \ + toUtf.cc \ + toUtf.h libauth_la_LIBADD = $(AUTH_LIBS_TO_BUILD) libauth_la_DEPENDENCIES = $(AUTH_LIBS_TO_BUILD) @@ -51,7 +51,6 @@ libauth_la_DEPENDENCIES = $(AUTH_LIBS_TO_BUILD) libacls_la_SOURCES = \ Acl.cc \ Acl.h \ - \ AclMaxUserIp.cc \ AclMaxUserIp.h \ AclProxyAuth.cc \ diff --git a/src/auth/basic/LDAP/Makefile.am b/src/auth/basic/LDAP/Makefile.am index 3a0111bd54..208688ef30 100644 --- a/src/auth/basic/LDAP/Makefile.am +++ b/src/auth/basic/LDAP/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = basic_ldap_auth man_MANS = basic_ldap_auth.8 EXTRA_DIST = basic_ldap_auth.8 required.m4 -basic_ldap_auth_SOURCES = basic_ldap_auth.cc +basic_ldap_auth_SOURCES = basic_ldap_auth.cc basic_ldap_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/basic/NCSA/Makefile.am b/src/auth/basic/NCSA/Makefile.am index 3abe910c9b..bbe1fb5a6e 100644 --- a/src/auth/basic/NCSA/Makefile.am +++ b/src/auth/basic/NCSA/Makefile.am @@ -11,7 +11,7 @@ libexec_PROGRAMS = basic_ncsa_auth man_MANS = basic_ncsa_auth.8 EXTRA_DIST = basic_ncsa_auth.8 required.m4 -basic_ncsa_auth_SOURCES= \ +basic_ncsa_auth_SOURCES = \ basic_ncsa_auth.cc \ crypt_md5.cc \ crypt_md5.h diff --git a/src/auth/basic/NIS/Makefile.am b/src/auth/basic/NIS/Makefile.am index ba905cf0c7..b7585ea1be 100644 --- a/src/auth/basic/NIS/Makefile.am +++ b/src/auth/basic/NIS/Makefile.am @@ -9,10 +9,10 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS = basic_nis_auth -basic_nis_auth_SOURCES= \ +basic_nis_auth_SOURCES = \ basic_nis_auth.cc \ - nis_support.h \ - nis_support.cc + nis_support.cc \ + nis_support.h basic_nis_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/basic/PAM/Makefile.am b/src/auth/basic/PAM/Makefile.am index c727848eb6..b3c9e07159 100644 --- a/src/auth/basic/PAM/Makefile.am +++ b/src/auth/basic/PAM/Makefile.am @@ -11,7 +11,7 @@ man_MANS = basic_pam_auth.8 EXTRA_DIST = basic_pam_auth.8 required.m4 libexec_PROGRAMS = basic_pam_auth -basic_pam_auth_SOURCES = basic_pam_auth.cc +basic_pam_auth_SOURCES = basic_pam_auth.cc basic_pam_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ $(COMPAT_LIB) \ diff --git a/src/auth/basic/RADIUS/Makefile.am b/src/auth/basic/RADIUS/Makefile.am index 96bcb97e0c..0216279170 100644 --- a/src/auth/basic/RADIUS/Makefile.am +++ b/src/auth/basic/RADIUS/Makefile.am @@ -11,11 +11,11 @@ libexec_PROGRAMS = basic_radius_auth man_MANS = basic_radius_auth.8 EXTRA_DIST = basic_radius_auth.8 required.m4 -basic_radius_auth_SOURCES= \ +basic_radius_auth_SOURCES = \ basic_radius_auth.cc \ - radius.h \ radius-util.cc \ - radius-util.h + radius-util.h \ + radius.h basic_radius_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/basic/SASL/Makefile.am b/src/auth/basic/SASL/Makefile.am index 02f9c071dd..b75819d032 100644 --- a/src/auth/basic/SASL/Makefile.am +++ b/src/auth/basic/SASL/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am man_MANS= basic_sasl_auth.8 libexec_PROGRAMS= basic_sasl_auth -basic_sasl_auth_SOURCES= \ +basic_sasl_auth_SOURCES = \ basic_sasl_auth.cc basic_sasl_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/basic/SMB/Makefile.am b/src/auth/basic/SMB/Makefile.am index 42af9444ce..f6b7ba58cd 100644 --- a/src/auth/basic/SMB/Makefile.am +++ b/src/auth/basic/SMB/Makefile.am @@ -12,7 +12,7 @@ libexec_SCRIPTS = basic_smb_auth.sh libexec_PROGRAMS = basic_smb_auth endif -basic_smb_auth_SOURCES= basic_smb_auth.cc +basic_smb_auth_SOURCES = basic_smb_auth.cc basic_smb_auth_CXXFLAGS = -DHELPERSCRIPT=\"$(libexecdir)/basic_smb_auth.sh\" basic_smb_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/basic/SMB_LM/Makefile.am b/src/auth/basic/SMB_LM/Makefile.am index 055bba9817..4dfcbc8d60 100644 --- a/src/auth/basic/SMB_LM/Makefile.am +++ b/src/auth/basic/SMB_LM/Makefile.am @@ -9,7 +9,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= basic_smb_lm_auth -basic_smb_lm_auth_SOURCES= \ +basic_smb_lm_auth_SOURCES = \ msntauth.cc \ msntauth.h \ valid.cc \ diff --git a/src/auth/basic/SSPI/Makefile.am b/src/auth/basic/SSPI/Makefile.am index 8864b5f031..bd335e7c6c 100644 --- a/src/auth/basic/SSPI/Makefile.am +++ b/src/auth/basic/SSPI/Makefile.am @@ -13,7 +13,8 @@ endif basic_sspi_auth_SOURCES = \ basic_sspi_auth.cc \ - valid.cc valid.h + valid.cc \ + valid.h basic_sspi_auth_CXXFLAGS = -Wl,--enable-auto-import basic_sspi_auth_LDADD = \ $(top_builddir)/lib/libsspwin32.la \ diff --git a/src/auth/digest/LDAP/Makefile.am b/src/auth/digest/LDAP/Makefile.am index ebdeeb56a0..c9f6224026 100644 --- a/src/auth/digest/LDAP/Makefile.am +++ b/src/auth/digest/LDAP/Makefile.am @@ -9,7 +9,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= digest_ldap_auth -digest_ldap_auth_SOURCES= \ +digest_ldap_auth_SOURCES = \ digest_common.h \ digest_pw_auth.cc \ ldap_backend.cc \ diff --git a/src/auth/digest/Makefile.am b/src/auth/digest/Makefile.am index afdd30632f..709f640630 100644 --- a/src/auth/digest/Makefile.am +++ b/src/auth/digest/Makefile.am @@ -14,7 +14,7 @@ EXTRA_DIST= helpers.m4 noinst_LTLIBRARIES= libdigest.la -libdigest_la_SOURCES= \ +libdigest_la_SOURCES = \ Config.cc \ Config.h \ Scheme.cc \ diff --git a/src/auth/digest/eDirectory/Makefile.am b/src/auth/digest/eDirectory/Makefile.am index a6739d321a..1475504c37 100644 --- a/src/auth/digest/eDirectory/Makefile.am +++ b/src/auth/digest/eDirectory/Makefile.am @@ -9,13 +9,13 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= digest_edirectory_auth -digest_edirectory_auth_SOURCES= \ - digest_pw_auth.cc \ +digest_edirectory_auth_SOURCES = \ digest_common.h \ - ldap_backend.cc \ - ldap_backend.h \ + digest_pw_auth.cc \ edir_ldapext.cc \ - edir_ldapext.h + edir_ldapext.h \ + ldap_backend.cc \ + ldap_backend.h digest_edirectory_auth_LDADD = \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/digest/file/Makefile.am b/src/auth/digest/file/Makefile.am index 8e2f584b4a..d0aa603053 100644 --- a/src/auth/digest/file/Makefile.am +++ b/src/auth/digest/file/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am man_MANS= digest_file_auth.8 libexec_PROGRAMS= digest_file_auth -digest_file_auth_SOURCES= \ +digest_file_auth_SOURCES = \ digest_common.h \ digest_file_auth.cc \ text_backend.cc \ diff --git a/src/auth/negotiate/Makefile.am b/src/auth/negotiate/Makefile.am index efc6918cc6..b2a3142717 100644 --- a/src/auth/negotiate/Makefile.am +++ b/src/auth/negotiate/Makefile.am @@ -15,10 +15,10 @@ EXTRA_DIST= helpers.m4 noinst_LTLIBRARIES = libnegotiate.la libnegotiate_la_SOURCES = \ - Scheme.cc \ - Scheme.h \ Config.cc \ Config.h \ + Scheme.cc \ + Scheme.h \ User.cc \ User.h \ UserRequest.cc \ diff --git a/src/auth/negotiate/kerberos/Makefile.am b/src/auth/negotiate/kerberos/Makefile.am index 4fb02b6ee1..c77ea3a08c 100644 --- a/src/auth/negotiate/kerberos/Makefile.am +++ b/src/auth/negotiate/kerberos/Makefile.am @@ -18,10 +18,10 @@ libexec_PROGRAMS = \ AM_CPPFLAGS += -I$(srcdir) -negotiate_kerberos_auth_SOURCES= \ +negotiate_kerberos_auth_SOURCES = \ + negotiate_kerberos.h \ negotiate_kerberos_auth.cc \ - negotiate_kerberos_pac.cc \ - negotiate_kerberos.h + negotiate_kerberos_pac.cc negotiate_kerberos_auth_LDFLAGS= negotiate_kerberos_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ @@ -30,7 +30,7 @@ negotiate_kerberos_auth_LDADD= \ $(KRB5LIBS) \ $(XTRA_LIBS) -negotiate_kerberos_auth_test_SOURCES= \ +negotiate_kerberos_auth_test_SOURCES = \ negotiate_kerberos_auth_test.cc negotiate_kerberos_auth_test_LDFLAGS= negotiate_kerberos_auth_test_LDADD= \ diff --git a/src/auth/negotiate/wrapper/Makefile.am b/src/auth/negotiate/wrapper/Makefile.am index 0fb00b6f1a..d1b029f5f0 100644 --- a/src/auth/negotiate/wrapper/Makefile.am +++ b/src/auth/negotiate/wrapper/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST= required.m4 libexec_PROGRAMS= negotiate_wrapper_auth -negotiate_wrapper_auth_SOURCES= \ +negotiate_wrapper_auth_SOURCES = \ negotiate_wrapper.cc negotiate_wrapper_auth_LDADD= \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/auth/ntlm/SSPI/Makefile.am b/src/auth/ntlm/SSPI/Makefile.am index ea1a10edaf..3644a7f99f 100644 --- a/src/auth/ntlm/SSPI/Makefile.am +++ b/src/auth/ntlm/SSPI/Makefile.am @@ -10,7 +10,7 @@ include $(top_srcdir)/src/Common.am man_MANS= ntlm_sspi_auth.8 libexec_PROGRAMS= ntlm_sspi_auth -ntlm_sspi_auth_SOURCES= ntlm_sspi_auth.cc +ntlm_sspi_auth_SOURCES = ntlm_sspi_auth.cc ntlm_sspi_auth_LDADD= \ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libsspwin32.la \ diff --git a/src/auth/ntlm/fake/Makefile.am b/src/auth/ntlm/fake/Makefile.am index cd82bc3a11..8ad749a936 100644 --- a/src/auth/ntlm/fake/Makefile.am +++ b/src/auth/ntlm/fake/Makefile.am @@ -9,7 +9,7 @@ include $(top_srcdir)/src/Common.am libexec_PROGRAMS= ntlm_fake_auth -ntlm_fake_auth_SOURCES= ntlm_fake_auth.cc +ntlm_fake_auth_SOURCES = ntlm_fake_auth.cc ntlm_fake_auth_LDADD= \ $(top_builddir)/lib/ntlmauth/libntlmauth.la \ $(top_builddir)/lib/libmiscencoding.la \ diff --git a/src/base/Makefile.am b/src/base/Makefile.am index c0c82ddf18..3d1cc4ac22 100644 --- a/src/base/Makefile.am +++ b/src/base/Makefile.am @@ -20,8 +20,8 @@ libbase_la_SOURCES = \ AsyncJob.h \ AsyncJobCalls.h \ ByteCounter.h \ - CbcPointer.h \ CbDataList.h \ + CbcPointer.h \ CharacterSet.cc \ CharacterSet.h \ CodeContext.cc \ @@ -29,7 +29,6 @@ libbase_la_SOURCES = \ EnumIterator.h \ File.cc \ File.h \ - forward.h \ HardFun.h \ Here.cc \ Here.h \ @@ -49,4 +48,5 @@ libbase_la_SOURCES = \ Subscription.h \ TextException.cc \ TextException.h \ - YesNoNone.h + YesNoNone.h \ + forward.h diff --git a/src/comm/Makefile.am b/src/comm/Makefile.am index 6bbd4220db..47dcd352bd 100644 --- a/src/comm/Makefile.am +++ b/src/comm/Makefile.am @@ -11,7 +11,7 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libcomm.la ## Library holding comm socket handlers -libcomm_la_SOURCES= \ +libcomm_la_SOURCES = \ AcceptLimiter.cc \ AcceptLimiter.h \ ConnOpener.cc \ @@ -19,7 +19,6 @@ libcomm_la_SOURCES= \ Connection.cc \ Connection.h \ Flag.h \ - forward.h \ IoCallback.cc \ IoCallback.h \ Loops.h \ @@ -36,5 +35,5 @@ libcomm_la_SOURCES= \ UdpOpenDialer.h \ Write.cc \ Write.h \ - \ - comm_internal.h + comm_internal.h \ + forward.h diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index a0f067eeab..1faa85280b 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -11,9 +11,9 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libdns.la libdns_la_SOURCES = \ - forward.h \ LookupDetails.cc \ LookupDetails.h \ + forward.h \ rfc1035.cc \ rfc1035.h \ rfc2671.cc \ diff --git a/src/esi/Makefile.am b/src/esi/Makefile.am index 09aac8e4e4..629d38ad01 100644 --- a/src/esi/Makefile.am +++ b/src/esi/Makefile.am @@ -25,12 +25,12 @@ ESI_PARSER_SOURCES += \ endif libesi_la_SOURCES = \ + $(ESI_PARSER_SOURCES) \ Assign.cc \ Assign.h \ Attempt.h \ Context.cc \ Context.h \ - $(ESI_PARSER_SOURCES) \ Element.h \ Esi.cc \ Esi.h \ diff --git a/src/eui/Makefile.am b/src/eui/Makefile.am index 34b9a4861b..f61cbc08df 100644 --- a/src/eui/Makefile.am +++ b/src/eui/Makefile.am @@ -11,11 +11,11 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libeui.la libeui_la_SOURCES = \ - Config.h \ Config.cc \ - Eui48.h \ + Config.h \ Eui48.cc \ - Eui64.h \ - Eui64.cc + Eui48.h \ + Eui64.cc \ + Eui64.h libeui_la_LIBADD = $(EUILIB) diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index b74f82cbf7..930e96319f 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -19,39 +19,41 @@ libdiskd_la_SOURCES = \ diskd/StoreFSdiskd.cc libufs_la_SOURCES = \ - ufs/StoreFSufs.h \ + ufs/RebuildState.cc \ + ufs/RebuildState.h \ ufs/StoreFSufs.cc \ + ufs/StoreFSufs.h \ + ufs/StoreSearchUFS.cc \ + ufs/StoreSearchUFS.h \ ufs/UFSStoreState.cc \ - ufs/UFSSwapDir.cc \ - ufs/UFSSwapDir.h \ + ufs/UFSStoreState.h \ ufs/UFSStrategy.cc \ ufs/UFSStrategy.h \ - ufs/UFSStoreState.h \ - ufs/StoreSearchUFS.h \ - ufs/StoreSearchUFS.cc \ - ufs/UFSSwapLogParser.h \ + ufs/UFSSwapDir.cc \ + ufs/UFSSwapDir.h \ ufs/UFSSwapLogParser.cc \ - ufs/RebuildState.h \ - ufs/RebuildState.cc + ufs/UFSSwapLogParser.h librock_la_SOURCES = \ - rock/forward.h \ rock/RockDbCell.cc \ rock/RockDbCell.h \ rock/RockHeaderUpdater.cc \ rock/RockHeaderUpdater.h \ - rock/RockIoState.cc \ - rock/RockIoState.h \ rock/RockIoRequests.cc \ rock/RockIoRequests.h \ + rock/RockIoState.cc \ + rock/RockIoState.h \ rock/RockRebuild.cc \ rock/RockRebuild.h \ rock/RockStoreFileSystem.cc \ rock/RockStoreFileSystem.h \ rock/RockSwapDir.cc \ - rock/RockSwapDir.h + rock/RockSwapDir.h \ + rock/forward.h -libfs_la_SOURCES = Module.cc Module.h +libfs_la_SOURCES = \ + Module.cc \ + Module.h libfs_la_LIBADD = $(STORE_LIBS_TO_BUILD) libfs_la_DEPENDENCIES = $(STORE_LIBS_TO_BUILD) diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 61e2b18b19..dfdada1ac7 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -13,12 +13,12 @@ noinst_LTLIBRARIES = libhelper.la libhelper_la_SOURCES = \ ChildConfig.cc \ ChildConfig.h \ - forward.h \ Reply.cc \ Reply.h \ Request.h \ - ResultCode.h \ + ReservationId.cc \ ReservationId.h \ - ReservationId.cc + ResultCode.h \ + forward.h EXTRA_DIST= protocol_defines.h diff --git a/src/http/Makefile.am b/src/http/Makefile.am index 59354223d8..8854c81e04 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -16,14 +16,13 @@ noinst_LTLIBRARIES = libhttp.la libhttp_la_SOURCES = \ ContentLengthInterpreter.cc \ ContentLengthInterpreter.h \ - forward.h \ Message.cc \ Message.h \ MethodType.cc \ MethodType.h \ ProtocolVersion.h \ - RegisteredHeaders.h \ RegisteredHeaders.cc \ + RegisteredHeaders.h \ RegisteredHeadersHash.cci \ RequestMethod.cc \ RequestMethod.h \ @@ -33,7 +32,8 @@ libhttp_la_SOURCES = \ StatusLine.cc \ StatusLine.h \ Stream.cc \ - Stream.h + Stream.h \ + forward.h libhttp_la_LIBADD= one/libhttp1.la diff --git a/src/http/one/Makefile.am b/src/http/one/Makefile.am index b69d4e18cc..5f399d196a 100644 --- a/src/http/one/Makefile.am +++ b/src/http/one/Makefile.am @@ -11,7 +11,6 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libhttp1.la libhttp1_la_SOURCES = \ - forward.h \ Parser.cc \ Parser.h \ RequestParser.cc \ @@ -21,4 +20,5 @@ libhttp1_la_SOURCES = \ TeChunkedParser.cc \ TeChunkedParser.h \ Tokenizer.cc \ - Tokenizer.h + Tokenizer.h \ + forward.h diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am index a5edcb54cd..3db8488b4d 100644 --- a/src/icmp/Makefile.am +++ b/src/icmp/Makefile.am @@ -20,17 +20,17 @@ noinst_LTLIBRARIES = libicmpcore.la libicmp.la # ICMP API definition ... libicmpcore_la_SOURCES = \ - Icmp.h \ - Icmp.cc + Icmp.cc \ + Icmp.h # Squid Internal ICMP helper interface libicmp_la_SOURCES = \ IcmpConfig.cc \ IcmpConfig.h \ - IcmpSquid.h \ IcmpSquid.cc \ - net_db.h \ - net_db.cc + IcmpSquid.h \ + net_db.cc \ + net_db.h libicmp_la_LIBADD= libicmpcore.la @@ -50,12 +50,12 @@ COPIED_SOURCE= \ # ICMP lookup helper pinger_SOURCES = \ Icmp.h \ - IcmpPinger.h \ - IcmpPinger.cc \ - Icmp4.h \ Icmp4.cc \ - Icmp6.h \ + Icmp4.h \ Icmp6.cc \ + Icmp6.h \ + IcmpPinger.cc \ + IcmpPinger.h \ pinger.cc nodist_pinger_SOURCES = $(COPIED_SOURCE) pinger_LDFLAGS = $(LIBADD_DL) diff --git a/src/ident/Makefile.am b/src/ident/Makefile.am index 5d56e59ba1..c2970d9da0 100644 --- a/src/ident/Makefile.am +++ b/src/ident/Makefile.am @@ -11,8 +11,8 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libident.la libident_la_SOURCES = \ - AclIdent.h \ AclIdent.cc \ + AclIdent.h \ Config.h \ Ident.cc \ Ident.h diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am index c41ba50fbe..825a4fee56 100644 --- a/src/ip/Makefile.am +++ b/src/ip/Makefile.am @@ -11,14 +11,14 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libip.la libip_la_SOURCES = \ - forward.h \ - Address.h \ Address.cc \ - Intercept.h \ + Address.h \ Intercept.cc \ - NfMarkConfig.h \ + Intercept.h \ NfMarkConfig.cc \ - QosConfig.h \ + NfMarkConfig.h \ QosConfig.cc \ + QosConfig.h \ + forward.h \ tools.cc \ tools.h diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am index 5c57427e49..e84da0db72 100644 --- a/src/ipc/Makefile.am +++ b/src/ipc/Makefile.am @@ -11,57 +11,56 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libipc.la libipc_la_SOURCES = \ + Coordinator.cc \ + Coordinator.h \ FdNotes.cc \ FdNotes.h \ + Forwarder.cc \ + Forwarder.h \ + Inquirer.cc \ + Inquirer.h \ Kid.cc \ Kid.h \ Kids.cc \ Kids.h \ - Messages.h \ MemMap.cc \ MemMap.h \ + Messages.h \ + Port.cc \ + Port.h \ Queue.cc \ Queue.h \ ReadWriteLock.cc \ ReadWriteLock.h \ + Request.h \ + Response.h \ + SharedListen.cc \ + SharedListen.h \ StartListening.cc \ StartListening.h \ StoreMap.cc \ StoreMap.h \ + Strand.cc \ + Strand.h \ StrandCoord.cc \ StrandCoord.h \ StrandCoords.h \ StrandSearch.cc \ StrandSearch.h \ - SharedListen.cc \ - SharedListen.h \ TypedMsgHdr.cc \ TypedMsgHdr.h \ - Coordinator.cc \ - Coordinator.h \ UdsOp.cc \ UdsOp.h \ - Port.cc \ - Port.h \ - Strand.cc \ - Strand.h \ forward.h \ - Forwarder.cc \ - Forwarder.h \ - Inquirer.cc \ - Inquirer.h \ - Request.h \ - Response.h \ - \ mem/FlexibleArray.h \ mem/Page.cc \ mem/Page.h \ mem/PagePool.cc \ mem/PagePool.h \ - mem/Pages.cc \ - mem/Pages.h \ mem/PageStack.cc \ mem/PageStack.h \ + mem/Pages.cc \ + mem/Pages.h \ mem/Pointer.h \ mem/Segment.cc \ mem/Segment.h \ diff --git a/src/log/Makefile.am b/src/log/Makefile.am index 3c641723b4..659b973511 100644 --- a/src/log/Makefile.am +++ b/src/log/Makefile.am @@ -15,21 +15,20 @@ EXTRA_DIST= helpers.m4 noinst_LTLIBRARIES = liblog.la liblog_la_SOURCES = \ - access_log.h \ - access_log.cc \ Config.cc \ Config.h \ + CustomLog.cc \ + CustomLog.h \ File.cc \ File.h \ FormatHttpdCombined.cc \ FormatHttpdCommon.cc \ - Formats.h \ FormatSquidCustom.cc \ FormatSquidIcap.cc \ FormatSquidNative.cc \ FormatSquidReferer.cc \ FormatSquidUseragent.cc \ - forward.h \ + Formats.h \ ModDaemon.cc \ ModDaemon.h \ ModStdio.cc \ @@ -38,8 +37,9 @@ liblog_la_SOURCES = \ ModSyslog.h \ ModUdp.cc \ ModUdp.h \ - CustomLog.h \ - CustomLog.cc \ TcpLogger.cc \ - TcpLogger.h + TcpLogger.h \ + access_log.cc \ + access_log.h \ + forward.h diff --git a/src/mem/Makefile.am b/src/mem/Makefile.am index 6e2ad152af..ef02587c9f 100644 --- a/src/mem/Makefile.am +++ b/src/mem/Makefile.am @@ -13,13 +13,13 @@ noinst_LTLIBRARIES = libmem.la libmem_la_SOURCES = \ AllocatorProxy.cc \ AllocatorProxy.h \ - forward.h \ Meter.h \ - old_api.cc \ Pool.cc \ Pool.h \ PoolChunked.cc \ PoolChunked.h \ - PoolingAllocator.h \ PoolMalloc.cc \ - PoolMalloc.h + PoolMalloc.h \ + PoolingAllocator.h \ + forward.h \ + old_api.cc diff --git a/src/mgr/Makefile.am b/src/mgr/Makefile.am index 27f9e3de83..8bb2626c0a 100644 --- a/src/mgr/Makefile.am +++ b/src/mgr/Makefile.am @@ -12,12 +12,12 @@ noinst_LTLIBRARIES = libmgr.la libmgr_la_SOURCES = \ Action.cc \ - ActionCreator.h \ Action.h \ + ActionCreator.h \ ActionParams.cc \ ActionParams.h \ - ActionPasswordList.h \ ActionPasswordList.cc \ + ActionPasswordList.h \ ActionProfile.h \ ActionWriter.cc \ ActionWriter.h \ @@ -31,17 +31,21 @@ libmgr_la_SOURCES = \ Filler.h \ Forwarder.cc \ Forwarder.h \ - forward.h \ FunAction.cc \ FunAction.h \ InfoAction.cc \ InfoAction.h \ Inquirer.cc \ Inquirer.h \ + IntParam.cc \ + IntParam.h \ IntervalAction.cc \ IntervalAction.h \ IoAction.cc \ IoAction.h \ + QueryParam.h \ + QueryParams.cc \ + QueryParams.h \ Registration.cc \ Registration.h \ Request.cc \ @@ -54,10 +58,6 @@ libmgr_la_SOURCES = \ StoreIoAction.h \ StoreToCommWriter.cc \ StoreToCommWriter.h \ - QueryParam.h \ - QueryParams.cc \ - QueryParams.h \ - IntParam.cc \ - IntParam.h \ StringParam.cc \ - StringParam.h + StringParam.h \ + forward.h diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 61acfa5817..b8ee7de837 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -11,9 +11,9 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libparser.la libparser_la_SOURCES = \ - BinaryTokenizer.h \ BinaryTokenizer.cc \ - forward.h \ + BinaryTokenizer.h \ + Tokenizer.cc \ Tokenizer.h \ - Tokenizer.cc + forward.h diff --git a/src/proxyp/Makefile.am b/src/proxyp/Makefile.am index 364667d5ff..14579d9c6b 100644 --- a/src/proxyp/Makefile.am +++ b/src/proxyp/Makefile.am @@ -11,11 +11,11 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libproxyp.la libproxyp_la_SOURCES = \ - forward.h \ - Elements.h \ Elements.cc \ + Elements.h \ Header.cc \ Header.h \ Parser.cc \ - Parser.h + Parser.h \ + forward.h diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am index db988dfe4e..d1ac99c41c 100644 --- a/src/repl/Makefile.am +++ b/src/repl/Makefile.am @@ -16,7 +16,10 @@ EXTRA_LIBRARIES = liblru.a libheap.a noinst_LIBRARIES = $(REPL_LIBS) liblru_a_SOURCES = lru/store_repl_lru.cc -libheap_a_SOURCES = heap/store_heap_replacement.h heap/store_heap_replacement.cc heap/store_repl_heap.cc +libheap_a_SOURCES = \ + heap/store_heap_replacement.cc \ + heap/store_heap_replacement.h \ + heap/store_repl_heap.cc ## Until such time as we have a makefile in src/repl/heap etc. diff --git a/src/sbuf/Makefile.am b/src/sbuf/Makefile.am index 4bf80c508a..b5acb9e45a 100644 --- a/src/sbuf/Makefile.am +++ b/src/sbuf/Makefile.am @@ -15,7 +15,6 @@ libsbuf_la_SOURCES = \ Algorithms.h \ DetailedStats.cc \ DetailedStats.h \ - forward.h \ List.cc \ List.h \ MemBlob.cc \ @@ -24,4 +23,5 @@ libsbuf_la_SOURCES = \ SBuf.h \ Stats.cc \ Stats.h \ - Stream.h + Stream.h \ + forward.h diff --git a/src/security/Makefile.am b/src/security/Makefile.am index 6f08d7d2e2..f729ba159a 100644 --- a/src/security/Makefile.am +++ b/src/security/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS= cert_generators cert_validators noinst_LTLIBRARIES = libsecurity.la -libsecurity_la_SOURCES= \ +libsecurity_la_SOURCES = \ BlindPeerConnector.cc \ BlindPeerConnector.h \ CertError.h \ @@ -21,7 +21,6 @@ libsecurity_la_SOURCES= \ EncryptorAnswer.h \ Handshake.cc \ Handshake.h \ - forward.h \ KeyData.cc \ KeyData.h \ LockingPointer.h \ @@ -34,4 +33,5 @@ libsecurity_la_SOURCES= \ ServerOptions.cc \ ServerOptions.h \ Session.cc \ - Session.h + Session.h \ + forward.h diff --git a/src/servers/Makefile.am b/src/servers/Makefile.am index 0e1a77fd08..6ca7474161 100644 --- a/src/servers/Makefile.am +++ b/src/servers/Makefile.am @@ -11,10 +11,10 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libservers.la libservers_la_SOURCES = \ - forward.h \ FtpServer.cc \ FtpServer.h \ Http1Server.cc \ Http1Server.h \ Server.cc \ - Server.h + Server.h \ + forward.h diff --git a/src/snmp/Makefile.am b/src/snmp/Makefile.am index 09fce28b90..0a8d399d87 100644 --- a/src/snmp/Makefile.am +++ b/src/snmp/Makefile.am @@ -13,7 +13,6 @@ noinst_LTLIBRARIES = libsnmp.la libsnmp_la_SOURCES = \ Forwarder.cc \ Forwarder.h \ - forward.h \ Inquirer.cc \ Inquirer.h \ Pdu.cc \ @@ -25,4 +24,5 @@ libsnmp_la_SOURCES = \ Session.cc \ Session.h \ Var.cc \ - Var.h + Var.h \ + forward.h diff --git a/src/ssl/Makefile.am b/src/ssl/Makefile.am index 7ba9046535..1119db1b9b 100644 --- a/src/ssl/Makefile.am +++ b/src/ssl/Makefile.am @@ -12,12 +12,6 @@ noinst_LTLIBRARIES = libsslsquid.la libsslutil.la ## SSL stuff used by main Squid but not by certgen helper libsslsquid_la_SOURCES = \ - bio.cc \ - bio.h \ - cert_validate_message.cc \ - cert_validate_message.h \ - context_storage.cc \ - context_storage.h \ Config.cc \ Config.h \ ErrorDetail.cc \ @@ -29,14 +23,20 @@ libsslsquid_la_SOURCES = \ ProxyCerts.h \ ServerBump.cc \ ServerBump.h \ - support.cc \ - support.h \ + bio.cc \ + bio.h \ + cert_validate_message.cc \ + cert_validate_message.h \ + context_storage.cc \ + context_storage.h \ helper.cc \ - helper.h + helper.h \ + support.cc \ + support.h ## SSL stuff used by main Squid and certgen helper libsslutil_la_SOURCES = \ - gadgets.cc \ - gadgets.h \ crtd_message.cc \ - crtd_message.h + crtd_message.h \ + gadgets.cc \ + gadgets.h diff --git a/src/store/Makefile.am b/src/store/Makefile.am index 9af8f433d3..83e70d6b3f 100644 --- a/src/store/Makefile.am +++ b/src/store/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS= id_rewriters noinst_LTLIBRARIES = libstore.la -libstore_la_SOURCES= \ +libstore_la_SOURCES = \ Controlled.h \ Controller.cc \ Controller.h \ @@ -20,7 +20,7 @@ libstore_la_SOURCES= \ Disk.h \ Disks.cc \ Disks.h \ - forward.h \ LocalSearch.cc \ LocalSearch.h \ - Storage.h + Storage.h \ + forward.h diff --git a/src/tests/Stub.list b/src/tests/Stub.list index f17c4ab420..19bf1246ae 100644 --- a/src/tests/Stub.list +++ b/src/tests/Stub.list @@ -12,6 +12,7 @@ STUB_SOURCE= tests/STUB.h \ tests/stub_cache_cf.cc \ tests/stub_CacheDigest.cc \ tests/stub_cache_manager.cc \ + tests/stub_CachePeer.cc \ tests/stub_carp.cc \ tests/stub_cbdata.cc \ tests/stub_client_db.cc \ @@ -37,6 +38,7 @@ STUB_SOURCE= tests/STUB.h \ tests/stub_HttpHeader.cc \ tests/stub_HttpReply.cc \ tests/stub_HttpRequest.cc \ + tests/stub_HttpUpgradeProtocolAccess.cc \ tests/stub_icp.cc \ tests/stub_internal.cc \ tests/stub_ipcache.cc \ diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am index a2a1d782b1..efbfc43719 100644 --- a/test-suite/Makefile.am +++ b/test-suite/Makefile.am @@ -95,30 +95,49 @@ STUB.h: $(top_srcdir)/src/tests/STUB.h ## XXX: somewhat broken. Its meant to test our debugs() implementation. ## but it has never been linked to the actual src/debug.cc implementation !! ## all it tests are the stream operators and macro in src/Debug.h -debug_SOURCES = debug.cc stub_libmem.cc $(DEBUG_SOURCE) - -ESIExpressions_SOURCES = ESIExpressions.cc stub_libmem.cc $(DEBUG_SOURCE) +debug_SOURCES = \ + $(DEBUG_SOURCE) \ + debug.cc \ + stub_libmem.cc + +ESIExpressions_SOURCES = \ + $(DEBUG_SOURCE) \ + ESIExpressions.cc \ + stub_libmem.cc ESIExpressions_LDADD = $(top_builddir)/src/esi/Expression.o \ $(LDADD) -mem_node_test_SOURCES = mem_node_test.cc $(DEBUG_SOURCE) +mem_node_test_SOURCES = \ + $(DEBUG_SOURCE) \ + mem_node_test.cc mem_node_test_LDADD = \ $(top_builddir)/src/mem_node.o \ $(top_builddir)/src/mem/libmem.la \ $(LDADD) -mem_hdr_test_SOURCES = mem_hdr_test.cc $(DEBUG_SOURCE) +mem_hdr_test_SOURCES = \ + $(DEBUG_SOURCE) \ + mem_hdr_test.cc mem_hdr_test_LDADD = \ $(top_builddir)/src/stmem.o \ $(top_builddir)/src/mem_node.o \ $(top_builddir)/src/mem/libmem.la \ $(LDADD) -splay_SOURCES = splay.cc stub_libmem.cc $(DEBUG_SOURCE) +splay_SOURCES = \ + $(DEBUG_SOURCE) \ + splay.cc \ + stub_libmem.cc -syntheticoperators_SOURCES = syntheticoperators.cc stub_libmem.cc $(DEBUG_SOURCE) +syntheticoperators_SOURCES = \ + $(DEBUG_SOURCE) \ + stub_libmem.cc \ + syntheticoperators.cc -VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc stub_libmem.cc $(DEBUG_SOURCE) +VirtualDeleteOperator_SOURCES = \ + $(DEBUG_SOURCE) \ + VirtualDeleteOperator.cc \ + stub_libmem.cc squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 0d98093f6e..92e9414c9c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -71,15 +71,16 @@ DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf libexec_PROGRAMS = cachemgr$(CGIEXT) -cachemgr__CGIEXT__SOURCES = cachemgr.cc \ +cachemgr__CGIEXT__SOURCES = \ CharacterSet.cc \ Here.cc \ MemBuf.cc \ + STUB.h \ + cachemgr.cc \ stub_cbdata.cc \ stub_debug.cc \ stub_libmem.cc \ test_tools.cc \ - STUB.h \ time.cc cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS) diff --git a/tools/purge/Makefile.am b/tools/purge/Makefile.am index bf105a641a..32173a0e83 100644 --- a/tools/purge/Makefile.am +++ b/tools/purge/Makefile.am @@ -13,19 +13,19 @@ man_MANS = purge.1 endif purge_SOURCES = \ + conffile.cc \ + conffile.hh \ convert.cc \ convert.hh \ - socket.cc \ - socket.hh \ + copyout.cc \ + copyout.hh \ + purge.cc \ signal.cc \ signal.hh \ + socket.cc \ + socket.hh \ squid-tlv.cc \ - squid-tlv.hh \ - copyout.cc \ - copyout.hh \ - conffile.cc \ - conffile.hh \ - purge.cc + squid-tlv.hh purge_LDADD = \ $(COMPAT_LIB) \ diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am index 46f0deda8b..f143790fcd 100644 --- a/tools/squidclient/Makefile.am +++ b/tools/squidclient/Makefile.am @@ -55,16 +55,16 @@ CLEANFILES += test_tools.cc stub_debug.cc time.cc stub_libmem.cc STUB.h bin_PROGRAMS = squidclient squidclient_SOURCES = \ - gssapi_support.cc \ - gssapi_support.h \ Parameters.h \ Ping.cc \ Ping.h \ + STUB.h \ + Transport.cc \ + Transport.h \ + gssapi_support.cc \ + gssapi_support.h \ squidclient.cc \ stub_debug.cc \ - test_tools.cc \ stub_libmem.cc \ - STUB.h \ - time.cc \ - Transport.cc \ - Transport.h + test_tools.cc \ + time.cc