From 262f47ae5e336d17abd40081ee0f89d735b2fabe Mon Sep 17 00:00:00 2001 From: serassio <> Date: Wed, 30 Nov 2005 01:13:58 +0000 Subject: [PATCH] Bootstrapped --- configure | 3 +++ src/ICAP/Makefile.in | 54 ++++++++++++++++++++++++++++++++------------ src/Makefile.in | 30 ++++++++++++------------ 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/configure b/configure index a4dd108f73..0f8653ca6d 100755 --- a/configure +++ b/configure @@ -38081,6 +38081,9 @@ if test "$no_recursion" != yes; then # Remove --cache-file and --srcdir arguments so they do not pile up. ac_sub_configure_args= # Add --quiet option if used + test "$silent" = yes && + ac_sub_configure_args="$ac_sub_configure_args --quiet" + # Add --quiet option if used test "$silent" = yes && ac_sub_configure_args="$ac_sub_configure_args --quiet" ac_prev= diff --git a/src/ICAP/Makefile.in b/src/ICAP/Makefile.in index 1ade7f084c..30740c6ca7 100644 --- a/src/ICAP/Makefile.in +++ b/src/ICAP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.2 2005/11/21 23:55:25 wessels Exp $ +# $Id: Makefile.in,v 1.3 2005/11/29 18:14:00 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -59,13 +59,12 @@ ARFLAGS = cru libicap_a_AR = $(AR) $(ARFLAGS) libicap_a_LIBADD = am_libicap_a_OBJECTS = ChunkedCodingParser.$(OBJEXT) \ - ICAPClientRespmodPrecache.$(OBJEXT) \ - ICAPClientReqmodPrecache.$(OBJEXT) ICAPClient.$(OBJEXT) \ - ICAPElements.$(OBJEXT) ICAPXaction.$(OBJEXT) \ - ICAPOptXact.$(OBJEXT) ICAPModXact.$(OBJEXT) \ - ICAPServiceRep.$(OBJEXT) ICAPConfig.$(OBJEXT) \ - ICAPOptions.$(OBJEXT) TextException.$(OBJEXT) \ - MsgPipe.$(OBJEXT) + ICAPClient.$(OBJEXT) ICAPClientReqmodPrecache.$(OBJEXT) \ + ICAPClientRespmodPrecache.$(OBJEXT) ICAPConfig.$(OBJEXT) \ + ICAPElements.$(OBJEXT) ICAPModXact.$(OBJEXT) \ + ICAPOptions.$(OBJEXT) ICAPOptXact.$(OBJEXT) \ + ICAPServiceRep.$(OBJEXT) ICAPXaction.$(OBJEXT) \ + MsgPipe.$(OBJEXT) TextException.$(OBJEXT) libicap_a_OBJECTS = $(am_libicap_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp @@ -78,6 +77,14 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libicap_a_SOURCES) DIST_SOURCES = $(libicap_a_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -289,18 +296,35 @@ noinst_LIBRARIES = \ libicap_a_SOURCES = \ ChunkedCodingParser.cc \ - ICAPClientRespmodPrecache.cc \ - ICAPClientReqmodPrecache.cc \ + ChunkedCodingParser.h \ ICAPClient.cc \ + ICAPClient.h \ + ICAPClientReqmodPrecache.cc \ + ICAPClientReqmodPrecache.h \ + ICAPClientRespmodPrecache.cc \ + ICAPClientRespmodPrecache.h \ + ICAPConfig.cc \ + ICAPConfig.h \ ICAPElements.cc \ - ICAPXaction.cc \ - ICAPOptXact.cc \ + ICAPElements.h \ ICAPModXact.cc \ - ICAPServiceRep.cc \ - ICAPConfig.cc \ + ICAPModXact.h \ ICAPOptions.cc \ + ICAPOptions.h \ + ICAPOptXact.cc \ + ICAPOptXact.h \ + ICAPServiceRep.cc \ + ICAPServiceRep.h \ + ICAPXaction.cc \ + ICAPXaction.h \ + MsgPipe.cc \ + MsgPipe.h \ + MsgPipeData.h \ + MsgPipeEnd.h \ + MsgPipeSink.h \ + MsgPipeSource.h \ TextException.cc \ - MsgPipe.cc + TextException.h INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src all: all-recursive diff --git a/src/Makefile.in b/src/Makefile.in index f60c7b1579..eecedcea0f 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.355 2005/11/21 23:55:25 wessels Exp $ +# $Id: Makefile.in,v 1.356 2005/11/29 18:13:59 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -161,19 +161,19 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc ACL.h \ AuthUser.cc AuthUserRequest.cc 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 CommIO.h comm_select.cc \ - comm_poll.cc comm_epoll.cc comm_kqueue.cc CommRead.h \ - ConfigOption.cc ConfigParser.h ConnectionDetail.h debug.cc \ - Debug.h defines.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 \ - disk.cc DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \ - DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \ - DiskIO/WriteRequest.h DiskIO/DiskFile.h \ + client_side_request.cc client_side_request.h \ + ClientRequestContext.h clientStream.cc clientStream.h comm.cc \ + comm.h CommIO.h comm_select.cc comm_poll.cc comm_epoll.cc \ + comm_kqueue.cc CommRead.h ConfigOption.cc ConfigParser.h \ + ConnectionDetail.h debug.cc Debug.h defines.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 disk.cc DiskIO/DiskIOModule.cc \ + DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \ + DiskIO/WriteRequest.cc DiskIO/WriteRequest.h DiskIO/DiskFile.h \ DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \ DiskIO/DiskIOModule.h dns_internal.cc dns.cc enums.h \ errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \ @@ -911,6 +911,7 @@ EXTRA_squid_SOURCES = \ $(ESI_ALL_SOURCE) \ ProfStats.cc \ LeakFinder.cc \ + LeakFinder.h \ snmp_core.cc \ snmp_agent.cc \ unlinkd.cc \ @@ -1019,6 +1020,7 @@ squid_SOURCES = \ client_side_reply.h \ client_side_request.cc \ client_side_request.h \ + ClientRequestContext.h \ clientStream.cc \ clientStream.h \ comm.cc \ -- 2.47.3