Bootstrapped

diff --git a/configure b/configure
index e465f080780417d3c4d93522050e624e2b29de75..d85a37b8bd9e8e775fb13cad8cf06a4c798c6225 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.492 .
+# From configure.in Revision: 1.493 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.HEAD-CVS.
 #
@@ -21149,9 +21149,6 @@ for fs in $STORE_MODULES none; do
        NEED_AIO="true"
                                        STORE_TESTS="$STORE_TESTS tests/testCoss$EXEEXT"
        ;;
-    null)
-       STORE_TESTS="$STORE_TESTS tests/testNull$EXEEXT"
-       ;;
     ufs)
        UFS_FOUND="true"
        STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"

diff --git a/src/Makefile.in b/src/Makefile.in
index 523dc8edd706b360f2bbf58f47ae0d628b6e7008..eacb83af752d252ebe7983c8c9c5c54823947f30 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.452 2007/12/27 15:46:06 hno Exp $
+#  $Id: Makefile.in,v 1.453 2007/12/27 15:50:00 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -381,8 +381,7 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \
        $(am__objects_26) $(am__objects_27)
 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 \
+       fs/ufs/StoreFSufs.cc DiskIO/AIO/AIODiskIOModule.cc \
        DiskIO/Blocking/BlockingDiskIOModule.cc \
        DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc \
        DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc \
@@ -1914,7 +1913,6 @@ all_FSMODULES = \
        fs/aufs/StoreFSaufs.cc \
        fs/coss/StoreFScoss.cc \
        fs/diskd/StoreFSdiskd.cc \
-       fs/null/StoreFSnull.cc \
        fs/ufs/StoreFSufs.cc
 
 all_DISKIOMODULES = \
@@ -4310,14 +4308,6 @@ fs/diskd/$(DEPDIR)/$(am__dirstamp):
        @: > fs/diskd/$(DEPDIR)/$(am__dirstamp)
 fs/diskd/StoreFSdiskd.$(OBJEXT): fs/diskd/$(am__dirstamp) \
        fs/diskd/$(DEPDIR)/$(am__dirstamp)
-fs/null/$(am__dirstamp):
-       @$(mkdir_p) fs/null
-       @: > fs/null/$(am__dirstamp)
-fs/null/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) fs/null/$(DEPDIR)
-       @: > fs/null/$(DEPDIR)/$(am__dirstamp)
-fs/null/StoreFSnull.$(OBJEXT): fs/null/$(am__dirstamp) \
-       fs/null/$(DEPDIR)/$(am__dirstamp)
 fs/ufs/$(am__dirstamp):
        @$(mkdir_p) fs/ufs
        @: > fs/ufs/$(am__dirstamp)
@@ -4619,7 +4609,6 @@ mostlyclean-compile:
        -rm -f fs/aufs/StoreFSaufs.$(OBJEXT)
        -rm -f fs/coss/StoreFScoss.$(OBJEXT)
        -rm -f fs/diskd/StoreFSdiskd.$(OBJEXT)
-       -rm -f fs/null/StoreFSnull.$(OBJEXT)
        -rm -f fs/ufs/StoreFSufs.$(OBJEXT)
        -rm -f tests/TestSwapDir.$(OBJEXT)
        -rm -f tests/stub_DelayId.$(OBJEXT)
@@ -4950,7 +4939,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@fs/aufs/$(DEPDIR)/StoreFSaufs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@fs/coss/$(DEPDIR)/StoreFScoss.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@fs/diskd/$(DEPDIR)/StoreFSdiskd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@fs/null/$(DEPDIR)/StoreFSnull.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@fs/ufs/$(DEPDIR)/StoreFSufs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/TestSwapDir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_DelayId.Po@am__quote@
@@ -5419,8 +5407,6 @@ distclean-generic:
        -rm -f fs/coss/$(am__dirstamp)
        -rm -f fs/diskd/$(DEPDIR)/$(am__dirstamp)
        -rm -f fs/diskd/$(am__dirstamp)
-       -rm -f fs/null/$(DEPDIR)/$(am__dirstamp)
-       -rm -f fs/null/$(am__dirstamp)
        -rm -f fs/ufs/$(DEPDIR)/$(am__dirstamp)
        -rm -f fs/ufs/$(am__dirstamp)
        -rm -f tests/$(DEPDIR)/$(am__dirstamp)
@@ -5439,7 +5425,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
        clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-       -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) ICAP/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/negotiate/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR)
+       -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) ICAP/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/negotiate/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-tags
@@ -5466,7 +5452,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-       -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) ICAP/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/negotiate/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR)
+       -rm -rf ../test-suite/$(DEPDIR) ./$(DEPDIR) DiskIO/$(DEPDIR) DiskIO/AIO/$(DEPDIR) DiskIO/Blocking/$(DEPDIR) DiskIO/DiskDaemon/$(DEPDIR) DiskIO/DiskThreads/$(DEPDIR) ICAP/$(DEPDIR) auth/basic/$(DEPDIR) auth/digest/$(DEPDIR) auth/negotiate/$(DEPDIR) auth/ntlm/$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/ufs/$(DEPDIR) tests/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in
index 873ec1a2680dea9a0b745204a0b0285f0034bbea..9e8b2f5e39f2c5b80808d2f3f13f63f8bfba8458 100644 (file)
--- a/src/fs/Makefile.in
+++ b/src/fs/Makefile.in
@@ -16,7 +16,7 @@
 
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.100 2007/12/16 01:11:44 hno Exp $
+#  $Id: Makefile.in,v 1.101 2007/12/27 15:50:02 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -59,10 +59,6 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am_libcoss_a_OBJECTS = coss/store_io_coss.$(OBJEXT) \
        coss/store_dir_coss.$(OBJEXT)
 libcoss_a_OBJECTS = $(am_libcoss_a_OBJECTS)
