From: wessels <> Date: Tue, 24 Apr 2007 06:42:34 +0000 (+0000) Subject: Bootstrapped after fixing 'make check' for --disable-unlinkd X-Git-Tag: SQUID_3_0_PRE6~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fc3ecb76022a18e8b0b6bd9996e2126244debc0;p=thirdparty%2Fsquid.git Bootstrapped after fixing 'make check' for --disable-unlinkd --- diff --git a/src/Makefile.in b/src/Makefile.in index 59cf2d739e..abf2ba76e1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.418 2007/04/17 00:44:35 hno Exp $ +# $Id: Makefile.in,v 1.419 2007/04/24 00:42:34 wessels Exp $ # # Uncomment and customize the following to suit your needs: # @@ -369,6 +369,40 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ urn.$(OBJEXT) useragent.$(OBJEXT) wccp.$(OBJEXT) \ wccp2.$(OBJEXT) whois.$(OBJEXT) wordlist.$(OBJEXT) \ $(am__objects_25) $(am__objects_26) +am__EXTRA_squid_SOURCES_DIST = fs/aufs/StoreFSaufs.cc \ + fs/coss/StoreFScoss.cc fs/diskd/StoreFSdiskd.cc \ + fs/null/StoreFSnull.cc fs/ufs/StoreFSufs.cc \ + DiskIO/AIO/AIODiskIOModule.cc \ + DiskIO/Blocking/BlockingDiskIOModule.cc \ + DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc \ + DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc \ + DiskIO/AIO/aio_win32.cc DiskIO/AIO/aio_win32.h \ + auth/basic/basicScheme.cc auth/basic/basicScheme.h \ + auth/digest/digestScheme.cc auth/digest/digestScheme.h \ + auth/ntlm/ntlmScheme.cc auth/ntlm/ntlmScheme.h \ + auth/negotiate/negotiateScheme.cc \ + auth/negotiate/negotiateScheme.h ACLARP.cc ACLARP.h \ + ConfigOption.h 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 \ + DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \ + DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \ + dns.cc dnsserver.cc dns_internal.cc htcp.cc htcp.h ipc.cc \ + ipc_win32.cc ACLIdent.cc ACLIdent.h ident.cc ElementList.h \ + ESI.cc ESI.h ESIAssign.cc ESIAssign.h ESIAttempt.h \ + ESIContext.cc ESIContext.h ESICustomParser.cc \ + ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \ + ESIExpatParser.h ESIExpression.cc ESIExpression.h \ + ESIInclude.cc ESIInclude.h ESILiteral.h ESILibxml2Parser.cc \ + ESILibxml2Parser.h ESIParser.cc ESIParser.h ESISegment.cc \ + ESISegment.h ESISequence.cc ESISequence.h ESIVar.h \ + ESIVarState.cc ESIVarState.h ProfStats.cc LeakFinder.cc \ + LeakFinder.h snmp_core.cc snmp_agent.cc unlinkd.cc \ + ACLCertificateData.cc ACLCertificateData.h ACLCertificate.cc \ + ACLCertificate.h ssl_support.cc ssl_support.h win32.cc \ + WinSvc.cc DiskIO/DiskThreads/aiops.cc \ + DiskIO/DiskThreads/aiops_win32.cc nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS) @@ -587,7 +621,7 @@ am__objects_33 = tests/stub_store_rebuild.$(OBJEXT) \ StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \ StoreMetaVary.$(OBJEXT) StoreFileSystem.$(OBJEXT) \ store_io.$(OBJEXT) store_swapout.$(OBJEXT) \ - store_swapmeta.$(OBJEXT) unlinkd.$(OBJEXT) $(am__objects_25) \ + store_swapmeta.$(OBJEXT) $(am__objects_24) $(am__objects_25) \ $(am__objects_32) $(am__objects_10) am_tests_testCoss_OBJECTS = tests/testCoss.$(OBJEXT) \ tests/testMain.$(OBJEXT) $(am__objects_33) @@ -1385,8 +1419,9 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \ nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS) -am_unlinkd_OBJECTS = unlinkd-unlinkd.$(OBJEXT) \ - unlinkd-SquidNew.$(OBJEXT) +am__unlinkd_SOURCES_DIST = unlinkd.cc SquidNew.cc +@ENABLE_UNLINKD_TRUE@am__objects_35 = unlinkd-unlinkd.$(OBJEXT) +am_unlinkd_OBJECTS = $(am__objects_35) unlinkd-SquidNew.$(OBJEXT) unlinkd_OBJECTS = $(am_unlinkd_OBJECTS) unlinkd_LDADD = $(LDADD) unlinkd_DEPENDENCIES = libsquid.la libauth.la @@ -1439,8 +1474,9 @@ DIST_SOURCES = $(ICAP_libicap_a_SOURCES) $(am__libAIO_a_SOURCES_DIST) \ $(libsquid_la_SOURCES) $(DiskIO_DiskDaemon_diskd_SOURCES) \ $(cf_gen_SOURCES) $(dnsserver_SOURCES) $(pinger_SOURCES) \ $(recv_announce_SOURCES) $(am__squid_SOURCES_DIST) \ - $(EXTRA_squid_SOURCES) $(tests_testACLMaxUserIP_SOURCES) \ - $(tests_testAuth_SOURCES) $(tests_testBoilerplate_SOURCES) \ + $(am__EXTRA_squid_SOURCES_DIST) \ + $(tests_testACLMaxUserIP_SOURCES) $(tests_testAuth_SOURCES) \ + $(tests_testBoilerplate_SOURCES) \ $(am__tests_testCacheManager_SOURCES_DIST) \ $(am__tests_testCoss_SOURCES_DIST) \ $(am__tests_testDiskIO_SOURCES_DIST) \ @@ -1453,7 +1489,7 @@ DIST_SOURCES = $(ICAP_libicap_a_SOURCES) $(am__libAIO_a_SOURCES_DIST) \ $(tests_testString_SOURCES) $(am__tests_testURL_SOURCES_DIST) \ $(am__tests_testUfs_SOURCES_DIST) \ $(am__tests_test_http_range_SOURCES_DIST) \ - $(am__ufsdump_SOURCES_DIST) $(unlinkd_SOURCES) + $(am__ufsdump_SOURCES_DIST) $(am__unlinkd_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -1860,7 +1896,7 @@ EXTRA_squid_SOURCES = \ LeakFinder.cc \ LeakFinder.h \ $(SNMP_ALL_SOURCE) \ - unlinkd.cc \ + $(UNLINKDSOURCE) \ $(SSL_ALL_SOURCE) \ $(WIN32_ALL_SOURCE) \ DiskIO/DiskThreads/aiops.cc \ @@ -2267,7 +2303,7 @@ ICAP_libicap_a_SOURCES = \ ICAP/TextException.cc \ ICAP/TextException.h -unlinkd_SOURCES = unlinkd.cc SquidNew.cc +unlinkd_SOURCES = $(UNLINKDSOURCE) SquidNew.cc unlinkd_CXXFLAGS = -DUNLINK_DAEMON pinger_SOURCES = \ pinger.cc \ @@ -3586,7 +3622,7 @@ SWAP_TEST_SOURCES = \ store_io.cc \ store_swapout.cc \ store_swapmeta.cc \ - unlinkd.cc \ + $(UNLINKDSOURCE) \ $(WIN32_SOURCE) \ $(STORE_TEST_SOURCES) \ $(DISKIO_SOURCE)