From: robertc <> Date: Sat, 15 Mar 2003 11:26:06 +0000 (+0000) Subject: bootstrapped X-Git-Tag: SQUID_3_0_PRE1~260 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20cd1b9cd0d0afdba4b1883dbf59bc8e1629ebc1;p=thirdparty%2Fsquid.git bootstrapped --- diff --git a/lib/libTrie/Makefile.in b/lib/libTrie/Makefile.in index 403b4fc7ab..2d73c9862c 100644 --- a/lib/libTrie/Makefile.in +++ b/lib/libTrie/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.3 2003/03/11 22:14:08 robertc Exp $ +# $Id: Makefile.in,v 1.4 2003/03/15 04:26:06 robertc Exp $ # SHELL = @SHELL@ diff --git a/src/Makefile.am b/src/Makefile.am index 9b00009335..929ee4aad0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.68 2003/03/15 04:17:39 robertc Exp $ +# $Id: Makefile.am,v 1.69 2003/03/15 04:26:07 robertc Exp $ # # Uncomment and customize the following to suit your needs: # @@ -9,786 +9,755 @@ if USE_DNSSERVER DNSSOURCE = dns.cc - DNSSERVER = dnsserver - else - DNSSOURCE = dns_internal.cc - DNSSERVER = - endif - - if USE_SNMP - SNMPSOURCE = snmp_core.cc snmp_agent.cc - else - SNMPSOURCE = - endif - - if USE_DELAY_POOLS - DELAY_POOL_SOURCE = \ - CommonPool.h \ - CompositePoolNode.h \ - delay_pools.cc \ - DelayId.cc \ - DelayId.h \ - DelayIdComposite.h \ - DelayBucket.cc \ - DelayBucket.h \ - DelayConfig.cc \ - DelayConfig.h \ - DelayPool.cc \ - DelayPool.h \ - DelayPools.h \ - DelaySpec.cc \ - DelaySpec.h \ - DelayUser.cc \ - DelayUser.h \ - DelayVector.cc \ - DelayVector.h \ - NullDelayId.cc \ - NullDelayId.h - else - DELAY_POOL_SOURCE = - endif - - ESI_ALL_SOURCE = \ - ElementList.h \ - ESI.cc \ - ESI.h \ - ESIAttempt.h \ - ESIContext.cc \ - ESIContext.h \ - ESICustomParser.cc \ - ESICustomParser.h \ - ESIElement.h \ - ESIExcept.h \ - ESIExpatParser.cc \ - ESIExpatParser.h \ - ESIExpression.cc \ - ESILiteral.h \ - ESIParser.cc \ - ESIParser.h \ - ESISegment.cc \ - ESISegment.h \ - ESISequence.cc \ - ESISequence.h - if USE_ESI - ESI_SOURCE = $(ESI_ALL_SOURCE) - else - ESI_SOURCE = - endif - - if ENABLE_XPROF_STATS - XPROF_STATS_SOURCE = ProfStats.cc - else - XPROF_STATS_SOURCE = - endif - - if ENABLE_HTCP - HTCPSOURCE = htcp.cc - endif - - if MAKE_LEAKFINDER - LEAKFINDERSOURCE = leakfinder.cc - else - LEAKFINDERSOURCE = - endif - - if ENABLE_UNLINKD - UNLINKDSOURCE = unlinkd.cc - UNLINKD = unlinkd - else - UNLINKDSOURCE = - UNLINKD = - endif - - if ENABLE_PINGER - PINGER = pinger - else - PINGER = - endif - - if ENABLE_SSL - SSLSOURCE = \ - ACLCertificateData.cc \ - ACLCertificateData.h \ - ACLCertificate.cc \ - ACLCertificate.h \ - ssl_support.cc - else - SSLSOURCE = - endif - - if ENABLE_WIN32SPECIFIC - WIN32SOURCE = win32.cc - else - WIN32SOURCE = - endif - - if ENABLE_IDENT - IDENTSOURCE = ACLIdent.cc ACLIdent.h ident.cc - else - IDENTSOURCE = - endif - - if ENABLE_ARP_ACL - ARP_ACL_SOURCE = ACLARP.cc ACLARP.h - else - ARP_ACL_SOURCE = - endif - - AM_CFLAGS = @SQUID_CFLAGS@ - AM_CXXFLAGS = @SQUID_CXXFLAGS@ - - SUBDIRS = fs repl auth - - INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include - - EXTRA_PROGRAMS = \ - unlinkd \ - pinger \ - dnsserver \ - recv-announce \ - ufsdump - - noinst_PROGRAMS = \ - cf_gen - - sbin_PROGRAMS = \ - squid - - bin_PROGRAMS = \ - squidclient - - - libexec_PROGRAMS = \ - $(PINGER) \ - $(DNSSERVER) \ - $(UNLINKD) \ - cachemgr$(CGIEXT) - - cf_gen_SOURCES = cf_gen.cc defines.h - nodist_cf_gen_HEADER = cf_gen_defines.h - cf_gen.$(OBJEXT): cf_gen_defines.h - squidclient_SOURCES = client.cc - cachemgr__CGIEXT__SOURCES = cachemgr.cc - - EXTRA_squid_SOURCES = \ - $(ARP_ACL_SOURCE) \ - $(DELAY_POOL_SOURCE) \ - dns.cc \ - dnsserver.cc \ - dns_internal.cc \ - htcp.cc \ - $(ESI_ALL_SOURCE) \ - ProfStats.cc \ - leakfinder.cc \ - snmp_core.cc \ - snmp_agent.cc \ - unlinkd.cc \ - ssl_support.cc \ - ssl_support.h \ - win32.cc - - squid_ACLSOURCES = \ - $(ARP_ACL_SOURCE) \ - ACLASN.cc \ - ACLASN.h \ - ACLDestinationASN.h \ - ACLSourceASN.h \ - ACLBrowser.cc \ - ACLBrowser.h \ - ACLData.h \ - ACLDestinationDomain.cc \ - ACLDestinationDomain.h \ - ACLDestinationIP.cc \ - ACLDestinationIP.h \ - ACLDomainData.h \ - ACLDomainData.cc \ - ACLIntRange.cc \ - ACLIntRange.h \ - ACLIP.cc \ - ACLIP.h \ - ACLMaxConnection.cc \ - ACLMaxConnection.h \ - ACLMaxUserIP.cc \ - ACLMaxUserIP.h \ - ACLMethod.cc \ - ACLMethod.h \ - ACLMethodData.cc \ - ACLMethodData.h \ - ACLMyIP.cc \ - ACLMyIP.h \ - ACLMyPort.cc \ - ACLMyPort.h \ - ACLProtocol.cc \ - ACLProtocol.h \ - ACLProtocolData.cc \ - ACLProtocolData.h \ - ACLProxyAuth.cc \ - ACLProxyAuth.h \ - ACLReferer.cc \ - ACLReferer.h \ - ACLRegexData.cc \ - ACLRegexData.h \ - ACLReplyHeaderStrategy.h \ - ACLReplyMIMEType.cc \ - ACLReplyMIMEType.h \ - ACLRequestHeaderStrategy.h \ - ACLRequestMIMEType.cc \ - ACLRequestMIMEType.h \ - ACLSourceDomain.cc \ - ACLSourceDomain.h \ - ACLSourceIP.cc \ - ACLSourceIP.h \ - ACLStrategised.cc \ - ACLStrategised.h \ - ACLStrategy.h \ - ACLStringData.cc \ - ACLStringData.h \ - ACLTime.cc \ - ACLTime.h \ - ACLTimeData.cc \ - ACLTimeData.h \ - ACLUrl.cc \ - ACLUrl.h \ - ACLUrlPath.cc \ - ACLUrlPath.h \ - ACLUrlPort.cc \ - ACLUrlPort.h \ - ACLUserData.cc \ - ACLUserData.h - - squid_SOURCES = \ - access_log.cc \ - acl.cc \ - ACL.h \ - ACLChecklist.cc \ - ACLChecklist.h \ - $(squid_ACLSOURCES) \ - asn.cc \ - authenticate.cc \ - authenticate.h \ - cache_cf.cc \ - CacheDigest.cc \ - cache_manager.cc \ - carp.cc \ - cbdata.cc \ - client_db.cc \ - client_side.cc \ - client_side.h \ - client_side_reply.cc \ - client_side_request.cc \ - client_side_request.h \ - clientStream.cc \ - clientStream.h \ - comm.cc \ - comm.h \ - comm_select.cc \ - comm_poll.cc \ - comm_kqueue.cc \ - comm_epoll.cc \ - CommRead.h \ - ConfigParser.h \ - ConnectionDetail.h \ - debug.cc \ - Debug.h \ - defines.h \ - $(DELAY_POOL_SOURCE) \ - disk.cc \ - $(DNSSOURCE) \ - enums.h \ - errorpage.cc \ - $(ESI_SOURCE) \ - ETag.cc \ - event.cc \ - external_acl.cc \ - ExternalACL.h \ - fd.cc \ - fde.cc \ - fde.h \ - filemap.cc \ - forward.cc \ - fqdncache.cc \ - ftp.cc \ - Generic.h \ - globals.h \ - gopher.cc \ - helper.cc \ - $(HTCPSOURCE) \ - http.cc \ - http.h \ - HttpStatusLine.cc \ - HttpHdrCc.cc \ - HttpHdrRange.cc \ - HttpHdrSc.cc \ - HttpHdrScTarget.cc \ - HttpHdrContRange.cc \ - HttpHdrContRange.h \ - HttpHeader.cc \ - HttpHeader.h \ - HttpHeaderRange.h \ - HttpHeaderTools.cc \ - HttpBody.cc \ - HttpMsg.cc \ - HttpReply.cc \ - HttpReply.h \ - HttpRequest.cc \ - HttpRequest.h \ - icmp.cc \ - ICP.h \ - icp_v2.cc \ - icp_v3.cc \ - $(IDENTSOURCE) \ - int.cc \ - internal.cc \ - ipc.cc \ - ipcache.cc \ - IPInterception.cc \ - IPInterception.h \ - $(LEAKFINDERSOURCE) \ - logfile.cc \ - main.cc \ - mem.cc \ - mem_node.cc \ - mem_node.h \ - Mem.h \ - MemBuf.cc \ - MemObject.cc \ - MemObject.h \ - mime.cc \ - multicast.cc \ - neighbors.cc \ - net_db.cc \ - Packer.cc \ - $(XPROF_STATS_SOURCE) \ - pconn.cc \ - peer_digest.cc \ - peer_select.cc \ - protos.h \ - redirect.cc \ - referer.cc \ - refresh.cc \ - send-announce.cc \ - $(SNMPSOURCE) \ - squid.h \ - tunnel.cc \ - $(SSLSOURCE) \ - stat.cc \ - StatHist.cc \ - String.cc \ - stmem.cc \ - stmem.h \ - store.cc \ - Store.h \ - store_io.cc \ - StoreIOBuffer.h \ - StoreIOState.cc \ - StoreIOState.h \ - store_client.cc \ - StoreClient.h \ - store_digest.cc \ - store_dir.cc \ - store_key_md5.cc \ - store_log.cc \ - store_rebuild.cc \ - store_swapin.cc \ - store_swapmeta.cc \ - store_swapout.cc \ - StoreMeta.cc \ - StoreMeta.h \ - StoreMetaMD5.cc \ - StoreMetaMD5.h \ - StoreMetaSTD.cc \ - StoreMetaSTD.h \ - StoreMetaUnpacker.cc \ - StoreMetaUnpacker.h \ - StoreMetaURL.cc \ - StoreMetaURL.h \ - StoreMetaVary.cc \ - StoreMetaVary.h \ - structs.h \ - SwapDir.cc \ - SwapDir.h \ - tools.cc \ - typedefs.h \ - ufscommon.cc \ - ufscommon.h \ - $(UNLINKDSOURCE) \ - url.cc \ - urn.cc \ - useragent.cc \ - wais.cc \ - wccp.cc \ - whois.cc \ - $(WIN32SOURCE) - - noinst_HEADERS = MemBuf.cci \ - MemBuf.h \ - Store.cci \ - String.cci \ - SquidString.h \ - ufscommon.cci - - nodist_squid_SOURCES = \ - repl_modules.cc \ - auth_modules.cc \ - store_modules.cc \ - cf_parser.h \ - globals.cc \ - string_arrays.c - - squid_LDADD = \ - -L../lib \ - @XTRA_OBJS@ \ - @REPL_OBJS@ \ - @STORE_OBJS@ \ - @AUTH_OBJS@ \ - @CRYPTLIB@ \ - @REGEXLIB@ \ - @SNMPLIB@ \ - @LIB_MALLOC@ \ - @SSLLIB@ \ - -lmiscutil \ - @XTRA_LIBS@ \ - @EPOLL_LIBS@ - squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@ - - unlinkd_SOURCES = unlinkd.cc - unlinkd_CXXFLAGS = -DUNLINK_DAEMON - - pinger_SOURCES = \ - pinger.cc \ - debug.cc - - dnsserver_SOURCES = dnsserver.cc - recv_announce_SOURCES = recv-announce.cc - - ufsdump_SOURCES = debug.cc \ - int.cc \ - ufsdump.cc \ - store.cc \ - StoreMeta.cc \ - StoreMeta.h \ - StoreMetaMD5.cc \ - StoreMetaMD5.h \ - StoreMetaSTD.cc \ - StoreMetaSTD.h \ - StoreMetaUnpacker.cc \ - StoreMetaUnpacker.h \ - StoreMetaURL.cc \ - StoreMetaURL.h \ - StoreMetaVary.cc \ - StoreMetaVary.h \ - access_log.cc \ - acl.cc \ - ACLChecklist.cc \ - $(squid_ACLSOURCES) \ - asn.cc \ - authenticate.cc \ - cache_cf.cc \ - CacheDigest.cc \ - cache_manager.cc \ - carp.cc \ - cbdata.cc \ - client_db.cc \ - client_side.cc \ - client_side_reply.cc \ - client_side_request.cc \ - client_side_request.h \ - clientStream.cc \ - clientStream.h \ - comm.cc \ - comm.h \ - comm_select.cc \ - comm_poll.cc \ - comm_kqueue.cc \ - comm_epoll.cc \ - defines.h \ - $(DELAY_POOL_SOURCE) \ - disk.cc \ - $(DNSSOURCE) \ - enums.h \ - errorpage.cc \ - $(ESI_SOURCE) \ - ETag.cc \ - event.cc \ - external_acl.cc \ - fd.cc \ - fde.cc \ - fde.h \ - filemap.cc \ - forward.cc \ - fqdncache.cc \ - ftp.cc \ - gopher.cc \ - helper.cc \ - $(HTCPSOURCE) \ - http.cc \ - HttpStatusLine.cc \ - HttpHdrCc.cc \ - HttpHdrRange.cc \ - HttpHdrSc.cc \ - HttpHdrScTarget.cc \ - HttpHdrContRange.cc \ - HttpHeader.cc \ - HttpHeaderTools.cc \ - HttpBody.cc \ - HttpMsg.cc \ - HttpReply.cc \ - HttpRequest.cc \ - HttpRequest.h \ - icmp.cc \ - icp_v2.cc \ - icp_v3.cc \ - $(IDENTSOURCE) \ - internal.cc \ - ipc.cc \ - ipcache.cc \ - IPInterception.cc \ - IPInterception.h \ - $(LEAKFINDERSOURCE) \ - logfile.cc \ - mem.cc \ - mem_node.cc \ - mem_node.h \ - Mem.h \ - MemBuf.cc \ - MemObject.cc \ - MemObject.h \ - mime.cc \ - multicast.cc \ - neighbors.cc \ - net_db.cc \ - Packer.cc \ - $(XPROF_STATS_SOURCE) \ - pconn.cc \ - peer_digest.cc \ - peer_select.cc \ - protos.h \ - redirect.cc \ - referer.cc \ - refresh.cc \ - send-announce.cc \ - $(SNMPSOURCE) \ - squid.h \ - $(SSLSOURCE) \ - tunnel.cc \ - stat.cc \ - StatHist.cc \ - String.cc \ - stmem.cc \ - store_io.cc \ - StoreIOBuffer.h \ - StoreIOState.cc \ - store_client.cc \ - StoreClient.h \ - store_digest.cc \ - store_dir.cc \ - store_key_md5.cc \ - store_log.cc \ - store_rebuild.cc \ - store_swapin.cc \ - store_swapmeta.cc \ - store_swapout.cc \ - structs.h \ - SwapDir.cc \ - tools.cc \ - typedefs.h \ - ufscommon.cc \ - ufscommon.h \ - $(UNLINKDSOURCE) \ - url.cc \ - urn.cc \ - useragent.cc \ - wais.cc \ - wccp.cc \ - whois.cc \ - $(WIN32SOURCE) - ufsdump_LDADD = \ - -L../lib \ - @XTRA_OBJS@ \ - @REPL_OBJS@ \ - @STORE_OBJS@ \ - @AUTH_OBJS@ \ - @CRYPTLIB@ \ - @REGEXLIB@ \ - @SNMPLIB@ \ - @LIB_MALLOC@ \ - @SSLLIB@ \ - -lmiscutil \ - @XTRA_LIBS@ \ - @EPOLL_LIBS@ - ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a - nodist_ufsdump_SOURCES = \ - repl_modules.cc \ - auth_modules.cc \ - store_modules.cc \ - cf_parser.h \ - globals.cc \ - string_arrays.c - - nodist_pinger_SOURCES = \ - globals.cc - - BUILT_SOURCES = \ - cf_gen_defines.h \ - cf_parser.h \ - globals.cc \ - string_arrays.c \ - repl_modules.cc \ - auth_modules.cc \ - store_modules.cc - - sysconf_DATA = \ - squid.conf.default \ - mime.conf.default - - data_DATA = \ - mib.txt - - LDADD = -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ - - EXTRA_DIST = \ - cf_gen_defines \ - cf.data.pre \ - mk-globals-c.pl \ - mk-string-arrays.pl \ - auth_modules.sh \ - store_modules.sh \ - repl_modules.sh \ - mib.txt \ - mime.conf.default - - DEFAULT_PREFIX = $(prefix) - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/dnsserver$(EXEEXT) - DEFAULT_LOG_PREFIX = $(localstatedir)/logs - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log - DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid - DEFAULT_SWAP_DIR = $(localstatedir)/cache - DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT) - DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT) - DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT) - DEFAULT_ICON_DIR = $(datadir)/icons - DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ - DEFAULT_MIB_PATH = $(datadir)/mib.txt - DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ - - DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" - - $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h - - snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h - - globals.cc: globals.h mk-globals-c.pl - $(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@ - - string_arrays.c: enums.h mk-string-arrays.pl - $(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@ - - cache_diff: cache_diff.o debug.o globals.o store_key_md5.o - $(CC) -o $@ $(LDFLAGS) $@.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) - - test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key_md5.o - $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) +DNSSERVER = dnsserver +else +DNSSOURCE = dns_internal.cc +DNSSERVER = +endif + +if USE_SNMP +SNMPSOURCE = snmp_core.cc snmp_agent.cc +else +SNMPSOURCE = +endif + +if USE_DELAY_POOLS +DELAY_POOL_SOURCE = \ + CommonPool.h \ + CompositePoolNode.h \ + delay_pools.cc \ + DelayId.cc \ + DelayId.h \ + DelayIdComposite.h \ + DelayBucket.cc \ + DelayBucket.h \ + DelayConfig.cc \ + DelayConfig.h \ + DelayPool.cc \ + DelayPool.h \ + DelayPools.h \ + DelaySpec.cc \ + DelaySpec.h \ + DelayUser.cc \ + DelayUser.h \ + DelayVector.cc \ + DelayVector.h \ + NullDelayId.cc \ + NullDelayId.h +else +DELAY_POOL_SOURCE = +endif + +ESI_ALL_SOURCE = \ + ElementList.h \ + ESI.cc \ + ESI.h \ + ESIAttempt.h \ + ESIContext.cc \ + ESIContext.h \ + ESICustomParser.cc \ + ESICustomParser.h \ + ESIElement.h \ + ESIExcept.h \ + ESIExpatParser.cc \ + ESIExpatParser.h \ + ESIExpression.cc \ + ESILiteral.h \ + ESIParser.cc \ + ESIParser.h \ + ESISegment.cc \ + ESISegment.h \ + ESISequence.cc \ + ESISequence.h +if USE_ESI + ESI_SOURCE = $(ESI_ALL_SOURCE) +else + ESI_SOURCE = +endif + +if ENABLE_XPROF_STATS +XPROF_STATS_SOURCE = ProfStats.cc +else +XPROF_STATS_SOURCE = +endif + +if ENABLE_HTCP +HTCPSOURCE = htcp.cc +endif + +if MAKE_LEAKFINDER +LEAKFINDERSOURCE = leakfinder.cc +else +LEAKFINDERSOURCE = +endif + +if ENABLE_UNLINKD +UNLINKDSOURCE = unlinkd.cc +UNLINKD = unlinkd +else +UNLINKDSOURCE = +UNLINKD = +endif + +if ENABLE_PINGER +PINGER = pinger +else +PINGER = +endif + +if ENABLE_SSL +SSLSOURCE = \ + ACLCertificateData.cc \ + ACLCertificateData.h \ + ACLCertificate.cc \ + ACLCertificate.h \ + ssl_support.cc +else +SSLSOURCE = +endif + +if ENABLE_WIN32SPECIFIC +WIN32SOURCE = win32.cc +else +WIN32SOURCE = +endif + +if ENABLE_IDENT +IDENTSOURCE = ACLIdent.cc ACLIdent.h ident.cc +else +IDENTSOURCE = +endif + +if ENABLE_ARP_ACL +ARP_ACL_SOURCE = ACLARP.cc ACLARP.h +else +ARP_ACL_SOURCE = +endif + +AM_CFLAGS = @SQUID_CFLAGS@ +AM_CXXFLAGS = @SQUID_CXXFLAGS@ + +SUBDIRS = fs repl auth + +INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include + +EXTRA_PROGRAMS = \ + unlinkd \ + pinger \ + dnsserver \ + recv-announce \ + ufsdump + +noinst_PROGRAMS = \ + cf_gen + +sbin_PROGRAMS = \ + squid + +bin_PROGRAMS = \ + squidclient + + +libexec_PROGRAMS = \ + $(PINGER) \ + $(DNSSERVER) \ + $(UNLINKD) \ + cachemgr$(CGIEXT) + +cf_gen_SOURCES = cf_gen.cc defines.h +nodist_cf_gen_HEADER = cf_gen_defines.h +cf_gen.$(OBJEXT): cf_gen_defines.h +squidclient_SOURCES = client.cc +cachemgr__CGIEXT__SOURCES = cachemgr.cc + +EXTRA_squid_SOURCES = \ + $(ARP_ACL_SOURCE) \ + $(DELAY_POOL_SOURCE) \ + dns.cc \ + dnsserver.cc \ + dns_internal.cc \ + htcp.cc \ + $(ESI_ALL_SOURCE) \ + ProfStats.cc \ + leakfinder.cc \ + snmp_core.cc \ + snmp_agent.cc \ + unlinkd.cc \ + ssl_support.cc \ + ssl_support.h \ + win32.cc + +squid_ACLSOURCES = \ + $(ARP_ACL_SOURCE) \ + ACLASN.cc \ + ACLASN.h \ + ACLDestinationASN.h \ + ACLSourceASN.h \ + ACLBrowser.cc \ + ACLBrowser.h \ + ACLData.h \ + ACLDestinationDomain.cc \ + ACLDestinationDomain.h \ + ACLDestinationIP.cc \ + ACLDestinationIP.h \ + ACLDomainData.h \ + ACLDomainData.cc \ + ACLIntRange.cc \ + ACLIntRange.h \ + ACLIP.cc \ + ACLIP.h \ + ACLMaxConnection.cc \ + ACLMaxConnection.h \ + ACLMaxUserIP.cc \ + ACLMaxUserIP.h \ + ACLMethod.cc \ + ACLMethod.h \ + ACLMethodData.cc \ + ACLMethodData.h \ + ACLMyIP.cc \ + ACLMyIP.h \ + ACLMyPort.cc \ + ACLMyPort.h \ + ACLProtocol.cc \ + ACLProtocol.h \ + ACLProtocolData.cc \ + ACLProtocolData.h \ + ACLProxyAuth.cc \ + ACLProxyAuth.h \ + ACLReferer.cc \ + ACLReferer.h \ + ACLRegexData.cc \ + ACLRegexData.h \ + ACLReplyHeaderStrategy.h \ + ACLReplyMIMEType.cc \ + ACLReplyMIMEType.h \ + ACLRequestHeaderStrategy.h \ + ACLRequestMIMEType.cc \ + ACLRequestMIMEType.h \ + ACLSourceDomain.cc \ + ACLSourceDomain.h \ + ACLSourceIP.cc \ + ACLSourceIP.h \ + ACLStrategised.cc \ + ACLStrategised.h \ + ACLStrategy.h \ + ACLStringData.cc \ + ACLStringData.h \ + ACLTime.cc \ + ACLTime.h \ + ACLTimeData.cc \ + ACLTimeData.h \ + ACLUrl.cc \ + ACLUrl.h \ + ACLUrlPath.cc \ + ACLUrlPath.h \ + ACLUrlPort.cc \ + ACLUrlPort.h \ + ACLUserData.cc \ + ACLUserData.h + +squid_SOURCES = \ + access_log.cc \ + acl.cc \ + ACL.h \ + ACLChecklist.cc \ + ACLChecklist.h \ + $(squid_ACLSOURCES) \ + asn.cc \ + authenticate.cc \ + authenticate.h \ + cache_cf.cc \ + CacheDigest.cc \ + cache_manager.cc \ + carp.cc \ + cbdata.cc \ + client_db.cc \ + client_side.cc \ + client_side.h \ + client_side_reply.cc \ + client_side_reply.h \ + client_side_request.cc \ + client_side_request.h \ + clientStream.cc \ + clientStream.h \ + comm.cc \ + comm.h \ + comm_select.cc \ + comm_poll.cc \ + comm_kqueue.cc \ + comm_epoll.cc \ + CommRead.h \ + ConfigParser.h \ + ConnectionDetail.h \ + debug.cc \ + Debug.h \ + defines.h \ + $(DELAY_POOL_SOURCE) \ + disk.cc \ + $(DNSSOURCE) \ + enums.h \ + errorpage.cc \ + $(ESI_SOURCE) \ + ETag.cc \ + event.cc \ + external_acl.cc \ + ExternalACL.h \ + fd.cc \ + fde.cc \ + fde.h \ + filemap.cc \ + forward.cc \ + fqdncache.cc \ + ftp.cc \ + Generic.h \ + globals.h \ + gopher.cc \ + helper.cc \ + $(HTCPSOURCE) \ + http.cc \ + http.h \ + HttpStatusLine.cc \ + HttpHdrCc.cc \ + HttpHdrRange.cc \ + HttpHdrSc.cc \ + HttpHdrScTarget.cc \ + HttpHdrContRange.cc \ + HttpHdrContRange.h \ + HttpHeader.cc \ + HttpHeader.h \ + HttpHeaderRange.h \ + HttpHeaderTools.cc \ + HttpBody.cc \ + HttpMsg.cc \ + HttpReply.cc \ + HttpReply.h \ + HttpRequest.cc \ + HttpRequest.h \ + icmp.cc \ + ICP.h \ + icp_v2.cc \ + icp_v3.cc \ + $(IDENTSOURCE) \ + int.cc \ + internal.cc \ + ipc.cc \ + ipcache.cc \ + IPInterception.cc \ + IPInterception.h \ + $(LEAKFINDERSOURCE) \ + logfile.cc \ + main.cc \ + mem.cc \ + mem_node.cc \ + mem_node.h \ + Mem.h \ + MemBuf.cc \ + MemObject.cc \ + MemObject.h \ + mime.cc \ + multicast.cc \ + neighbors.cc \ + net_db.cc \ + Packer.cc \ + $(XPROF_STATS_SOURCE) \ + pconn.cc \ + peer_digest.cc \ + peer_select.cc \ + protos.h \ + redirect.cc \ + referer.cc \ + refresh.cc \ + send-announce.cc \ + $(SNMPSOURCE) \ + squid.h \ + tunnel.cc \ + $(SSLSOURCE) \ + stat.cc \ + StatHist.cc \ + String.cc \ + stmem.cc \ + stmem.h \ + store.cc \ + Store.h \ + store_io.cc \ + StoreIOBuffer.h \ + StoreIOState.cc \ + StoreIOState.h \ + store_client.cc \ + StoreClient.h \ + store_digest.cc \ + store_dir.cc \ + store_key_md5.cc \ + store_log.cc \ + store_rebuild.cc \ + store_swapin.cc \ + store_swapmeta.cc \ + store_swapout.cc \ + StoreMeta.cc \ + StoreMeta.h \ + StoreMetaMD5.cc \ + StoreMetaMD5.h \ + StoreMetaSTD.cc \ + StoreMetaSTD.h \ + StoreMetaUnpacker.cc \ + StoreMetaUnpacker.h \ + StoreMetaURL.cc \ + StoreMetaURL.h \ + StoreMetaVary.cc \ + StoreMetaVary.h \ + structs.h \ + SwapDir.cc \ + SwapDir.h \ + tools.cc \ + typedefs.h \ + ufscommon.cc \ + ufscommon.h \ + $(UNLINKDSOURCE) \ + url.cc \ + urn.cc \ + useragent.cc \ + wais.cc \ + wccp.cc \ + whois.cc \ + $(WIN32SOURCE) + +noinst_HEADERS = MemBuf.cci \ + MemBuf.h \ + Store.cci \ + String.cci \ + SquidString.h \ + ufscommon.cci + +nodist_squid_SOURCES = \ + repl_modules.cc \ + auth_modules.cc \ + store_modules.cc \ + cf_parser.h \ + globals.cc \ + string_arrays.c + +squid_LDADD = \ + -L../lib \ + @XTRA_OBJS@ \ + @REPL_OBJS@ \ + @STORE_OBJS@ \ + @AUTH_OBJS@ \ + @CRYPTLIB@ \ + @REGEXLIB@ \ + @SNMPLIB@ \ + @LIB_MALLOC@ \ + @SSLLIB@ \ + -lmiscutil \ + @XTRA_LIBS@ \ + @EPOLL_LIBS@ +squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@ + +unlinkd_SOURCES = unlinkd.cc +unlinkd_CXXFLAGS = -DUNLINK_DAEMON + +pinger_SOURCES = \ + pinger.cc \ + debug.cc + +dnsserver_SOURCES = dnsserver.cc +recv_announce_SOURCES = recv-announce.cc + +ufsdump_SOURCES = debug.cc \ + int.cc \ + ufsdump.cc \ + store.cc \ + StoreMeta.cc \ + StoreMeta.h \ + StoreMetaMD5.cc \ + StoreMetaMD5.h \ + StoreMetaSTD.cc \ + StoreMetaSTD.h \ + StoreMetaUnpacker.cc \ + StoreMetaUnpacker.h \ + StoreMetaURL.cc \ + StoreMetaURL.h \ + StoreMetaVary.cc \ + StoreMetaVary.h \ + access_log.cc \ + acl.cc \ + ACLChecklist.cc \ + $(squid_ACLSOURCES) \ + asn.cc \ + authenticate.cc \ + cache_cf.cc \ + CacheDigest.cc \ + cache_manager.cc \ + carp.cc \ + cbdata.cc \ + client_db.cc \ + client_side.cc \ + client_side_reply.cc \ + client_side_request.cc \ + client_side_request.h \ + clientStream.cc \ + clientStream.h \ + comm.cc \ + comm.h \ + comm_select.cc \ + comm_poll.cc \ + comm_kqueue.cc \ + comm_epoll.cc \ + defines.h \ + $(DELAY_POOL_SOURCE) \ + disk.cc \ + $(DNSSOURCE) \ + enums.h \ + errorpage.cc \ + $(ESI_SOURCE) \ + ETag.cc \ + event.cc \ + external_acl.cc \ + fd.cc \ + fde.cc \ + fde.h \ + filemap.cc \ + forward.cc \ + fqdncache.cc \ + ftp.cc \ + gopher.cc \ + helper.cc \ + $(HTCPSOURCE) \ + http.cc \ + HttpStatusLine.cc \ + HttpHdrCc.cc \ + HttpHdrRange.cc \ + HttpHdrSc.cc \ + HttpHdrScTarget.cc \ + HttpHdrContRange.cc \ + HttpHeader.cc \ + HttpHeaderTools.cc \ + HttpBody.cc \ + HttpMsg.cc \ + HttpReply.cc \ + HttpRequest.cc \ + HttpRequest.h \ + icmp.cc \ + icp_v2.cc \ + icp_v3.cc \ + $(IDENTSOURCE) \ + internal.cc \ + ipc.cc \ + ipcache.cc \ + IPInterception.cc \ + IPInterception.h \ + $(LEAKFINDERSOURCE) \ + logfile.cc \ + mem.cc \ + mem_node.cc \ + mem_node.h \ + Mem.h \ + MemBuf.cc \ + MemObject.cc \ + MemObject.h \ + mime.cc \ + multicast.cc \ + neighbors.cc \ + net_db.cc \ + Packer.cc \ + $(XPROF_STATS_SOURCE) \ + pconn.cc \ + peer_digest.cc \ + peer_select.cc \ + protos.h \ + redirect.cc \ + referer.cc \ + refresh.cc \ + send-announce.cc \ + $(SNMPSOURCE) \ + squid.h \ + $(SSLSOURCE) \ + tunnel.cc \ + stat.cc \ + StatHist.cc \ + String.cc \ + stmem.cc \ + store_io.cc \ + StoreIOBuffer.h \ + StoreIOState.cc \ + store_client.cc \ + StoreClient.h \ + store_digest.cc \ + store_dir.cc \ + store_key_md5.cc \ + store_log.cc \ + store_rebuild.cc \ + store_swapin.cc \ + store_swapmeta.cc \ + store_swapout.cc \ + structs.h \ + SwapDir.cc \ + tools.cc \ + typedefs.h \ + ufscommon.cc \ + ufscommon.h \ + $(UNLINKDSOURCE) \ + url.cc \ + urn.cc \ + useragent.cc \ + wais.cc \ + wccp.cc \ + whois.cc \ + $(WIN32SOURCE) +ufsdump_LDADD = \ + -L../lib \ + @XTRA_OBJS@ \ + @REPL_OBJS@ \ + @STORE_OBJS@ \ + @AUTH_OBJS@ \ + @CRYPTLIB@ \ + @REGEXLIB@ \ + @SNMPLIB@ \ + @LIB_MALLOC@ \ + @SSLLIB@ \ + -lmiscutil \ + @XTRA_LIBS@ \ + @EPOLL_LIBS@ +ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a +nodist_ufsdump_SOURCES = \ + repl_modules.cc \ + auth_modules.cc \ + store_modules.cc \ + cf_parser.h \ + globals.cc \ + string_arrays.c + +nodist_pinger_SOURCES = \ + globals.cc + +BUILT_SOURCES = \ + cf_gen_defines.h \ + cf_parser.h \ + globals.cc \ + string_arrays.c \ + repl_modules.cc \ + auth_modules.cc \ + store_modules.cc + +sysconf_DATA = \ + squid.conf.default \ + mime.conf.default + +data_DATA = \ + mib.txt + +LDADD = -L../lib -lmiscutil @XTRA_LIBS@ @EPOLL_LIBS@ + +EXTRA_DIST = \ + cf_gen_defines \ + cf.data.pre \ + mk-globals-c.pl \ + mk-string-arrays.pl \ + auth_modules.sh \ + store_modules.sh \ + repl_modules.sh \ + mib.txt \ + mime.conf.default + +DEFAULT_PREFIX = $(prefix) +DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf +DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf +DEFAULT_DNSSERVER = $(libexecdir)/dnsserver$(EXEEXT) +DEFAULT_LOG_PREFIX = $(localstatedir)/logs +DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log +DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log +DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log +DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid +DEFAULT_SWAP_DIR = $(localstatedir)/cache +DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT) +DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT) +DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT) +DEFAULT_ICON_DIR = $(datadir)/icons +DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@ +DEFAULT_MIB_PATH = $(datadir)/mib.txt +DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ + +DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" + +$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h + +snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h + +globals.cc: globals.h mk-globals-c.pl + $(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@ + +string_arrays.c: enums.h mk-string-arrays.pl + $(PERL) $(srcdir)/mk-string-arrays.pl < $(srcdir)/enums.h > $@ + +cache_diff: cache_diff.o debug.o globals.o store_key_md5.o + $(CC) -o $@ $(LDFLAGS) $@.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) + +test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key_md5.o + $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) ## If autodependency works well this is not needed anymore - cache_cf.o: cf_parser.h +cache_cf.o: cf_parser.h - squid.conf.default: cf_parser.h - $(SHELL) -c "test -f squid.conf.default || ./cf_gen cf.data" +squid.conf.default: cf_parser.h + $(SHELL) -c "test -f squid.conf.default || ./cf_gen cf.data" - cf_parser.h: cf.data cf_gen$(EXEEXT) - ./cf_gen cf.data +cf_parser.h: cf.data cf_gen$(EXEEXT) + ./cf_gen cf.data - cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre - awk -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >cf_gen_defines.h +cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre + awk -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >cf_gen_defines.h ## FIXME: generate a sed command file from configure. Then this doesn't -## depend on the Makefile. - cf.data: cf.data.pre Makefile - sed "\ - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g; - - \ - s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g; - - \ - s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g; - - \ - s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g; - - \ - s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g; - - \ - s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g; - - \ - s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g; - - \ - s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g; - - \ - s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g; - - \ - s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g; - - \ - s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g; - - \ - s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g; - - \ - s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g; - - \ - s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g; - - \ - s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g; - - \ - s%@[V]ERSION@%$(VERSION)%g;"\ - - < $(srcdir)/cf.data.pre >$@ - - store_modules.cc: store_modules.sh Makefile - $(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.cc - - repl_modules.cc: repl_modules.sh Makefile - $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc - - auth_modules.cc: auth_modules.sh Makefile - @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.cc - - install-data-local: install-sysconfDATA install-dataDATA - @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ -echo " -$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ -else \ - echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\ -$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \ -fi -@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ -echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ -else \ - echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ -fi -$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) +## depend on the Makefile. +cf.data: cf.data.pre Makefile + sed "\ + s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\ + s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\ + s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\ + s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\ + s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\ + s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\ + s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\ + s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\ + s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\ + s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\ + s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\ + s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ + s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\ + s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;\ + s%@[V]ERSION@%$(VERSION)%g;"\ + < $(srcdir)/cf.data.pre >$@ + +store_modules.cc: store_modules.sh Makefile + $(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.cc + +repl_modules.cc: repl_modules.sh Makefile + $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc + +auth_modules.cc: auth_modules.sh Makefile + @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.cc + +install-data-local: install-sysconfDATA install-dataDATA + @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \ + else \ + echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\ + $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \ + fi + @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ + else \ + echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ + $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ + fi + $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) uninstall-local: -@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ -echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \ -$(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \ -fi + @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ + echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \ + $(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \ + fi # Don't automatically uninstall config files # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ @@ -797,7 +766,7 @@ fi # fi DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \ - globals.cc string_arrays.c repl_modules.cc auth_modules.cc store_modules.cc + globals.cc string_arrays.c repl_modules.cc auth_modules.cc store_modules.cc ##install-pinger: ## @f=$(PINGER_EXE); \ diff --git a/src/Makefile.in b/src/Makefile.in index 46e09cec02..b3a5192c2b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.300 2003/03/13 07:39:53 hno Exp $ +# $Id: Makefile.in,v 1.301 2003/03/15 04:26:09 robertc Exp $ # # Uncomment and customize the following to suit your needs: # @@ -364,6 +364,7 @@ squid_SOURCES = \ client_side.cc \ client_side.h \ client_side_reply.cc \ + client_side_reply.h \ client_side_request.cc \ client_side_request.h \ clientStream.cc \ @@ -575,7 +576,6 @@ ufsdump_SOURCES = debug.cc \ acl.cc \ ACLChecklist.cc \ $(squid_ACLSOURCES) \ - ACLChecklist.cc \ asn.cc \ authenticate.cc \ cache_cf.cc \ @@ -960,8 +960,8 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \ StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \ StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \ access_log.$(OBJEXT) acl.$(OBJEXT) ACLChecklist.$(OBJEXT) \ - $(am__objects_4) ACLChecklist.$(OBJEXT) asn.$(OBJEXT) \ - authenticate.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \ + $(am__objects_4) asn.$(OBJEXT) authenticate.$(OBJEXT) \ + cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \ cache_manager.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \ client_db.$(OBJEXT) client_side.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \