-## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
LoadableModules.h \
LoadableModules.cc
-SUBDIRS = base anyp helper ftp parser comm eui acl format clients servers fs repl
-DIST_SUBDIRS = base anyp helper ftp parser comm eui acl format clients servers fs repl
+SUBDIRS = mem base anyp helper ftp parser comm eui acl format clients servers fs repl
+DIST_SUBDIRS = mem base anyp helper ftp parser comm eui acl format clients servers fs repl
if ENABLE_AUTH
SUBDIRS += auth
main.cc \
MasterXaction.cc \
MasterXaction.h \
- Mem.h \
- mem.cc \
mem_node.cc \
mem_node.h \
- Mem.h \
MemBuf.cc \
MemObject.cc \
MemObject.h \
noinst_HEADERS = \
client_side_request.cci \
- MemBuf.cci \
MemBuf.h \
StoreEntryStream.h \
String.cci \
$(ADAPTATION_LIBS) \
$(ESI_LIBS) \
$(SNMP_LIBS) \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
## SwapDir wants ConfigOption
## tools.cc wants ip/libip.la
## client_side.cc wants ip/libip.la
-## mem.cc wants ClientInfo.h
## libbase.la wants cbdata.*
## libbase.la wants MemBuf.*
ufsdump_SOURCES = \
debug.cc \
int.h \
int.cc \
- Mem.h \
- mem.cc \
+ mem/forward.h \
MemBuf.cc \
- MemBuf.cci \
MemBuf.h \
Parsing.h \
store_key_md5.h \
dlink.cc \
helper/ChildConfig.h \
tests/stub_HelperChildConfig.cc \
- http/RequestMethod.cc \
RemovalPolicy.cc \
$(WIN32_SOURCE) \
fd.h \
#tests_testX_SOURCES=\
# tests/testX.h \
# tests/testX.cc \
-# tests/testMain.cc \
# X.h \
# X.cc
#nodist_tests_testX_SOURCES=\
HttpReply.h \
MasterXaction.cc \
MasterXaction.h \
- Mem.h \
- tests/stub_mem.cc \
RegexList.h \
RegexList.cc \
MemBuf.cc \
tests/stub_HttpRequest.cc \
tests/testHttpReply.cc \
tests/testHttpReply.h \
- tests/testMain.cc \
tests/stub_time.cc \
url.cc \
wordlist.h \
ip/libip.la \
base/libbase.la \
ipc/libipc.la \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
tests/stub_UdsOp.cc \
tests/testACLMaxUserIP.cc \
tests/testACLMaxUserIP.h \
- tests/testMain.cc \
tests/stub_time.cc \
url.cc \
URL.h \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
MemBuf.cc \
wordlist.h \
wordlist.cc
## involved in writing tests.
tests_testBoilerplate_SOURCES = \
tests/testBoilerplate.cc \
- tests/testMain.cc \
tests/testBoilerplate.h \
tests/stub_debug.cc \
tests/stub_time.cc
RequestFlags.h \
RequestFlags.cc \
HttpRequest.cc \
- Mem.h \
- tests/stub_mem.cc \
String.cc \
tests/testCacheManager.cc \
tests/testCacheManager.h \
- tests/testMain.cc \
tests/stub_main_cc.cc \
tests/stub_ipc_Forwarder.cc \
tests/stub_store_stats.cc \
ipc/libipc.la \
mgr/libmgr.la \
$(SNMP_LIBS) \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
MemBuf.cc \
MemObject.cc \
mem_node.cc \
- Mem.h \
- tests/stub_mem.cc \
Notes.h \
Notes.cc \
Packer.cc \
tests/stub_UdsOp.cc \
tests/testDiskIO.cc \
tests/testDiskIO.h \
- tests/testMain.cc \
tests/testStoreSupport.cc \
tests/testStoreSupport.h \
tests/stub_time.cc \
$(SSL_LIBS) \
ipc/libipc.la \
base/libbase.la \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
SquidList.cc \
MasterXaction.cc \
MasterXaction.h \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
mem_node.cc \
MemBuf.cc \
MemObject.cc \
tests/CapturingStoreEntry.h \
tests/testEvent.cc \
tests/testEvent.h \
- tests/testMain.cc \
tests/stub_main_cc.cc \
tests/stub_ipc_Forwarder.cc \
tests/stub_libauth_acls.cc \
MasterXaction.h \
MemBuf.cc \
MemObject.cc \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
mem_node.cc \
mime.h \
mime.cc \
StatCounters.cc \
StatHist.h \
StatHist.cc \
- Mem.h \
stmem.cc \
repl_modules.h \
store.cc \
tests/stub_SwapDir.cc \
tests/testEventLoop.cc \
tests/testEventLoop.h \
- tests/testMain.cc \
tests/stub_main_cc.cc \
tests/stub_ipc_Forwarder.cc \
tests/stub_libauth_acls.cc \
MasterXaction.h \
MemBuf.cc \
MemObject.cc \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
mem_node.cc \
mime.h \
mime.cc \
MemBuf.cc \
MemBuf.h \
tests/stub_MemObject.cc \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
mime_header.cc \
mime_header.h \
String.cc \
tests/stub_tools.cc \
tests/testHttp1Parser.cc \
tests/testHttp1Parser.h \
- tests/testMain.cc \
tests/stub_time.cc \
wordlist.h \
wordlist.cc
RequestFlags.h \
RequestFlags.cc \
HttpRequest.cc \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
String.cc \
tests/testHttpRequest.h \
tests/testHttpRequest.cc \
tests/testHttpRequestMethod.h \
tests/testHttpRequestMethod.cc \
- tests/testMain.cc \
tests/stub_DiskIOModule.cc \
tests/stub_libauth.cc \
tests/stub_main_cc.cc \
SquidList.cc \
MasterXaction.cc \
MasterXaction.h \
- Mem.h \
- tests/stub_mem.cc \
mem_node.cc \
MemBuf.cc \
MemObject.cc \
Transients.cc \
tests/stub_tools.cc \
tests/stub_UdsOp.cc \
- tests/testMain.cc \
tests/testStore.cc \
tests/testStore.h \
tests/testStoreEntryStream.cc \
mgr/libmgr.la \
ipc/libipc.la \
anyp/libanyp.la \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
## libsquid pulls in SquidConfig and children. stub them.
tests_testString_SOURCES = \
ClientInfo.h \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
MemBuf.cc \
String.cc \
$(SBUF_SOURCE) \
SBufDetailedStats.h \
tests/stub_SBufDetailedStats.cc \
- tests/testMain.cc \
tests/testString.cc \
tests/testString.h \
cache_cf.h \
tests_testUfs_SOURCES = \
tests/testUfs.cc \
- tests/testMain.cc \
tests/testUfs.h \
tests/stub_cache_manager.cc \
tests/stub_client_db.cc \
HttpHeaderTools.cc \
HttpHeader.h \
HttpHeader.cc \
- Mem.h \
- mem.cc \
ClientInfo.h \
MemBuf.cc \
HttpHdrContRange.cc \
anyp/libanyp.la \
base/libbase.la \
ip/libip.la \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
SquidList.cc \
MasterXaction.cc \
MasterXaction.h \
- Mem.h \
- mem.cc \
MemBuf.cc \
MemObject.cc \
mem_node.cc \
Transients.h \
Transients.cc \
tests/testRock.cc \
- tests/testMain.cc \
tests/testRock.h \
tests/testStoreSupport.cc \
tests/testStoreSupport.h \
$(SSL_LIBS) \
ipc/libipc.la \
base/libbase.la \
+ mem/libmem.la \
$(top_builddir)/lib/libmisccontainers.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
MasterXaction.h \
multicast.h \
multicast.cc \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
mem_node.cc \
MemBuf.cc \
MemObject.cc \
tests/testURL.h \
tests/testUriScheme.cc \
tests/testUriScheme.h \
- tests/testMain.cc \
tests/stub_time.cc \
tests/stub_EventLoop.cc \
tools.h \
tests_testSBuf_SOURCES= \
tests/testSBuf.h \
tests/testSBuf.cc \
- tests/testMain.cc \
tests/SBufFindTest.h \
tests/SBufFindTest.cc \
$(SBUF_SOURCE) \
tests/stub_SBufDetailedStats.cc \
SBufStream.h \
tests/stub_time.cc \
- mem.cc \
tests/stub_debug.cc \
tests/stub_fatal.cc \
tests/stub_HelperChildConfig.cc \
+ tests/stub_libmem.cc \
tests/stub_cache_cf.cc \
tests/stub_cache_manager.cc \
tests/stub_store.cc \
tests_testSBufList_SOURCES= \
tests/testSBufList.h \
tests/testSBufList.cc \
- tests/testMain.cc \
$(SBUF_SOURCE) \
SBufList.h \
SBufList.cc \
tests/stub_SBufDetailedStats.cc \
SBufStream.h \
tests/stub_time.cc \
- mem.cc \
tests/stub_MemObject.cc \
tests/stub_cbdata.cc \
tests/stub_comm.cc \
tests/stub_fatal.cc \
tests/stub_fd.cc \
tests/stub_HelperChildConfig.cc \
+ tests/stub_libmem.cc \
tests/stub_cache_cf.cc \
tests/stub_cache_manager.cc \
tests/stub_store.cc \
tests_testConfigParser_SOURCES = \
ClientInfo.h \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
tests/stub_MemBuf.cc \
tests/stub_time.cc \
$(SBUF_SOURCE) \
ConfigParser.cc \
fatal.h \
tests/stub_fatal.cc \
- tests/testMain.cc \
tests/testConfigParser.cc \
tests/testConfigParser.h \
cache_cf.h \
tests/stub_debug.cc \
tests/stub_DelayId.cc \
tests/stub_HelperChildConfig.cc \
- Mem.h \
- tests/stub_mem.cc \
+ tests/stub_libmem.cc \
tests/stub_MemObject.cc \
mime.h \
tests/stub_mime.cc \
time.cc \
tools.h \
tests/stub_tools.cc \
- tests/testMain.cc \
tests/testStatHist.cc \
tests/testStatHist.h
nodist_tests_testStatHist_SOURCES = \