-libnull_a_AR = $(AR) $(ARFLAGS)
-libnull_a_LIBADD =
-am_libnull_a_OBJECTS = null/store_null.$(OBJEXT)
-libnull_a_OBJECTS = $(am_libnull_a_OBJECTS)
 libufs_a_AR = $(AR) $(ARFLAGS)
 libufs_a_LIBADD =
 am_libufs_a_OBJECTS = ufs/store_dir_ufs.$(OBJEXT) \
@@ -87,10 +83,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libcoss_a_SOURCES) $(libnull_a_SOURCES) \
-       $(libufs_a_SOURCES)
-DIST_SOURCES = $(libcoss_a_SOURCES) $(libnull_a_SOURCES) \
-       $(libufs_a_SOURCES)
+SOURCES = $(libcoss_a_SOURCES) $(libufs_a_SOURCES)
+DIST_SOURCES = $(libcoss_a_SOURCES) $(libufs_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -314,7 +308,7 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
-EXTRA_LIBRARIES = libcoss.a libnull.a libufs.a
+EXTRA_LIBRARIES = libcoss.a libufs.a
 noinst_LIBRARIES = @STORE_LIBS@
 libcoss_a_SOURCES = \
        coss/store_coss.h \
@@ -322,7 +316,6 @@ libcoss_a_SOURCES = \
        coss/store_dir_coss.cc \
        coss/CossSwapDir.h
 
-libnull_a_SOURCES = null/store_null.cc null/store_null.h
 libufs_a_SOURCES = ufs/store_dir_ufs.cc ufs/store_io_ufs.cc \
        ufs/ufscommon.cci \
        ufs/ufscommon.cc \
@@ -331,8 +324,7 @@ libufs_a_SOURCES = ufs/store_dir_ufs.cc ufs/store_io_ufs.cc \
 EXTRA_DIST = \
        coss/coss-notes.txt \
        coss/StoreFScoss.h \
-       ufs/StoreFSufs.h \
-       null/StoreFSnull.h
+       ufs/StoreFSufs.h
 
 INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
        -I$(top_srcdir)/src
@@ -387,18 +379,6 @@ libcoss.a: $(libcoss_a_OBJECTS) $(libcoss_a_DEPENDENCIES)
        -rm -f libcoss.a
        $(libcoss_a_AR) libcoss.a $(libcoss_a_OBJECTS) $(libcoss_a_LIBADD)
        $(RANLIB) libcoss.a
-null/$(am__dirstamp):
-       @$(mkdir_p) null
-       @: > null/$(am__dirstamp)
-null/$(DEPDIR)/$(am__dirstamp):
-       @$(mkdir_p) null/$(DEPDIR)
-       @: > null/$(DEPDIR)/$(am__dirstamp)
-null/store_null.$(OBJEXT): null/$(am__dirstamp) \
-       null/$(DEPDIR)/$(am__dirstamp)
-libnull.a: $(libnull_a_OBJECTS) $(libnull_a_DEPENDENCIES) 
-       -rm -f libnull.a
-       $(libnull_a_AR) libnull.a $(libnull_a_OBJECTS) $(libnull_a_LIBADD)
-       $(RANLIB) libnull.a
 ufs/$(am__dirstamp):
        @$(mkdir_p) ufs
        @: > ufs/$(am__dirstamp)
@@ -420,7 +400,6 @@ mostlyclean-compile:
        -rm -f *.$(OBJEXT)
        -rm -f coss/store_dir_coss.$(OBJEXT)
        -rm -f coss/store_io_coss.$(OBJEXT)
-       -rm -f null/store_null.$(OBJEXT)
        -rm -f ufs/store_dir_ufs.$(OBJEXT)
        -rm -f ufs/store_io_ufs.$(OBJEXT)
        -rm -f ufs/ufscommon.$(OBJEXT)
@@ -430,7 +409,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@coss/$(DEPDIR)/store_dir_coss.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coss/$(DEPDIR)/store_io_coss.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@null/$(DEPDIR)/store_null.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ufs/$(DEPDIR)/store_dir_ufs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ufs/$(DEPDIR)/store_io_ufs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ufs/$(DEPDIR)/ufscommon.Po@am__quote@
@@ -518,7 +496,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/coss $(distdir)/null $(distdir)/ufs
+       $(mkdir_p) $(distdir)/coss $(distdir)/ufs
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -571,8 +549,6 @@ distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
        -rm -f coss/$(DEPDIR)/$(am__dirstamp)
        -rm -f coss/$(am__dirstamp)
-       -rm -f null/$(DEPDIR)/$(am__dirstamp)
-       -rm -f null/$(am__dirstamp)
        -rm -f ufs/$(DEPDIR)/$(am__dirstamp)
        -rm -f ufs/$(am__dirstamp)
 
@@ -585,7 +561,7 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
        mostlyclean-am
 
 distclean: distclean-am
-       -rm -rf coss/$(DEPDIR) null/$(DEPDIR) ufs/$(DEPDIR)
+       -rm -rf coss/$(DEPDIR) ufs/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-tags
@@ -611,7 +587,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-       -rm -rf coss/$(DEPDIR) null/$(DEPDIR) ufs/$(DEPDIR)
+       -rm -rf coss/$(DEPDIR) ufs/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -645,8 +621,6 @@ uninstall-am: uninstall-info-am
 
 coss/all: libcoss.a
 coss/clean: clean
-null/all: libnull.a
-null/clean: clean
 ufs/all: libufs.a
 ufs/clean: clean
 # Tell versions [3.59,3.63) of GNU make to not export all variables.