From: hno <> Date: Wed, 23 Jul 2003 06:13:24 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70fd1c3dcc29cccf946313f651eebcfda8186e88;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/Makefile.in b/Makefile.in index d2b9d4f459..e05e410340 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.55 2003/05/05 22:55:57 hno Exp $ +# $Id: Makefile.in,v 1.56 2003/07/23 00:13:24 hno Exp $ # srcdir = @srcdir@ @@ -146,7 +146,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/configure b/configure index 3bd4c7c9f6..1695995b20 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.339 . +# From configure.in Revision: 1.340 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -311,7 +311,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all lib/libTrie" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES STORE_PROGRAMS STORE_MODULE_SUBDIRS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES USE_EPOLL_TRUE USE_EPOLL_FALSE EPOLL_LIBS MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS SAMBASOURCES ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPP RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R EGREP ALLOCA CRYPTLIB NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE SQUID_CFLAGS SQUID_CXXFLAGS LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_PROGRAMS STORE_MODULE_SUBDIRS STORE_LINKOBJS REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_ESI_TRUE USE_ESI_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_ARP_ACL_TRUE ENABLE_ARP_ACL_FALSE ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES USE_EPOLL_TRUE USE_EPOLL_FALSE EPOLL_LIBS MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE ENABLE_IDENT_TRUE ENABLE_IDENT_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS EXTERNAL_ACL_HELPERS SAMBASOURCES ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE ENABLE_XPROF_STATS_TRUE ENABLE_XPROF_STATS_FALSE CPP RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R EGREP ALLOCA CRYPTLIB NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS subdirs LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -4693,6 +4693,10 @@ if test -n "$STORE_MODULES"; then echo "Store modules built: $STORE_MODULES" STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" + STORE_LINKOBJS= + for module in $STORE_MODULES; do + STORE_LINKOBJS="$STORE_LINKOBJS fs/${module}/StoreFS${module}.o" + done fi STORE_MODULE_SUBDIRS= UFS_FOUND= @@ -4727,6 +4731,7 @@ if test -z "$UFS_FOUND" && test -n "$NEED_UFS"; then STORE_OBJS="$STORE_OBJS fs/libufs.a" STORE_LIBS="$STORE_LIBS libufs.a" STORE_MODULES="$STORE_MODULES ufs" + STORE_LINKOBJS="$STORE_SOURCE fs/ufs/StoreFSufs.o" fi @@ -17888,9 +17893,9 @@ s,@LIBDLMALLOC@,$LIBDLMALLOC,;t t s,@LIB_MALLOC@,$LIB_MALLOC,;t t s,@STORE_OBJS@,$STORE_OBJS,;t t s,@STORE_LIBS@,$STORE_LIBS,;t t -s,@STORE_MODULES@,$STORE_MODULES,;t t s,@STORE_PROGRAMS@,$STORE_PROGRAMS,;t t s,@STORE_MODULE_SUBDIRS@,$STORE_MODULE_SUBDIRS,;t t +s,@STORE_LINKOBJS@,$STORE_LINKOBJS,;t t s,@REPL_POLICIES@,$REPL_POLICIES,;t t s,@REPL_OBJS@,$REPL_OBJS,;t t s,@REPL_LIBS@,$REPL_LIBS,;t t diff --git a/contrib/Makefile.in b/contrib/Makefile.in index e9c299f6ca..9611be4f4d 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 15d0c26e13..fe5d9a15d7 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.35 2003/05/05 22:56:05 hno Exp $ +# $Id: Makefile.in,v 1.36 2003/07/23 00:13:27 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/errors/Makefile.in b/errors/Makefile.in index 60b3596801..b37bd2cffa 100644 --- a/errors/Makefile.in +++ b/errors/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.52 2003/06/20 00:13:08 hno Exp $ +# $Id: Makefile.in,v 1.53 2003/07/23 00:13:31 hno Exp $ # srcdir = @srcdir@ @@ -146,7 +146,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/Makefile.in b/helpers/Makefile.in index 5f18edfe66..3b58c78d84 100644 --- a/helpers/Makefile.in +++ b/helpers/Makefile.in @@ -142,7 +142,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in index ccbda5269c..d917ba9fc6 100644 --- a/helpers/basic_auth/LDAP/Makefile.in +++ b/helpers/basic_auth/LDAP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.44 2003/05/05 22:56:11 hno Exp $ +# $Id: Makefile.in,v 1.45 2003/07/23 00:13:37 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in index 96c50c6319..5f0c61f586 100644 --- a/helpers/basic_auth/MSNT/Makefile.in +++ b/helpers/basic_auth/MSNT/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.47 2003/05/05 22:56:11 hno Exp $ +# $Id: Makefile.in,v 1.48 2003/07/23 00:13:39 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in index 7c4e83723b..2a85b45e4d 100644 --- a/helpers/basic_auth/Makefile.in +++ b/helpers/basic_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2003/05/05 22:56:11 hno Exp $ +# $Id: Makefile.in,v 1.43 2003/07/23 00:13:35 hno Exp $ # srcdir = @srcdir@ @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in index 0bf85b93bf..f44aeda8f4 100644 --- a/helpers/basic_auth/NCSA/Makefile.in +++ b/helpers/basic_auth/NCSA/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.44 2003/05/31 11:34:59 hno Exp $ +# $Id: Makefile.in,v 1.45 2003/07/23 00:13:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in index c714a0aefc..6873bf3c4a 100644 --- a/helpers/basic_auth/PAM/Makefile.in +++ b/helpers/basic_auth/PAM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.43 2003/05/05 22:56:14 hno Exp $ +# $Id: Makefile.in,v 1.44 2003/07/23 00:13:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in index c2cbb90d15..6d5fad6ee7 100644 --- a/helpers/basic_auth/SASL/Makefile.in +++ b/helpers/basic_auth/SASL/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.40 2003/05/05 22:56:14 hno Exp $ +# $Id: Makefile.in,v 1.41 2003/07/23 00:13:46 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in index 3149943734..17cce0cb5b 100644 --- a/helpers/basic_auth/SMB/Makefile.in +++ b/helpers/basic_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.43 2003/05/05 22:56:16 hno Exp $ +# $Id: Makefile.in,v 1.44 2003/07/23 00:13:48 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -155,7 +155,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in index dcb4ec6d94..187b371243 100644 --- a/helpers/basic_auth/YP/Makefile.in +++ b/helpers/basic_auth/YP/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.44 2003/05/05 22:56:17 hno Exp $ +# $Id: Makefile.in,v 1.45 2003/07/23 00:13:51 hno Exp $ # # @@ -149,7 +149,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in index deaaf9e15c..bd67f70a9d 100644 --- a/helpers/basic_auth/getpwnam/Makefile.in +++ b/helpers/basic_auth/getpwnam/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2003/05/05 22:56:25 hno Exp $ +# $Id: Makefile.in,v 1.43 2003/07/23 00:13:54 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in index a8c5ebfe56..9907b71af5 100644 --- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in +++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.40 2003/05/05 22:56:29 hno Exp $ +# $Id: Makefile.in,v 1.41 2003/07/23 00:13:55 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/basic_auth/winbind/Makefile.in b/helpers/basic_auth/winbind/Makefile.in index 06013a00f2..473649deb0 100644 --- a/helpers/basic_auth/winbind/Makefile.in +++ b/helpers/basic_auth/winbind/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.34 2003/05/05 22:56:30 hno Exp $ +# $Id: Makefile.in,v 1.35 2003/07/23 00:13:57 hno Exp $ # srcdir = @srcdir@ @@ -148,7 +148,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index ff6e31636c..386ea2f066 100644 --- a/helpers/digest_auth/Makefile.in +++ b/helpers/digest_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.39 2003/05/05 22:56:36 hno Exp $ +# $Id: Makefile.in,v 1.40 2003/07/23 00:14:02 hno Exp $ # srcdir = @srcdir@ @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index 8375521136..bad1add417 100644 --- a/helpers/digest_auth/password/Makefile.in +++ b/helpers/digest_auth/password/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2003/05/05 22:56:39 hno Exp $ +# $Id: Makefile.in,v 1.43 2003/07/23 00:14:03 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/external_acl/Makefile.in b/helpers/external_acl/Makefile.in index bdb9e270d7..1770a67c80 100644 --- a/helpers/external_acl/Makefile.in +++ b/helpers/external_acl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.29 2003/05/05 22:56:42 hno Exp $ +# $Id: Makefile.in,v 1.30 2003/07/23 00:14:05 hno Exp $ # srcdir = @srcdir@ @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/external_acl/ip_user/Makefile.in b/helpers/external_acl/ip_user/Makefile.in index 734f31daaf..93c84d63fe 100644 --- a/helpers/external_acl/ip_user/Makefile.in +++ b/helpers/external_acl/ip_user/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.29 2003/05/05 22:56:52 hno Exp $ +# $Id: Makefile.in,v 1.30 2003/07/23 00:14:07 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/external_acl/ldap_group/Makefile.in b/helpers/external_acl/ldap_group/Makefile.in index 166163e08f..f4916823b4 100644 --- a/helpers/external_acl/ldap_group/Makefile.in +++ b/helpers/external_acl/ldap_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.31 2003/05/05 22:56:57 hno Exp $ +# $Id: Makefile.in,v 1.32 2003/07/23 00:14:09 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/external_acl/unix_group/Makefile.in b/helpers/external_acl/unix_group/Makefile.in index d666362673..d75112081f 100644 --- a/helpers/external_acl/unix_group/Makefile.in +++ b/helpers/external_acl/unix_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.29 2003/05/05 22:56:58 hno Exp $ +# $Id: Makefile.in,v 1.30 2003/07/23 00:14:11 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/external_acl/wbinfo_group/Makefile.in b/helpers/external_acl/wbinfo_group/Makefile.in index e436ce1179..3a7e93ee67 100644 --- a/helpers/external_acl/wbinfo_group/Makefile.in +++ b/helpers/external_acl/wbinfo_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.28 2003/05/05 22:56:58 hno Exp $ +# $Id: Makefile.in,v 1.29 2003/07/23 00:14:13 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/external_acl/winbind_group/Makefile.in b/helpers/external_acl/winbind_group/Makefile.in index fdf55938ef..f976b8f687 100644 --- a/helpers/external_acl/winbind_group/Makefile.in +++ b/helpers/external_acl/winbind_group/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the wb_group external_acl helper # -# $Id: Makefile.in,v 1.30 2003/05/17 00:13:05 hno Exp $ +# $Id: Makefile.in,v 1.31 2003/07/23 00:14:15 hno Exp $ # srcdir = @srcdir@ @@ -148,7 +148,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in index cc81052d0e..07ee69326b 100644 --- a/helpers/ntlm_auth/Makefile.in +++ b/helpers/ntlm_auth/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2003/05/05 22:57:00 hno Exp $ +# $Id: Makefile.in,v 1.43 2003/07/23 00:14:17 hno Exp $ # srcdir = @srcdir@ @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in index 80bd16a765..fbb7424b81 100644 --- a/helpers/ntlm_auth/SMB/Makefile.in +++ b/helpers/ntlm_auth/SMB/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.42 2003/05/05 22:57:00 hno Exp $ +# $Id: Makefile.in,v 1.43 2003/07/23 00:14:23 hno Exp $ # srcdir = @srcdir@ @@ -148,7 +148,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in index e70a0fa847..cafb85326b 100644 --- a/helpers/ntlm_auth/SMB/smbval/Makefile.in +++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in @@ -144,7 +144,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in index c0c9998cd7..a484508c8c 100644 --- a/helpers/ntlm_auth/fakeauth/Makefile.in +++ b/helpers/ntlm_auth/fakeauth/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.41 2003/05/05 22:57:08 hno Exp $ +# $Id: Makefile.in,v 1.42 2003/07/23 00:14:33 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in index dca7bf833b..e25bf7a724 100644 --- a/helpers/ntlm_auth/no_check/Makefile.in +++ b/helpers/ntlm_auth/no_check/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.43 2003/05/05 22:57:11 hno Exp $ +# $Id: Makefile.in,v 1.44 2003/07/23 00:14:36 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -150,7 +150,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/helpers/ntlm_auth/winbind/Makefile.in b/helpers/ntlm_auth/winbind/Makefile.in index dc2831b7ee..dc340d5ff9 100644 --- a/helpers/ntlm_auth/winbind/Makefile.in +++ b/helpers/ntlm_auth/winbind/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.34 2003/05/05 22:57:11 hno Exp $ +# $Id: Makefile.in,v 1.35 2003/07/23 00:14:38 hno Exp $ # srcdir = @srcdir@ @@ -148,7 +148,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 2f8804a394..b2622a3fdd 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.57 2003/05/21 08:32:42 hno Exp $ +# $Id: Makefile.in,v 1.58 2003/07/23 00:14:40 hno Exp $ # srcdir = @srcdir@ @@ -145,7 +145,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/lib/Makefile.in b/lib/Makefile.in index c410bfa5be..7cee2e150f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.93 2003/07/15 07:14:08 robertc Exp $ +# $Id: Makefile.in,v 1.94 2003/07/23 00:14:42 hno Exp $ # srcdir = @srcdir@ @@ -146,7 +146,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index dc71800370..cb519361f1 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in index a6d91ad3bc..dbfddc1772 100644 --- a/snmplib/Makefile.in +++ b/snmplib/Makefile.in @@ -142,7 +142,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/src/Makefile.in b/src/Makefile.in index e7ac43fdb2..252aa893e2 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.315 2003/07/15 13:22:34 robertc Exp $ +# $Id: Makefile.in,v 1.316 2003/07/23 00:14:48 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -151,7 +151,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ @@ -210,8 +210,9 @@ sharedstatedir = @sharedstatedir@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.cc +AUTOMAKE_OPTIONS = subdir-objects +@USE_DNSSERVER_FALSE@DNSSOURCE = dns_internal.cc @USE_DNSSERVER_TRUE@DNSSOURCE = dns.cc @USE_DNSSERVER_FALSE@DNSSERVER = @USE_DNSSERVER_TRUE@DNSSERVER = dnsserver @@ -357,7 +358,16 @@ nodist_cf_gen_HEADER = cf_gen_defines.h squidclient_SOURCES = client.cc cachemgr__CGIEXT__SOURCES = cachemgr.cc +all_FSMODULES = \ + fs/aufs/StoreFSaufs.cc \ + fs/coss/StoreFScoss.cc \ + fs/diskd/StoreFSdiskd.cc \ + fs/null/StoreFSnull.cc \ + fs/ufs/StoreFSufs.cc + + EXTRA_squid_SOURCES = \ + $(all_FSMODULES) \ $(ARP_ACL_ALL_SOURCE) \ $(DELAY_POOL_ALL_SOURCE) \ dns.cc \ @@ -574,6 +584,8 @@ squid_SOURCES = \ stmem.h \ store.cc \ Store.h \ + StoreFileSystem.cc \ + StoreFileSystem.h \ store_io.cc \ StoreIOBuffer.h \ StoreIOState.cc \ @@ -600,6 +612,7 @@ squid_SOURCES = \ StoreMetaURL.h \ StoreMetaVary.cc \ StoreMetaVary.h \ + $(STORE_SOURCES) \ StoreSwapLogData.cc \ StoreSwapLogData.h \ structs.h \ @@ -633,7 +646,6 @@ noinst_HEADERS = ACLChecklist.cci \ nodist_squid_SOURCES = \ repl_modules.cc \ auth_modules.cc \ - store_modules.cc \ cf_parser.h \ globals.cc \ string_arrays.c @@ -643,6 +655,7 @@ squid_LDADD = \ -L../lib \ @XTRA_OBJS@ \ @REPL_OBJS@ \ + @STORE_LINKOBJS@ \ @STORE_OBJS@ \ @AUTH_OBJS@ \ @CRYPTLIB@ \ @@ -654,7 +667,7 @@ squid_LDADD = \ @XTRA_LIBS@ \ @EPOLL_LIBS@ -squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@ +squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@ @STORE_LINKOBJS@ unlinkd_SOURCES = unlinkd.cc SquidNew.cc unlinkd_CXXFLAGS = -DUNLINK_DAEMON @@ -833,7 +846,6 @@ ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a nodist_ufsdump_SOURCES = \ repl_modules.cc \ auth_modules.cc \ - store_modules.cc \ cf_parser.h \ globals.cc \ string_arrays.c @@ -849,8 +861,7 @@ BUILT_SOURCES = \ globals.cc \ string_arrays.c \ repl_modules.cc \ - auth_modules.cc \ - store_modules.cc + auth_modules.cc sysconf_DATA = \ @@ -870,7 +881,6 @@ EXTRA_DIST = \ mk-globals-c.pl \ mk-string-arrays.pl \ auth_modules.sh \ - store_modules.sh \ repl_modules.sh \ mib.txt \ mime.conf.default @@ -901,7 +911,7 @@ DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@ # $(RM) -f $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ # fi DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \ - globals.cc string_arrays.c repl_modules.cc auth_modules.cc store_modules.cc + globals.cc string_arrays.c repl_modules.cc auth_modules.cc subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -1030,11 +1040,12 @@ am__squid_SOURCES_DIST = access_log.cc acl.cc ACL.h ACLChecklist.cc \ tunnel.cc ACLCertificateData.cc ACLCertificateData.h \ ACLCertificate.cc ACLCertificate.h ssl_support.cc ssl_support.h \ stat.cc StatHist.cc String.cc stmem.cc stmem.h store.cc Store.h \ - store_io.cc StoreIOBuffer.h StoreIOState.cc StoreIOState.h \ - store_client.cc StoreClient.h store_digest.cc store_dir.cc \ - store_key_md5.cc store_log.cc store_rebuild.cc store_swapin.cc \ - store_swapmeta.cc store_swapout.cc StoreMeta.cc StoreMeta.h \ - StoreMetaMD5.cc StoreMetaMD5.h StoreMetaSTD.cc StoreMetaSTD.h \ + StoreFileSystem.cc StoreFileSystem.h store_io.cc \ + StoreIOBuffer.h StoreIOState.cc StoreIOState.h store_client.cc \ + StoreClient.h store_digest.cc store_dir.cc store_key_md5.cc \ + store_log.cc store_rebuild.cc store_swapin.cc store_swapmeta.cc \ + store_swapout.cc StoreMeta.cc StoreMeta.h StoreMetaMD5.cc \ + StoreMetaMD5.h StoreMetaSTD.cc StoreMetaSTD.h \ StoreMetaUnpacker.cc StoreMetaUnpacker.h StoreMetaURL.cc \ StoreMetaURL.h StoreMetaVary.cc StoreMetaVary.h \ StoreSwapLogData.cc StoreSwapLogData.h structs.h SwapDir.cc \ @@ -1087,10 +1098,10 @@ am__objects_15 = ACLCertificateData.$(OBJEXT) ACLCertificate.$(OBJEXT) \ ssl_support.$(OBJEXT) @ENABLE_SSL_TRUE@am__objects_16 = $(am__objects_15) @ENABLE_SSL_FALSE@am__objects_16 = -@ENABLE_UNLINKD_TRUE@am__objects_17 = unlinkd.$(OBJEXT) -@ENABLE_UNLINKD_FALSE@am__objects_17 = -@ENABLE_WIN32SPECIFIC_TRUE@am__objects_18 = win32.$(OBJEXT) -@ENABLE_WIN32SPECIFIC_FALSE@am__objects_18 = +@ENABLE_UNLINKD_TRUE@am__objects_18 = unlinkd.$(OBJEXT) +@ENABLE_UNLINKD_FALSE@am__objects_18 = +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_19 = win32.$(OBJEXT) +@ENABLE_WIN32SPECIFIC_FALSE@am__objects_19 = am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ ACLChecklist.$(OBJEXT) $(am__objects_3) asn.$(OBJEXT) \ authenticate.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \ @@ -1123,21 +1134,22 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ $(am__objects_14) SquidNew.$(OBJEXT) tunnel.$(OBJEXT) \ $(am__objects_16) stat.$(OBJEXT) StatHist.$(OBJEXT) \ String.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \ - store_io.$(OBJEXT) StoreIOState.$(OBJEXT) \ - store_client.$(OBJEXT) store_digest.$(OBJEXT) \ - store_dir.$(OBJEXT) store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ + StoreFileSystem.$(OBJEXT) store_io.$(OBJEXT) \ + StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \ + store_digest.$(OBJEXT) store_dir.$(OBJEXT) \ + store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \ store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \ store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \ StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \ StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \ StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \ - StoreSwapLogData.$(OBJEXT) SwapDir.$(OBJEXT) tools.$(OBJEXT) \ - ufscommon.$(OBJEXT) $(am__objects_17) url.$(OBJEXT) \ - urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ - whois.$(OBJEXT) $(am__objects_18) + $(am__objects_17) StoreSwapLogData.$(OBJEXT) SwapDir.$(OBJEXT) \ + tools.$(OBJEXT) ufscommon.$(OBJEXT) $(am__objects_18) \ + url.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \ + wccp.$(OBJEXT) whois.$(OBJEXT) $(am__objects_19) +am__dirstamp = $(am__leading_dot)dirstamp nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ - store_modules.$(OBJEXT) globals.$(OBJEXT) \ - string_arrays.$(OBJEXT) + globals.$(OBJEXT) string_arrays.$(OBJEXT) squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS) squid_LDFLAGS = am_squidclient_OBJECTS = client.$(OBJEXT) @@ -1253,12 +1265,11 @@ 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_17) url.$(OBJEXT) urn.$(OBJEXT) \ + $(am__objects_18) url.$(OBJEXT) urn.$(OBJEXT) \ useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ - whois.$(OBJEXT) $(am__objects_18) + whois.$(OBJEXT) $(am__objects_19) nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ - store_modules.$(OBJEXT) globals.$(OBJEXT) \ - string_arrays.$(OBJEXT) + globals.$(OBJEXT) string_arrays.$(OBJEXT) ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS) ufsdump_LDFLAGS = am_unlinkd_OBJECTS = unlinkd-unlinkd.$(OBJEXT) \ @@ -1328,6 +1339,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/MemObject.Po ./$(DEPDIR)/NullDelayId.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/Packer.Po ./$(DEPDIR)/ProfStats.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/SquidNew.Po ./$(DEPDIR)/StatHist.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/StoreFileSystem.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/StoreIOState.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/StoreMeta.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/StoreMetaMD5.Po \ @@ -1382,7 +1394,6 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/store_dir.Po ./$(DEPDIR)/store_io.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/store_key_md5.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/store_log.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/store_modules.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/store_rebuild.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/store_swapin.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/store_swapmeta.Po \ @@ -1395,7 +1406,12 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/unlinkd.Po ./$(DEPDIR)/url.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/urn.Po ./$(DEPDIR)/useragent.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/wais.Po ./$(DEPDIR)/wccp.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/whois.Po ./$(DEPDIR)/win32.Po +@AMDEP_TRUE@ ./$(DEPDIR)/whois.Po ./$(DEPDIR)/win32.Po \ +@AMDEP_TRUE@ fs/aufs/$(DEPDIR)/StoreFSaufs.Po \ +@AMDEP_TRUE@ fs/coss/$(DEPDIR)/StoreFScoss.Po \ +@AMDEP_TRUE@ fs/diskd/$(DEPDIR)/StoreFSdiskd.Po \ +@AMDEP_TRUE@ fs/null/$(DEPDIR)/StoreFSnull.Po \ +@AMDEP_TRUE@ fs/ufs/$(DEPDIR)/StoreFSufs.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -1524,6 +1540,46 @@ pinger$(EXEEXT): $(pinger_OBJECTS) $(pinger_DEPENDENCIES) recv-announce$(EXEEXT): $(recv_announce_OBJECTS) $(recv_announce_DEPENDENCIES) @rm -f recv-announce$(EXEEXT) $(CXXLINK) $(recv_announce_LDFLAGS) $(recv_announce_OBJECTS) $(recv_announce_LDADD) $(LIBS) +fs/aufs/$(am__dirstamp): + @$(mkinstalldirs) fs/aufs + @: > fs/aufs/$(am__dirstamp) +fs/aufs/$(DEPDIR)/$(am__dirstamp): + @$(mkinstalldirs) fs/aufs/$(DEPDIR) + @: > fs/aufs/$(DEPDIR)/$(am__dirstamp) +fs/aufs/StoreFSaufs.$(OBJEXT): fs/aufs/$(am__dirstamp) \ + fs/aufs/$(DEPDIR)/$(am__dirstamp) +fs/coss/$(am__dirstamp): + @$(mkinstalldirs) fs/coss + @: > fs/coss/$(am__dirstamp) +fs/coss/$(DEPDIR)/$(am__dirstamp): + @$(mkinstalldirs) fs/coss/$(DEPDIR) + @: > fs/coss/$(DEPDIR)/$(am__dirstamp) +fs/coss/StoreFScoss.$(OBJEXT): fs/coss/$(am__dirstamp) \ + fs/coss/$(DEPDIR)/$(am__dirstamp) +fs/diskd/$(am__dirstamp): + @$(mkinstalldirs) fs/diskd + @: > fs/diskd/$(am__dirstamp) +fs/diskd/$(DEPDIR)/$(am__dirstamp): + @$(mkinstalldirs) fs/diskd/$(DEPDIR) + @: > fs/diskd/$(DEPDIR)/$(am__dirstamp) +fs/diskd/StoreFSdiskd.$(OBJEXT): fs/diskd/$(am__dirstamp) \ + fs/diskd/$(DEPDIR)/$(am__dirstamp) +fs/null/$(am__dirstamp): + @$(mkinstalldirs) fs/null + @: > fs/null/$(am__dirstamp) +fs/null/$(DEPDIR)/$(am__dirstamp): + @$(mkinstalldirs) 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): + @$(mkinstalldirs) fs/ufs + @: > fs/ufs/$(am__dirstamp) +fs/ufs/$(DEPDIR)/$(am__dirstamp): + @$(mkinstalldirs) fs/ufs/$(DEPDIR) + @: > fs/ufs/$(DEPDIR)/$(am__dirstamp) +fs/ufs/StoreFSufs.$(OBJEXT): fs/ufs/$(am__dirstamp) \ + fs/ufs/$(DEPDIR)/$(am__dirstamp) squid$(EXEEXT): $(squid_OBJECTS) $(squid_DEPENDENCIES) @rm -f squid$(EXEEXT) $(CXXLINK) $(squid_LDFLAGS) $(squid_OBJECTS) $(squid_LDADD) $(LIBS) @@ -1539,6 +1595,11 @@ unlinkd$(EXEEXT): $(unlinkd_OBJECTS) $(unlinkd_DEPENDENCIES) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core + -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) distclean-compile: -rm -f *.tab.c @@ -1621,6 +1682,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProfStats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidNew.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatHist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StoreFileSystem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StoreIOState.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StoreMeta.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StoreMetaMD5.Po@am__quote@ @@ -1712,7 +1774,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_io.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_key_md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_modules.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_rebuild.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_swapin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store_swapmeta.Po@am__quote@ @@ -1732,9 +1793,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wccp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whois.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Po@am__quote@ +@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@ distclean-depend: - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) fs/aufs/$(DEPDIR) fs/coss/$(DEPDIR) fs/diskd/$(DEPDIR) fs/null/$(DEPDIR) fs/ufs/$(DEPDIR) .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @@ -1745,7 +1811,7 @@ distclean-depend: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @@ -1756,7 +1822,7 @@ distclean-depend: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ @@ -1780,6 +1846,116 @@ distclean-depend: @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +fs/aufs/StoreFSaufs.o: fs/aufs/StoreFSaufs.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/aufs/StoreFSaufs.o -MD -MP -MF "fs/aufs/$(DEPDIR)/StoreFSaufs.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/aufs/StoreFSaufs.o `test -f 'fs/aufs/StoreFSaufs.cc' || echo '$(srcdir)/'`fs/aufs/StoreFSaufs.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/aufs/$(DEPDIR)/StoreFSaufs.Tpo" "fs/aufs/$(DEPDIR)/StoreFSaufs.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/aufs/$(DEPDIR)/StoreFSaufs.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/aufs/StoreFSaufs.cc' object='fs/aufs/StoreFSaufs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/aufs/$(DEPDIR)/StoreFSaufs.Po' tmpdepfile='fs/aufs/$(DEPDIR)/StoreFSaufs.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/aufs/StoreFSaufs.o `test -f 'fs/aufs/StoreFSaufs.cc' || echo '$(srcdir)/'`fs/aufs/StoreFSaufs.cc + +fs/aufs/StoreFSaufs.obj: fs/aufs/StoreFSaufs.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/aufs/StoreFSaufs.obj -MD -MP -MF "fs/aufs/$(DEPDIR)/StoreFSaufs.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/aufs/StoreFSaufs.obj `if test -f 'fs/aufs/StoreFSaufs.cc'; then $(CYGPATH_W) 'fs/aufs/StoreFSaufs.cc'; else $(CYGPATH_W) '$(srcdir)/fs/aufs/StoreFSaufs.cc'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/aufs/$(DEPDIR)/StoreFSaufs.Tpo" "fs/aufs/$(DEPDIR)/StoreFSaufs.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/aufs/$(DEPDIR)/StoreFSaufs.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/aufs/StoreFSaufs.cc' object='fs/aufs/StoreFSaufs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/aufs/$(DEPDIR)/StoreFSaufs.Po' tmpdepfile='fs/aufs/$(DEPDIR)/StoreFSaufs.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/aufs/StoreFSaufs.obj `if test -f 'fs/aufs/StoreFSaufs.cc'; then $(CYGPATH_W) 'fs/aufs/StoreFSaufs.cc'; else $(CYGPATH_W) '$(srcdir)/fs/aufs/StoreFSaufs.cc'; fi` + +fs/coss/StoreFScoss.o: fs/coss/StoreFScoss.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/coss/StoreFScoss.o -MD -MP -MF "fs/coss/$(DEPDIR)/StoreFScoss.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/coss/StoreFScoss.o `test -f 'fs/coss/StoreFScoss.cc' || echo '$(srcdir)/'`fs/coss/StoreFScoss.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/coss/$(DEPDIR)/StoreFScoss.Tpo" "fs/coss/$(DEPDIR)/StoreFScoss.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/coss/$(DEPDIR)/StoreFScoss.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/coss/StoreFScoss.cc' object='fs/coss/StoreFScoss.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/coss/$(DEPDIR)/StoreFScoss.Po' tmpdepfile='fs/coss/$(DEPDIR)/StoreFScoss.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/coss/StoreFScoss.o `test -f 'fs/coss/StoreFScoss.cc' || echo '$(srcdir)/'`fs/coss/StoreFScoss.cc + +fs/coss/StoreFScoss.obj: fs/coss/StoreFScoss.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/coss/StoreFScoss.obj -MD -MP -MF "fs/coss/$(DEPDIR)/StoreFScoss.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/coss/StoreFScoss.obj `if test -f 'fs/coss/StoreFScoss.cc'; then $(CYGPATH_W) 'fs/coss/StoreFScoss.cc'; else $(CYGPATH_W) '$(srcdir)/fs/coss/StoreFScoss.cc'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/coss/$(DEPDIR)/StoreFScoss.Tpo" "fs/coss/$(DEPDIR)/StoreFScoss.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/coss/$(DEPDIR)/StoreFScoss.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/coss/StoreFScoss.cc' object='fs/coss/StoreFScoss.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/coss/$(DEPDIR)/StoreFScoss.Po' tmpdepfile='fs/coss/$(DEPDIR)/StoreFScoss.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/coss/StoreFScoss.obj `if test -f 'fs/coss/StoreFScoss.cc'; then $(CYGPATH_W) 'fs/coss/StoreFScoss.cc'; else $(CYGPATH_W) '$(srcdir)/fs/coss/StoreFScoss.cc'; fi` + +fs/diskd/StoreFSdiskd.o: fs/diskd/StoreFSdiskd.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/diskd/StoreFSdiskd.o -MD -MP -MF "fs/diskd/$(DEPDIR)/StoreFSdiskd.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/diskd/StoreFSdiskd.o `test -f 'fs/diskd/StoreFSdiskd.cc' || echo '$(srcdir)/'`fs/diskd/StoreFSdiskd.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/diskd/$(DEPDIR)/StoreFSdiskd.Tpo" "fs/diskd/$(DEPDIR)/StoreFSdiskd.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/diskd/$(DEPDIR)/StoreFSdiskd.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/diskd/StoreFSdiskd.cc' object='fs/diskd/StoreFSdiskd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/diskd/$(DEPDIR)/StoreFSdiskd.Po' tmpdepfile='fs/diskd/$(DEPDIR)/StoreFSdiskd.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/diskd/StoreFSdiskd.o `test -f 'fs/diskd/StoreFSdiskd.cc' || echo '$(srcdir)/'`fs/diskd/StoreFSdiskd.cc + +fs/diskd/StoreFSdiskd.obj: fs/diskd/StoreFSdiskd.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/diskd/StoreFSdiskd.obj -MD -MP -MF "fs/diskd/$(DEPDIR)/StoreFSdiskd.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/diskd/StoreFSdiskd.obj `if test -f 'fs/diskd/StoreFSdiskd.cc'; then $(CYGPATH_W) 'fs/diskd/StoreFSdiskd.cc'; else $(CYGPATH_W) '$(srcdir)/fs/diskd/StoreFSdiskd.cc'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/diskd/$(DEPDIR)/StoreFSdiskd.Tpo" "fs/diskd/$(DEPDIR)/StoreFSdiskd.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/diskd/$(DEPDIR)/StoreFSdiskd.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/diskd/StoreFSdiskd.cc' object='fs/diskd/StoreFSdiskd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/diskd/$(DEPDIR)/StoreFSdiskd.Po' tmpdepfile='fs/diskd/$(DEPDIR)/StoreFSdiskd.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/diskd/StoreFSdiskd.obj `if test -f 'fs/diskd/StoreFSdiskd.cc'; then $(CYGPATH_W) 'fs/diskd/StoreFSdiskd.cc'; else $(CYGPATH_W) '$(srcdir)/fs/diskd/StoreFSdiskd.cc'; fi` + +fs/null/StoreFSnull.o: fs/null/StoreFSnull.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/null/StoreFSnull.o -MD -MP -MF "fs/null/$(DEPDIR)/StoreFSnull.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/null/StoreFSnull.o `test -f 'fs/null/StoreFSnull.cc' || echo '$(srcdir)/'`fs/null/StoreFSnull.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/null/$(DEPDIR)/StoreFSnull.Tpo" "fs/null/$(DEPDIR)/StoreFSnull.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/null/$(DEPDIR)/StoreFSnull.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/null/StoreFSnull.cc' object='fs/null/StoreFSnull.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/null/$(DEPDIR)/StoreFSnull.Po' tmpdepfile='fs/null/$(DEPDIR)/StoreFSnull.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/null/StoreFSnull.o `test -f 'fs/null/StoreFSnull.cc' || echo '$(srcdir)/'`fs/null/StoreFSnull.cc + +fs/null/StoreFSnull.obj: fs/null/StoreFSnull.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/null/StoreFSnull.obj -MD -MP -MF "fs/null/$(DEPDIR)/StoreFSnull.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/null/StoreFSnull.obj `if test -f 'fs/null/StoreFSnull.cc'; then $(CYGPATH_W) 'fs/null/StoreFSnull.cc'; else $(CYGPATH_W) '$(srcdir)/fs/null/StoreFSnull.cc'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/null/$(DEPDIR)/StoreFSnull.Tpo" "fs/null/$(DEPDIR)/StoreFSnull.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/null/$(DEPDIR)/StoreFSnull.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/null/StoreFSnull.cc' object='fs/null/StoreFSnull.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/null/$(DEPDIR)/StoreFSnull.Po' tmpdepfile='fs/null/$(DEPDIR)/StoreFSnull.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/null/StoreFSnull.obj `if test -f 'fs/null/StoreFSnull.cc'; then $(CYGPATH_W) 'fs/null/StoreFSnull.cc'; else $(CYGPATH_W) '$(srcdir)/fs/null/StoreFSnull.cc'; fi` + +fs/ufs/StoreFSufs.o: fs/ufs/StoreFSufs.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/ufs/StoreFSufs.o -MD -MP -MF "fs/ufs/$(DEPDIR)/StoreFSufs.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/ufs/StoreFSufs.o `test -f 'fs/ufs/StoreFSufs.cc' || echo '$(srcdir)/'`fs/ufs/StoreFSufs.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/ufs/$(DEPDIR)/StoreFSufs.Tpo" "fs/ufs/$(DEPDIR)/StoreFSufs.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/ufs/$(DEPDIR)/StoreFSufs.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/ufs/StoreFSufs.cc' object='fs/ufs/StoreFSufs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/ufs/$(DEPDIR)/StoreFSufs.Po' tmpdepfile='fs/ufs/$(DEPDIR)/StoreFSufs.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/ufs/StoreFSufs.o `test -f 'fs/ufs/StoreFSufs.cc' || echo '$(srcdir)/'`fs/ufs/StoreFSufs.cc + +fs/ufs/StoreFSufs.obj: fs/ufs/StoreFSufs.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fs/ufs/StoreFSufs.obj -MD -MP -MF "fs/ufs/$(DEPDIR)/StoreFSufs.Tpo" \ +@am__fastdepCXX_TRUE@ -c -o fs/ufs/StoreFSufs.obj `if test -f 'fs/ufs/StoreFSufs.cc'; then $(CYGPATH_W) 'fs/ufs/StoreFSufs.cc'; else $(CYGPATH_W) '$(srcdir)/fs/ufs/StoreFSufs.cc'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "fs/ufs/$(DEPDIR)/StoreFSufs.Tpo" "fs/ufs/$(DEPDIR)/StoreFSufs.Po"; \ +@am__fastdepCXX_TRUE@ else rm -f "fs/ufs/$(DEPDIR)/StoreFSufs.Tpo"; exit 1; \ +@am__fastdepCXX_TRUE@ fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fs/ufs/StoreFSufs.cc' object='fs/ufs/StoreFSufs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='fs/ufs/$(DEPDIR)/StoreFSufs.Po' tmpdepfile='fs/ufs/$(DEPDIR)/StoreFSufs.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fs/ufs/StoreFSufs.obj `if test -f 'fs/ufs/StoreFSufs.cc'; then $(CYGPATH_W) 'fs/ufs/StoreFSufs.cc'; else $(CYGPATH_W) '$(srcdir)/fs/ufs/StoreFSufs.cc'; fi` + 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" \ @am__fastdepCXX_TRUE@ -c -o unlinkd-unlinkd.o `test -f 'unlinkd.cc' || echo '$(srcdir)/'`unlinkd.cc; \ @@ -2058,6 +2234,16 @@ clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f fs/coss/$(DEPDIR)/$(am__dirstamp) + -rm -f fs/null/$(DEPDIR)/$(am__dirstamp) + -rm -f fs/coss/$(am__dirstamp) + -rm -f fs/ufs/$(DEPDIR)/$(am__dirstamp) + -rm -f fs/null/$(am__dirstamp) + -rm -f fs/diskd/$(DEPDIR)/$(am__dirstamp) + -rm -f fs/aufs/$(DEPDIR)/$(am__dirstamp) + -rm -f fs/ufs/$(am__dirstamp) + -rm -f fs/aufs/$(am__dirstamp) + -rm -f fs/diskd/$(am__dirstamp) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -2186,9 +2372,6 @@ cf.data: cf.data.pre Makefile s%@[V]ERSION@%$(VERSION)%g;"\ < $(srcdir)/cf.data.pre >$@ -store_modules.cc: store_modules.sh Makefile - $(SHELL) $(srcdir)/store_modules.sh $(STORE_MODULES) >store_modules.cc - repl_modules.cc: repl_modules.sh Makefile $(SHELL) $(srcdir)/repl_modules.sh $(REPL_POLICIES) > repl_modules.cc diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 8f33be4638..56e4872b6f 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -142,7 +142,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ @@ -204,7 +204,7 @@ target_alias = @target_alias@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.41 2003/05/05 22:57:37 hno Exp $ +# $Id: Makefile.in,v 1.42 2003/07/23 00:14:50 hno Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ @@ -528,9 +528,9 @@ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f digest/$(DEPDIR)/$(am__dirstamp) -rm -f basic/$(DEPDIR)/$(am__dirstamp) - -rm -f ntlm/$(DEPDIR)/$(am__dirstamp) -rm -f digest/$(am__dirstamp) -rm -f basic/$(am__dirstamp) + -rm -f ntlm/$(DEPDIR)/$(am__dirstamp) -rm -f ntlm/$(am__dirstamp) maintainer-clean-generic: diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index 3427be3dfa..5ca93bb87c 100644 --- 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.44 2003/05/05 22:57:37 hno Exp $ +# $Id: Makefile.in,v 1.45 2003/07/23 00:14:52 hno Exp $ # srcdir = @srcdir@ @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ @@ -217,12 +217,12 @@ EXTRA_LIBRARIES = libaufs.a libcoss.a libdiskd.a libnull.a libufs.a noinst_LIBRARIES = @STORE_LIBS@ libaufs_a_SOURCES = aufs/aiops.cc aufs/async_io.cc aufs/store_asyncufs.h \ - aufs/store_dir_aufs.cc aufs/store_io_aufs.cc + aufs/store_io_aufs.cc libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.cc coss/store_dir_coss.cc \ coss/async_io.cc coss/async_io.h -libdiskd_a_SOURCES = diskd/diskd.cc diskd/store_dir_diskd.cc \ +libdiskd_a_SOURCES = diskd/diskd.cc \ diskd/store_diskd.h \ diskd/store_io_diskd.cc @@ -240,7 +240,9 @@ libnull_a_SOURCES = null/store_null.cc libufs_a_SOURCES = ufs/store_dir_ufs.cc ufs/store_io_ufs.cc ufs/store_ufs.h EXTRA_DIST = \ - coss/coss-notes.txt + coss/coss-notes.txt \ + ufs/IOModule.h \ + ufs/StoreFSufs.h INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ @@ -257,7 +259,7 @@ libaufs_a_AR = $(AR) cru libaufs_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp am_libaufs_a_OBJECTS = aufs/aiops.$(OBJEXT) aufs/async_io.$(OBJEXT) \ - aufs/store_dir_aufs.$(OBJEXT) aufs/store_io_aufs.$(OBJEXT) + aufs/store_io_aufs.$(OBJEXT) libaufs_a_OBJECTS = $(am_libaufs_a_OBJECTS) libcoss_a_AR = $(AR) cru libcoss_a_LIBADD = @@ -267,7 +269,7 @@ libcoss_a_OBJECTS = $(am_libcoss_a_OBJECTS) libdiskd_a_AR = $(AR) cru libdiskd_a_LIBADD = am_libdiskd_a_OBJECTS = diskd/diskd.$(OBJEXT) \ - diskd/store_dir_diskd.$(OBJEXT) diskd/store_io_diskd.$(OBJEXT) + diskd/store_io_diskd.$(OBJEXT) libdiskd_a_OBJECTS = $(am_libdiskd_a_OBJECTS) libnull_a_AR = $(AR) cru libnull_a_LIBADD = @@ -292,13 +294,11 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = aufs/$(DEPDIR)/aiops.Po \ @AMDEP_TRUE@ aufs/$(DEPDIR)/async_io.Po \ -@AMDEP_TRUE@ aufs/$(DEPDIR)/store_dir_aufs.Po \ @AMDEP_TRUE@ aufs/$(DEPDIR)/store_io_aufs.Po \ @AMDEP_TRUE@ coss/$(DEPDIR)/async_io.Po \ @AMDEP_TRUE@ coss/$(DEPDIR)/store_dir_coss.Po \ @AMDEP_TRUE@ coss/$(DEPDIR)/store_io_coss.Po \ @AMDEP_TRUE@ diskd/$(DEPDIR)/diskd.Po \ -@AMDEP_TRUE@ diskd/$(DEPDIR)/store_dir_diskd.Po \ @AMDEP_TRUE@ diskd/$(DEPDIR)/store_io_diskd.Po \ @AMDEP_TRUE@ null/$(DEPDIR)/store_null.Po \ @AMDEP_TRUE@ ufs/$(DEPDIR)/store_dir_ufs.Po \ @@ -340,8 +340,6 @@ aufs/aiops.$(OBJEXT): aufs/$(am__dirstamp) \ aufs/$(DEPDIR)/$(am__dirstamp) aufs/async_io.$(OBJEXT): aufs/$(am__dirstamp) \ aufs/$(DEPDIR)/$(am__dirstamp) -aufs/store_dir_aufs.$(OBJEXT): aufs/$(am__dirstamp) \ - aufs/$(DEPDIR)/$(am__dirstamp) aufs/store_io_aufs.$(OBJEXT): aufs/$(am__dirstamp) \ aufs/$(DEPDIR)/$(am__dirstamp) libaufs.a: $(libaufs_a_OBJECTS) $(libaufs_a_DEPENDENCIES) @@ -372,8 +370,6 @@ diskd/$(DEPDIR)/$(am__dirstamp): @: > diskd/$(DEPDIR)/$(am__dirstamp) diskd/diskd.$(OBJEXT): diskd/$(am__dirstamp) \ diskd/$(DEPDIR)/$(am__dirstamp) -diskd/store_dir_diskd.$(OBJEXT): diskd/$(am__dirstamp) \ - diskd/$(DEPDIR)/$(am__dirstamp) diskd/store_io_diskd.$(OBJEXT): diskd/$(am__dirstamp) \ diskd/$(DEPDIR)/$(am__dirstamp) libdiskd.a: $(libdiskd_a_OBJECTS) $(libdiskd_a_DEPENDENCIES) @@ -438,13 +434,11 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core -rm -f aufs/aiops.$(OBJEXT) -rm -f aufs/async_io.$(OBJEXT) - -rm -f aufs/store_dir_aufs.$(OBJEXT) -rm -f aufs/store_io_aufs.$(OBJEXT) -rm -f coss/async_io.$(OBJEXT) -rm -f coss/store_dir_coss.$(OBJEXT) -rm -f coss/store_io_coss.$(OBJEXT) -rm -f diskd/diskd.$(OBJEXT) - -rm -f diskd/store_dir_diskd.$(OBJEXT) -rm -f diskd/store_io_diskd.$(OBJEXT) -rm -f null/store_null.$(OBJEXT) -rm -f ufs/store_dir_ufs.$(OBJEXT) @@ -455,13 +449,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@aufs/$(DEPDIR)/aiops.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@aufs/$(DEPDIR)/async_io.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@aufs/$(DEPDIR)/store_dir_aufs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@aufs/$(DEPDIR)/store_io_aufs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coss/$(DEPDIR)/async_io.Po@am__quote@ @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@diskd/$(DEPDIR)/diskd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@diskd/$(DEPDIR)/store_dir_diskd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@diskd/$(DEPDIR)/store_io_diskd.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@ @@ -536,28 +528,6 @@ aufs/async_io.obj: aufs/async_io.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o aufs/async_io.obj `if test -f 'aufs/async_io.cc'; then $(CYGPATH_W) 'aufs/async_io.cc'; else $(CYGPATH_W) '$(srcdir)/aufs/async_io.cc'; fi` -aufs/store_dir_aufs.o: aufs/store_dir_aufs.cc -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT aufs/store_dir_aufs.o -MD -MP -MF "aufs/$(DEPDIR)/store_dir_aufs.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o aufs/store_dir_aufs.o `test -f 'aufs/store_dir_aufs.cc' || echo '$(srcdir)/'`aufs/store_dir_aufs.cc; \ -@am__fastdepCXX_TRUE@ then mv -f "aufs/$(DEPDIR)/store_dir_aufs.Tpo" "aufs/$(DEPDIR)/store_dir_aufs.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "aufs/$(DEPDIR)/store_dir_aufs.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='aufs/store_dir_aufs.cc' object='aufs/store_dir_aufs.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='aufs/$(DEPDIR)/store_dir_aufs.Po' tmpdepfile='aufs/$(DEPDIR)/store_dir_aufs.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o aufs/store_dir_aufs.o `test -f 'aufs/store_dir_aufs.cc' || echo '$(srcdir)/'`aufs/store_dir_aufs.cc - -aufs/store_dir_aufs.obj: aufs/store_dir_aufs.cc -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT aufs/store_dir_aufs.obj -MD -MP -MF "aufs/$(DEPDIR)/store_dir_aufs.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o aufs/store_dir_aufs.obj `if test -f 'aufs/store_dir_aufs.cc'; then $(CYGPATH_W) 'aufs/store_dir_aufs.cc'; else $(CYGPATH_W) '$(srcdir)/aufs/store_dir_aufs.cc'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "aufs/$(DEPDIR)/store_dir_aufs.Tpo" "aufs/$(DEPDIR)/store_dir_aufs.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "aufs/$(DEPDIR)/store_dir_aufs.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='aufs/store_dir_aufs.cc' object='aufs/store_dir_aufs.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='aufs/$(DEPDIR)/store_dir_aufs.Po' tmpdepfile='aufs/$(DEPDIR)/store_dir_aufs.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o aufs/store_dir_aufs.obj `if test -f 'aufs/store_dir_aufs.cc'; then $(CYGPATH_W) 'aufs/store_dir_aufs.cc'; else $(CYGPATH_W) '$(srcdir)/aufs/store_dir_aufs.cc'; fi` - aufs/store_io_aufs.o: aufs/store_io_aufs.cc @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT aufs/store_io_aufs.o -MD -MP -MF "aufs/$(DEPDIR)/store_io_aufs.Tpo" \ @am__fastdepCXX_TRUE@ -c -o aufs/store_io_aufs.o `test -f 'aufs/store_io_aufs.cc' || echo '$(srcdir)/'`aufs/store_io_aufs.cc; \ @@ -668,28 +638,6 @@ diskd/diskd.obj: diskd/diskd.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskd/diskd.obj `if test -f 'diskd/diskd.cc'; then $(CYGPATH_W) 'diskd/diskd.cc'; else $(CYGPATH_W) '$(srcdir)/diskd/diskd.cc'; fi` -diskd/store_dir_diskd.o: diskd/store_dir_diskd.cc -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskd/store_dir_diskd.o -MD -MP -MF "diskd/$(DEPDIR)/store_dir_diskd.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o diskd/store_dir_diskd.o `test -f 'diskd/store_dir_diskd.cc' || echo '$(srcdir)/'`diskd/store_dir_diskd.cc; \ -@am__fastdepCXX_TRUE@ then mv -f "diskd/$(DEPDIR)/store_dir_diskd.Tpo" "diskd/$(DEPDIR)/store_dir_diskd.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "diskd/$(DEPDIR)/store_dir_diskd.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='diskd/store_dir_diskd.cc' object='diskd/store_dir_diskd.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='diskd/$(DEPDIR)/store_dir_diskd.Po' tmpdepfile='diskd/$(DEPDIR)/store_dir_diskd.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskd/store_dir_diskd.o `test -f 'diskd/store_dir_diskd.cc' || echo '$(srcdir)/'`diskd/store_dir_diskd.cc - -diskd/store_dir_diskd.obj: diskd/store_dir_diskd.cc -@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskd/store_dir_diskd.obj -MD -MP -MF "diskd/$(DEPDIR)/store_dir_diskd.Tpo" \ -@am__fastdepCXX_TRUE@ -c -o diskd/store_dir_diskd.obj `if test -f 'diskd/store_dir_diskd.cc'; then $(CYGPATH_W) 'diskd/store_dir_diskd.cc'; else $(CYGPATH_W) '$(srcdir)/diskd/store_dir_diskd.cc'; fi`; \ -@am__fastdepCXX_TRUE@ then mv -f "diskd/$(DEPDIR)/store_dir_diskd.Tpo" "diskd/$(DEPDIR)/store_dir_diskd.Po"; \ -@am__fastdepCXX_TRUE@ else rm -f "diskd/$(DEPDIR)/store_dir_diskd.Tpo"; exit 1; \ -@am__fastdepCXX_TRUE@ fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='diskd/store_dir_diskd.cc' object='diskd/store_dir_diskd.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='diskd/$(DEPDIR)/store_dir_diskd.Po' tmpdepfile='diskd/$(DEPDIR)/store_dir_diskd.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskd/store_dir_diskd.obj `if test -f 'diskd/store_dir_diskd.cc'; then $(CYGPATH_W) 'diskd/store_dir_diskd.cc'; else $(CYGPATH_W) '$(srcdir)/diskd/store_dir_diskd.cc'; fi` - diskd/store_io_diskd.o: diskd/store_io_diskd.cc @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskd/store_io_diskd.o -MD -MP -MF "diskd/$(DEPDIR)/store_io_diskd.Tpo" \ @am__fastdepCXX_TRUE@ -c -o diskd/store_io_diskd.o `test -f 'diskd/store_io_diskd.cc' || echo '$(srcdir)/'`diskd/store_io_diskd.cc; \ @@ -838,7 +786,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/coss + $(mkinstalldirs) $(distdir)/coss $(distdir)/ufs @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -899,9 +847,9 @@ distclean-generic: -rm -f null/$(DEPDIR)/$(am__dirstamp) -rm -f coss/$(am__dirstamp) -rm -f ufs/$(DEPDIR)/$(am__dirstamp) - -rm -f aufs/$(DEPDIR)/$(am__dirstamp) - -rm -f diskd/$(DEPDIR)/$(am__dirstamp) -rm -f null/$(am__dirstamp) + -rm -f diskd/$(DEPDIR)/$(am__dirstamp) + -rm -f aufs/$(DEPDIR)/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/repl/Makefile.in b/src/repl/Makefile.in index 87dd918592..614ea59711 100644 --- a/src/repl/Makefile.in +++ b/src/repl/Makefile.in @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.41 2003/05/05 22:57:42 hno Exp $ +# $Id: Makefile.in,v 1.42 2003/07/23 00:14:54 hno Exp $ # srcdir = @srcdir@ @@ -147,7 +147,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@ diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in index 3d189a8de8..270dd1819a 100644 --- a/test-suite/Makefile.in +++ b/test-suite/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.38 2003/07/16 05:30:16 robertc Exp $ +# $Id: Makefile.in,v 1.39 2003/07/23 00:14:55 hno Exp $ # srcdir = @srcdir@ @@ -148,7 +148,7 @@ SQUID_CFLAGS = @SQUID_CFLAGS@ SQUID_CXXFLAGS = @SQUID_CXXFLAGS@ SSLLIB = @SSLLIB@ STORE_LIBS = @STORE_LIBS@ -STORE_MODULES = @STORE_MODULES@ +STORE_LINKOBJS = @STORE_LINKOBJS@ STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ STORE_OBJS = @STORE_OBJS@ STORE_PROGRAMS = @STORE_PROGRAMS@