From: wessels <>
Date: Tue, 24 Apr 2007 22:23:40 +0000 (+0000)
Subject: bootstrapped after henrik modified src/Makefile.am
X-Git-Tag: SQUID_3_0_PRE6~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a14211a7228b31c9803be63bad9b8b62b80aa65f;p=thirdparty%2Fsquid.git

bootstrapped after henrik modified src/Makefile.am
---

diff --git a/src/Makefile.in b/src/Makefile.in
index abf2ba76e1..2f8ca1cc34 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.419 2007/04/24 00:42:34 wessels Exp $
+#  $Id: Makefile.in,v 1.420 2007/04/24 16:23:40 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -1419,9 +1419,7 @@ 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_SOURCES_DIST = unlinkd.cc SquidNew.cc
-@ENABLE_UNLINKD_TRUE@am__objects_35 = unlinkd-unlinkd.$(OBJEXT)
-am_unlinkd_OBJECTS = $(am__objects_35) unlinkd-SquidNew.$(OBJEXT)
+am_unlinkd_OBJECTS = unlinkd_daemon.$(OBJEXT) SquidNew.$(OBJEXT)
 unlinkd_OBJECTS = $(am_unlinkd_OBJECTS)
 unlinkd_LDADD = $(LDADD)
 unlinkd_DEPENDENCIES = libsquid.la libauth.la
@@ -1489,7 +1487,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) $(am__unlinkd_SOURCES_DIST)
+	$(am__ufsdump_SOURCES_DIST) $(unlinkd_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -2303,8 +2301,7 @@ ICAP_libicap_a_SOURCES = \
 	ICAP/TextException.cc \
 	ICAP/TextException.h
 
-unlinkd_SOURCES = $(UNLINKDSOURCE) SquidNew.cc
-unlinkd_CXXFLAGS = -DUNLINK_DAEMON
+unlinkd_SOURCES = unlinkd_daemon.cc SquidNew.cc
 pinger_SOURCES = \
 	pinger.cc \
 	debug.cc \
@@ -4726,9 +4723,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tunnel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ufsdump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkd-SquidNew.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkd-unlinkd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkd_daemon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/useragent.Po@am__quote@
@@ -4891,34 +4887,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
-unlinkd-unlinkd.o: unlinkd.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -MT unlinkd-unlinkd.o -MD -MP -MF "$(DEPDIR)/unlinkd-unlinkd.Tpo" -c -o unlinkd-unlinkd.o `test -f 'unlinkd.cc' || echo '$(srcdir)/'`unlinkd.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/unlinkd-unlinkd.Tpo" "$(DEPDIR)/unlinkd-unlinkd.Po"; else rm -f "$(DEPDIR)/unlinkd-unlinkd.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='unlinkd.cc' object='unlinkd-unlinkd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -c -o unlinkd-unlinkd.o `test -f 'unlinkd.cc' || echo '$(srcdir)/'`unlinkd.cc
-
-unlinkd-unlinkd.obj: unlinkd.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -MT unlinkd-unlinkd.obj -MD -MP -MF "$(DEPDIR)/unlinkd-unlinkd.Tpo" -c -o unlinkd-unlinkd.obj `if test -f 'unlinkd.cc'; then $(CYGPATH_W) 'unlinkd.cc'; else $(CYGPATH_W) '$(srcdir)/unlinkd.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/unlinkd-unlinkd.Tpo" "$(DEPDIR)/unlinkd-unlinkd.Po"; else rm -f "$(DEPDIR)/unlinkd-unlinkd.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='unlinkd.cc' object='unlinkd-unlinkd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -c -o unlinkd-unlinkd.obj `if test -f 'unlinkd.cc'; then $(CYGPATH_W) 'unlinkd.cc'; else $(CYGPATH_W) '$(srcdir)/unlinkd.cc'; fi`
-
-unlinkd-SquidNew.o: SquidNew.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -MT unlinkd-SquidNew.o -MD -MP -MF "$(DEPDIR)/unlinkd-SquidNew.Tpo" -c -o unlinkd-SquidNew.o `test -f 'SquidNew.cc' || echo '$(srcdir)/'`SquidNew.cc; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/unlinkd-SquidNew.Tpo" "$(DEPDIR)/unlinkd-SquidNew.Po"; else rm -f "$(DEPDIR)/unlinkd-SquidNew.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SquidNew.cc' object='unlinkd-SquidNew.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -c -o unlinkd-SquidNew.o `test -f 'SquidNew.cc' || echo '$(srcdir)/'`SquidNew.cc
-
-unlinkd-SquidNew.obj: SquidNew.cc
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -MT unlinkd-SquidNew.obj -MD -MP -MF "$(DEPDIR)/unlinkd-SquidNew.Tpo" -c -o unlinkd-SquidNew.obj `if test -f 'SquidNew.cc'; then $(CYGPATH_W) 'SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/SquidNew.cc'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/unlinkd-SquidNew.Tpo" "$(DEPDIR)/unlinkd-SquidNew.Po"; else rm -f "$(DEPDIR)/unlinkd-SquidNew.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SquidNew.cc' object='unlinkd-SquidNew.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unlinkd_CXXFLAGS) $(CXXFLAGS) -c -o unlinkd-SquidNew.obj `if test -f 'SquidNew.cc'; then $(CYGPATH_W) 'SquidNew.cc'; else $(CYGPATH_W) '$(srcdir)/SquidNew.cc'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo