From: hno <> Date: Thu, 1 May 2003 23:49:27 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE1~223 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3234cfc06d3bed8391ea7ffd79ac937417bedf93;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/src/Makefile.in b/src/Makefile.in index 398fe7dced..9d4b933400 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.302 2003/04/23 00:11:44 hno Exp $ +# $Id: Makefile.in,v 1.303 2003/05/01 17:49:27 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -134,29 +134,30 @@ makesnmplib = @makesnmplib@ @USE_SNMP_TRUE@SNMPSOURCE = snmp_core.cc snmp_agent.cc @USE_SNMP_FALSE@SNMPSOURCE = -@USE_DELAY_POOLS_TRUE@DELAY_POOL_SOURCE = \ -@USE_DELAY_POOLS_TRUE@ CommonPool.h \ -@USE_DELAY_POOLS_TRUE@ CompositePoolNode.h \ -@USE_DELAY_POOLS_TRUE@ delay_pools.cc \ -@USE_DELAY_POOLS_TRUE@ DelayId.cc \ -@USE_DELAY_POOLS_TRUE@ DelayId.h \ -@USE_DELAY_POOLS_TRUE@ DelayIdComposite.h \ -@USE_DELAY_POOLS_TRUE@ DelayBucket.cc \ -@USE_DELAY_POOLS_TRUE@ DelayBucket.h \ -@USE_DELAY_POOLS_TRUE@ DelayConfig.cc \ -@USE_DELAY_POOLS_TRUE@ DelayConfig.h \ -@USE_DELAY_POOLS_TRUE@ DelayPool.cc \ -@USE_DELAY_POOLS_TRUE@ DelayPool.h \ -@USE_DELAY_POOLS_TRUE@ DelayPools.h \ -@USE_DELAY_POOLS_TRUE@ DelaySpec.cc \ -@USE_DELAY_POOLS_TRUE@ DelaySpec.h \ -@USE_DELAY_POOLS_TRUE@ DelayUser.cc \ -@USE_DELAY_POOLS_TRUE@ DelayUser.h \ -@USE_DELAY_POOLS_TRUE@ DelayVector.cc \ -@USE_DELAY_POOLS_TRUE@ DelayVector.h \ -@USE_DELAY_POOLS_TRUE@ NullDelayId.cc \ -@USE_DELAY_POOLS_TRUE@ NullDelayId.h - +DELAY_POOL_ALL_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 + +@USE_DELAY_POOLS_TRUE@DELAY_POOL_SOURCE = $(DELAY_POOL_ALL_SOURCE) @USE_DELAY_POOLS_FALSE@DELAY_POOL_SOURCE = ESI_ALL_SOURCE = \ @@ -200,22 +201,25 @@ ESI_ALL_SOURCE = \ @ENABLE_PINGER_TRUE@PINGER = pinger @ENABLE_PINGER_FALSE@PINGER = -@ENABLE_SSL_TRUE@SSLSOURCE = \ -@ENABLE_SSL_TRUE@ ACLCertificateData.cc \ -@ENABLE_SSL_TRUE@ ACLCertificateData.h \ -@ENABLE_SSL_TRUE@ ACLCertificate.cc \ -@ENABLE_SSL_TRUE@ ACLCertificate.h \ -@ENABLE_SSL_TRUE@ ssl_support.cc +SSL_ALL_SOURCE = \ + ACLCertificateData.cc \ + ACLCertificateData.h \ + ACLCertificate.cc \ + ACLCertificate.h \ + ssl_support.cc -@ENABLE_SSL_FALSE@SSLSOURCE = +@ENABLE_SSL_TRUE@SSL_SOURCE = $(SSL_ALL_SOURCE) +@ENABLE_SSL_FALSE@SSL_SOURCE = @ENABLE_WIN32SPECIFIC_TRUE@WIN32SOURCE = win32.cc @ENABLE_WIN32SPECIFIC_FALSE@WIN32SOURCE = -@ENABLE_IDENT_TRUE@IDENTSOURCE = ACLIdent.cc ACLIdent.h ident.cc -@ENABLE_IDENT_FALSE@IDENTSOURCE = +IDENT_ALL_SOURCE = ACLIdent.cc ACLIdent.h ident.cc +@ENABLE_IDENT_TRUE@IDENT_SOURCE = $(IDENT_ALL_SOURCE) +@ENABLE_IDENT_FALSE@IDENT_SOURCE = -@ENABLE_ARP_ACL_TRUE@ARP_ACL_SOURCE = ACLARP.cc ACLARP.h +ARP_ACL_ALL_SOURCE = ACLARP.cc ACLARP.h +@ENABLE_ARP_ACL_TRUE@ARP_ACL_SOURCE = $(ARP_ACL_ALL_SOURCE) @ENABLE_ARP_ACL_FALSE@ARP_ACL_SOURCE = AM_CFLAGS = @SQUID_CFLAGS@ @@ -258,21 +262,13 @@ squidclient_SOURCES = client.cc cachemgr__CGIEXT__SOURCES = cachemgr.cc EXTRA_squid_SOURCES = \ - $(ARP_ACL_SOURCE) \ - $(DELAY_POOL_SOURCE) \ + $(ARP_ACL_ALL_SOURCE) \ + $(DELAY_POOL_ALL_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 + $(IDENT_ALL_SOURCE) squid_ACLSOURCES = \ @@ -426,7 +422,7 @@ squid_SOURCES = \ ICP.h \ icp_v2.cc \ icp_v3.cc \ - $(IDENTSOURCE) \ + $(IDENT_SOURCE) \ int.cc \ internal.cc \ ipc.cc \ @@ -460,7 +456,7 @@ squid_SOURCES = \ $(SNMPSOURCE) \ squid.h \ tunnel.cc \ - $(SSLSOURCE) \ + $(SSL_SOURCE) \ stat.cc \ StatHist.cc \ String.cc \ @@ -634,7 +630,7 @@ ufsdump_SOURCES = debug.cc \ icmp.cc \ icp_v2.cc \ icp_v3.cc \ - $(IDENTSOURCE) \ + $(IDENT_SOURCE) \ internal.cc \ ipc.cc \ ipcache.cc \ @@ -665,7 +661,7 @@ ufsdump_SOURCES = debug.cc \ send-announce.cc \ $(SNMPSOURCE) \ squid.h \ - $(SSLSOURCE) \ + $(SSL_SOURCE) \ tunnel.cc \ stat.cc \ StatHist.cc \ @@ -857,7 +853,8 @@ recv_announce_LDADD = $(LDADD) recv_announce_DEPENDENCIES = recv_announce_LDFLAGS = @ENABLE_ARP_ACL_FALSE@am__objects_5 = -@ENABLE_ARP_ACL_TRUE@am__objects_5 = ACLARP.$(OBJEXT) +am__objects_6 = ACLARP.$(OBJEXT) +@ENABLE_ARP_ACL_TRUE@am__objects_5 = $(am__objects_6) am__objects_4 = $(am__objects_5) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \ ACLDestinationDomain.$(OBJEXT) ACLDestinationIP.$(OBJEXT) \ ACLDomainData.$(OBJEXT) ACLIntRange.$(OBJEXT) ACLIP.$(OBJEXT) \ @@ -871,37 +868,38 @@ am__objects_4 = $(am__objects_5) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \ ACLStrategised.$(OBJEXT) ACLStringData.$(OBJEXT) \ ACLTime.$(OBJEXT) ACLTimeData.$(OBJEXT) ACLUrl.$(OBJEXT) \ ACLUrlPath.$(OBJEXT) ACLUrlPort.$(OBJEXT) ACLUserData.$(OBJEXT) -@USE_DELAY_POOLS_FALSE@am__objects_6 = -@USE_DELAY_POOLS_TRUE@am__objects_6 = delay_pools.$(OBJEXT) \ -@USE_DELAY_POOLS_TRUE@ DelayId.$(OBJEXT) DelayBucket.$(OBJEXT) \ -@USE_DELAY_POOLS_TRUE@ DelayConfig.$(OBJEXT) DelayPool.$(OBJEXT) \ -@USE_DELAY_POOLS_TRUE@ DelaySpec.$(OBJEXT) DelayUser.$(OBJEXT) \ -@USE_DELAY_POOLS_TRUE@ DelayVector.$(OBJEXT) \ -@USE_DELAY_POOLS_TRUE@ NullDelayId.$(OBJEXT) -@USE_DNSSERVER_FALSE@am__objects_7 = dns_internal.$(OBJEXT) -@USE_DNSSERVER_TRUE@am__objects_7 = dns.$(OBJEXT) -am__objects_9 = ESI.$(OBJEXT) ESIContext.$(OBJEXT) \ +@USE_DELAY_POOLS_FALSE@am__objects_7 = +am__objects_8 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \ + DelayBucket.$(OBJEXT) DelayConfig.$(OBJEXT) DelayPool.$(OBJEXT) \ + DelaySpec.$(OBJEXT) DelayUser.$(OBJEXT) DelayVector.$(OBJEXT) \ + NullDelayId.$(OBJEXT) +@USE_DELAY_POOLS_TRUE@am__objects_7 = $(am__objects_8) +@USE_DNSSERVER_FALSE@am__objects_9 = dns_internal.$(OBJEXT) +@USE_DNSSERVER_TRUE@am__objects_9 = dns.$(OBJEXT) +am__objects_11 = ESI.$(OBJEXT) ESIContext.$(OBJEXT) \ ESICustomParser.$(OBJEXT) ESIExpatParser.$(OBJEXT) \ ESIExpression.$(OBJEXT) ESIParser.$(OBJEXT) \ ESISegment.$(OBJEXT) ESISequence.$(OBJEXT) -@USE_ESI_TRUE@am__objects_8 = $(am__objects_9) -@USE_ESI_FALSE@am__objects_8 = -@ENABLE_HTCP_TRUE@am__objects_10 = htcp.$(OBJEXT) -@ENABLE_IDENT_TRUE@am__objects_11 = ACLIdent.$(OBJEXT) ident.$(OBJEXT) -@ENABLE_IDENT_FALSE@am__objects_11 = -@MAKE_LEAKFINDER_TRUE@am__objects_12 = leakfinder.$(OBJEXT) -@MAKE_LEAKFINDER_FALSE@am__objects_12 = +@USE_ESI_TRUE@am__objects_10 = $(am__objects_11) +@USE_ESI_FALSE@am__objects_10 = +@ENABLE_HTCP_TRUE@am__objects_12 = htcp.$(OBJEXT) +am__objects_14 = ACLIdent.$(OBJEXT) ident.$(OBJEXT) +@ENABLE_IDENT_TRUE@am__objects_13 = $(am__objects_14) +@ENABLE_IDENT_FALSE@am__objects_13 = +@MAKE_LEAKFINDER_TRUE@am__objects_15 = leakfinder.$(OBJEXT) +@MAKE_LEAKFINDER_FALSE@am__objects_15 = @ENABLE_XPROF_STATS_TRUE@am__objects_3 = ProfStats.$(OBJEXT) @ENABLE_XPROF_STATS_FALSE@am__objects_3 = -@USE_SNMP_TRUE@am__objects_13 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT) -@USE_SNMP_FALSE@am__objects_13 = -@ENABLE_SSL_FALSE@am__objects_14 = -@ENABLE_SSL_TRUE@am__objects_14 = ACLCertificateData.$(OBJEXT) \ -@ENABLE_SSL_TRUE@ ACLCertificate.$(OBJEXT) ssl_support.$(OBJEXT) -@ENABLE_UNLINKD_TRUE@am__objects_15 = unlinkd.$(OBJEXT) -@ENABLE_UNLINKD_FALSE@am__objects_15 = -@ENABLE_WIN32SPECIFIC_FALSE@am__objects_16 = -@ENABLE_WIN32SPECIFIC_TRUE@am__objects_16 = win32.$(OBJEXT) +@USE_SNMP_TRUE@am__objects_16 = snmp_core.$(OBJEXT) snmp_agent.$(OBJEXT) +@USE_SNMP_FALSE@am__objects_16 = +@ENABLE_SSL_FALSE@am__objects_17 = +am__objects_18 = ACLCertificateData.$(OBJEXT) ACLCertificate.$(OBJEXT) \ + ssl_support.$(OBJEXT) +@ENABLE_SSL_TRUE@am__objects_17 = $(am__objects_18) +@ENABLE_UNLINKD_TRUE@am__objects_19 = unlinkd.$(OBJEXT) +@ENABLE_UNLINKD_FALSE@am__objects_19 = +@ENABLE_WIN32SPECIFIC_FALSE@am__objects_20 = +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_20 = win32.$(OBJEXT) am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ ACLChecklist.$(OBJEXT) $(am__objects_4) asn.$(OBJEXT) \ authenticate.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \ @@ -910,28 +908,28 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ clientStream.$(OBJEXT) comm.$(OBJEXT) comm_select.$(OBJEXT) \ comm_poll.$(OBJEXT) comm_kqueue.$(OBJEXT) comm_epoll.$(OBJEXT) \ - debug.$(OBJEXT) $(am__objects_6) disk.$(OBJEXT) \ - $(am__objects_7) errorpage.$(OBJEXT) $(am__objects_8) \ + debug.$(OBJEXT) $(am__objects_7) disk.$(OBJEXT) \ + $(am__objects_9) errorpage.$(OBJEXT) $(am__objects_10) \ ETag.$(OBJEXT) event.$(OBJEXT) external_acl.$(OBJEXT) \ fd.$(OBJEXT) fde.$(OBJEXT) filemap.$(OBJEXT) forward.$(OBJEXT) \ fqdncache.$(OBJEXT) ftp.$(OBJEXT) gopher.$(OBJEXT) \ - helper.$(OBJEXT) $(am__objects_10) http.$(OBJEXT) \ + helper.$(OBJEXT) $(am__objects_12) http.$(OBJEXT) \ HttpStatusLine.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrRange.$(OBJEXT) HttpHdrSc.$(OBJEXT) \ HttpHdrScTarget.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \ HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \ HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \ HttpRequest.$(OBJEXT) icmp.$(OBJEXT) icp_v2.$(OBJEXT) \ - icp_v3.$(OBJEXT) $(am__objects_11) int.$(OBJEXT) \ + icp_v3.$(OBJEXT) $(am__objects_13) int.$(OBJEXT) \ internal.$(OBJEXT) ipc.$(OBJEXT) ipcache.$(OBJEXT) \ - IPInterception.$(OBJEXT) $(am__objects_12) logfile.$(OBJEXT) \ + IPInterception.$(OBJEXT) $(am__objects_15) logfile.$(OBJEXT) \ main.$(OBJEXT) mem.$(OBJEXT) mem_node.$(OBJEXT) \ MemBuf.$(OBJEXT) MemObject.$(OBJEXT) mime.$(OBJEXT) \ multicast.$(OBJEXT) neighbors.$(OBJEXT) net_db.$(OBJEXT) \ Packer.$(OBJEXT) $(am__objects_3) pconn.$(OBJEXT) \ peer_digest.$(OBJEXT) peer_select.$(OBJEXT) redirect.$(OBJEXT) \ referer.$(OBJEXT) refresh.$(OBJEXT) send-announce.$(OBJEXT) \ - $(am__objects_13) tunnel.$(OBJEXT) $(am__objects_14) \ + $(am__objects_16) tunnel.$(OBJEXT) $(am__objects_17) \ stat.$(OBJEXT) StatHist.$(OBJEXT) String.$(OBJEXT) \ stmem.$(OBJEXT) store.$(OBJEXT) store_io.$(OBJEXT) \ StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \ @@ -943,9 +941,9 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \ StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \ SwapDir.$(OBJEXT) tools.$(OBJEXT) ufscommon.$(OBJEXT) \ - $(am__objects_15) url.$(OBJEXT) urn.$(OBJEXT) \ + $(am__objects_19) url.$(OBJEXT) urn.$(OBJEXT) \ useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ - whois.$(OBJEXT) $(am__objects_16) + whois.$(OBJEXT) $(am__objects_20) nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ store_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) @@ -968,27 +966,27 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \ client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \ clientStream.$(OBJEXT) comm.$(OBJEXT) comm_select.$(OBJEXT) \ comm_poll.$(OBJEXT) comm_kqueue.$(OBJEXT) comm_epoll.$(OBJEXT) \ - $(am__objects_6) disk.$(OBJEXT) $(am__objects_7) \ - errorpage.$(OBJEXT) $(am__objects_8) ETag.$(OBJEXT) \ + $(am__objects_7) disk.$(OBJEXT) $(am__objects_9) \ + errorpage.$(OBJEXT) $(am__objects_10) ETag.$(OBJEXT) \ event.$(OBJEXT) external_acl.$(OBJEXT) fd.$(OBJEXT) \ fde.$(OBJEXT) filemap.$(OBJEXT) forward.$(OBJEXT) \ fqdncache.$(OBJEXT) ftp.$(OBJEXT) gopher.$(OBJEXT) \ - helper.$(OBJEXT) $(am__objects_10) http.$(OBJEXT) \ + helper.$(OBJEXT) $(am__objects_12) http.$(OBJEXT) \ HttpStatusLine.$(OBJEXT) HttpHdrCc.$(OBJEXT) \ HttpHdrRange.$(OBJEXT) HttpHdrSc.$(OBJEXT) \ HttpHdrScTarget.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \ HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \ HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \ HttpRequest.$(OBJEXT) icmp.$(OBJEXT) icp_v2.$(OBJEXT) \ - icp_v3.$(OBJEXT) $(am__objects_11) internal.$(OBJEXT) \ + icp_v3.$(OBJEXT) $(am__objects_13) internal.$(OBJEXT) \ ipc.$(OBJEXT) ipcache.$(OBJEXT) IPInterception.$(OBJEXT) \ - $(am__objects_12) logfile.$(OBJEXT) mem.$(OBJEXT) \ + $(am__objects_15) logfile.$(OBJEXT) mem.$(OBJEXT) \ mem_node.$(OBJEXT) MemBuf.$(OBJEXT) MemObject.$(OBJEXT) \ mime.$(OBJEXT) multicast.$(OBJEXT) neighbors.$(OBJEXT) \ net_db.$(OBJEXT) Packer.$(OBJEXT) $(am__objects_3) \ pconn.$(OBJEXT) peer_digest.$(OBJEXT) peer_select.$(OBJEXT) \ redirect.$(OBJEXT) referer.$(OBJEXT) refresh.$(OBJEXT) \ - send-announce.$(OBJEXT) $(am__objects_13) $(am__objects_14) \ + send-announce.$(OBJEXT) $(am__objects_16) $(am__objects_17) \ tunnel.$(OBJEXT) stat.$(OBJEXT) StatHist.$(OBJEXT) \ String.$(OBJEXT) stmem.$(OBJEXT) store_io.$(OBJEXT) \ StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \ @@ -997,9 +995,9 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \ store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \ store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \ SwapDir.$(OBJEXT) tools.$(OBJEXT) ufscommon.$(OBJEXT) \ - $(am__objects_15) url.$(OBJEXT) urn.$(OBJEXT) \ + $(am__objects_19) url.$(OBJEXT) urn.$(OBJEXT) \ useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ - whois.$(OBJEXT) $(am__objects_16) + whois.$(OBJEXT) $(am__objects_20) nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ store_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) @@ -1745,6 +1743,14 @@ uninstall-info: uninstall-info-recursive uninstall-sbinPROGRAMS uninstall-sysconfDATA cf_gen.$(OBJEXT): cf_gen_defines.h + $(ESI_ALL_SOURCE) \ + ProfStats.cc \ + leakfinder.cc \ + snmp_core.cc \ + snmp_agent.cc \ + unlinkd.cc \ + $(SSL_ALL_SOURCE) \ + win32.cc $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h