--------------------- PatchSet 1561 Date: 2005/08/21 18:41:05 Author: serassio Branch: nt Tag: (none) Log: Configure/Makefile rearrangement for the latest MinGW release Members: configure.in:1.26.2.56->1.26.2.57 helpers/basic_auth/LDAP/Makefile.am:1.1.2.3->1.1.2.4 helpers/basic_auth/NCSA/Makefile.am:1.1.2.4->1.1.2.5 helpers/basic_auth/win32_locallogon/Makefile.am:1.2.18.1->1.2.18.2 helpers/digest_auth/password/Makefile.am:1.1.2.3->1.1.2.4 helpers/external_acl/ip_user/Makefile.am:1.1.2.2->1.1.2.3 helpers/external_acl/ldap_group/Makefile.am:1.2.4.4->1.2.4.5 helpers/external_acl/win32_group/Makefile.am:1.2.18.2->1.2.18.3 helpers/ntlm_auth/NTLMSSP-WIN32/Makefile.am:1.2.18.2->1.2.18.3 helpers/ntlm_auth/fakeauth/Makefile.am:1.1.2.1->1.1.2.2 lib/Makefile.am:1.6.2.10->1.6.2.11 snmplib/Makefile.am:1.3.16.3->1.3.16.4 src/Makefile.am:1.26.2.43->1.26.2.44 src/auth/Makefile.am:1.3.16.4->1.3.16.5 src/fs/Makefile.am:1.5.2.11->1.5.2.12 src/repl/Makefile.am:1.4.16.4->1.4.16.5 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.26.2.56 retrieving revision 1.26.2.57 diff -u -r1.26.2.56 -r1.26.2.57 --- squid3/configure.in 15 Aug 2005 19:51:02 -0000 1.26.2.56 +++ squid3/configure.in 21 Aug 2005 18:41:05 -0000 1.26.2.57 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.26.2.56 2005/08/15 19:51:02 serassio Exp $ +dnl $Id: configure.in,v 1.26.2.57 2005/08/21 18:41:05 serassio Exp $ dnl dnl dnl @@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 3.0-PRE3-NT-CVS) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.26.2.56 $)dnl +AC_REVISION($Revision: 1.26.2.57 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1683,13 +1683,6 @@ AC_HEADER_DIRENT AC_HEADER_STDC -dnl Override crypt.h detect on MinGW because is provided with source code -case "$host_os" in -mingw|mingw32) - ac_cv_header_crypt_h='yes' - ;; -esac - AC_CHECK_HEADERS( \ arpa/inet.h \ arpa/nameser.h \ @@ -2259,10 +2252,9 @@ esac fi -dnl Override crypt() and statfs() detect on MinGW becasue are emulated in source code +dnl Override statfs() detect on MinGW becasue is emulated in source code case "$host_os" in mingw|mingw32) - ac_cv_func_crypt='yes' ac_cv_func_statfs='yes' ;; esac Index: squid3/helpers/basic_auth/LDAP/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/LDAP/Makefile.am,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/helpers/basic_auth/LDAP/Makefile.am 20 Mar 2005 08:41:46 -0000 1.1.2.3 +++ squid3/helpers/basic_auth/LDAP/Makefile.am 21 Aug 2005 18:41:05 -0000 1.1.2.4 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.1.2.3 2005/03/20 08:41:46 serassio Exp $ +# $Id: Makefile.am,v 1.1.2.4 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -12,9 +12,4 @@ squid_ldap_auth_SOURCES = squid_ldap_auth.c LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(XTRA_LIBS) -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -else INCLUDES = -I$(top_srcdir)/include -endif Index: squid3/helpers/basic_auth/NCSA/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/NCSA/Makefile.am,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/helpers/basic_auth/NCSA/Makefile.am 1 Jun 2003 10:34:14 -0000 1.1.2.4 +++ squid3/helpers/basic_auth/NCSA/Makefile.am 21 Aug 2005 18:41:05 -0000 1.1.2.5 @@ -1,18 +1,12 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1.2.4 2003/06/01 10:34:14 serassio Exp $ +# $Id: Makefile.am,v 1.1.2.5 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # libexec_PROGRAMS = ncsa_auth -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include -ENCRYPTSRC = $(top_srcdir)/port/win32/src/encrypt.c -else -INCLUDES = -I$(top_srcdir)/include -ENCRYPTSRC = -endif -ncsa_auth_SOURCES = ncsa_auth.c crypt_md5.c crypt_md5.h $(ENCRYPTSRC) +ncsa_auth_SOURCES = ncsa_auth.c crypt_md5.c crypt_md5.h LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) +INCLUDES = -I$(top_srcdir)/include Index: squid3/helpers/basic_auth/win32_locallogon/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/basic_auth/win32_locallogon/Attic/Makefile.am,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/helpers/basic_auth/win32_locallogon/Makefile.am 25 Feb 2003 02:48:20 -0000 1.2.18.1 +++ squid3/helpers/basic_auth/win32_locallogon/Makefile.am 21 Aug 2005 18:41:05 -0000 1.2.18.2 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.2.18.1 2003/02/25 02:48:20 hno Exp $ +# $Id: Makefile.am,v 1.2.18.2 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -14,11 +14,6 @@ LDADD = -L$(top_builddir)/lib -lnetapi32 -ladvapi32 -lsspwin32 \ -lmiscutil $(XTRA_LIBS) -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -else INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -endif EXTRA_DIST = README.txt Index: squid3/helpers/digest_auth/password/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/digest_auth/password/Makefile.am,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/helpers/digest_auth/password/Makefile.am 22 May 2005 08:41:10 -0000 1.1.2.3 +++ squid3/helpers/digest_auth/password/Makefile.am 21 Aug 2005 18:41:05 -0000 1.1.2.4 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1.2.3 2005/05/22 08:41:10 serassio Exp $ +# $Id: Makefile.am,v 1.1.2.4 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -13,12 +13,7 @@ text_backend.h \ ldap_backend.c \ ldap_backend.h -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/ -else INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -endif LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) Index: squid3/helpers/external_acl/ip_user/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/external_acl/ip_user/Makefile.am,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/helpers/external_acl/ip_user/Makefile.am 15 Aug 2004 14:26:36 -0000 1.1.2.2 +++ squid3/helpers/external_acl/ip_user/Makefile.am 21 Aug 2005 18:41:05 -0000 1.1.2.3 @@ -1,7 +1,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.am,v 1.1.2.2 2004/08/15 14:26:36 serassio Exp $ +# $Id: Makefile.am,v 1.1.2.3 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -25,11 +25,4 @@ # sysconf_DATA = LDADD = -L$(top_builddir)/lib -lmiscutil @XTRA_LIBS@ -if ENABLE_MINGW32SPECIFIC - -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -else - INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include -endif Index: squid3/helpers/external_acl/ldap_group/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/external_acl/ldap_group/Makefile.am,v retrieving revision 1.2.4.4 retrieving revision 1.2.4.5 diff -u -r1.2.4.4 -r1.2.4.5 --- squid3/helpers/external_acl/ldap_group/Makefile.am 20 Mar 2005 08:41:46 -0000 1.2.4.4 +++ squid3/helpers/external_acl/ldap_group/Makefile.am 21 Aug 2005 18:41:05 -0000 1.2.4.5 @@ -1,7 +1,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.am,v 1.2.4.4 2005/03/20 08:41:46 serassio Exp $ +# $Id: Makefile.am,v 1.2.4.5 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -12,9 +12,4 @@ squid_ldap_group_SOURCES = squid_ldap_group.c LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) @XTRA_LIBS@ -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -else INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include -endif Index: squid3/helpers/external_acl/win32_group/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/external_acl/win32_group/Attic/Makefile.am,v retrieving revision 1.2.18.2 retrieving revision 1.2.18.3 diff -u -r1.2.18.2 -r1.2.18.3 --- squid3/helpers/external_acl/win32_group/Makefile.am 3 Oct 2004 11:59:33 -0000 1.2.18.2 +++ squid3/helpers/external_acl/win32_group/Makefile.am 21 Aug 2005 18:41:05 -0000 1.2.18.3 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.2.18.2 2004/10/03 11:59:33 serassio Exp $ +# $Id: Makefile.am,v 1.2.18.3 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -11,12 +11,7 @@ win32_check_group_SOURCES = win32_check_group.c win32_check_group.h -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -else INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -endif LDADD = -L$(top_builddir)/lib -lmiscutil -lnetapi32 -ladvapi32 \ -lntdll $(XTRA_LIBS) Index: squid3/helpers/ntlm_auth/NTLMSSP-WIN32/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/NTLMSSP-WIN32/Attic/Makefile.am,v retrieving revision 1.2.18.2 retrieving revision 1.2.18.3 diff -u -r1.2.18.2 -r1.2.18.3 --- squid3/helpers/ntlm_auth/NTLMSSP-WIN32/Makefile.am 11 Oct 2004 19:24:09 -0000 1.2.18.2 +++ squid3/helpers/ntlm_auth/NTLMSSP-WIN32/Makefile.am 21 Aug 2005 18:41:05 -0000 1.2.18.3 @@ -1,19 +1,14 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.2.18.2 2004/10/11 19:24:09 serassio Exp $ +# $Id: Makefile.am,v 1.2.18.3 2005/08/21 18:41:05 serassio Exp $ # libexec_PROGRAMS = win32_ntlm_auth win32_ntlm_auth_SOURCES = libntlmssp.c ntlm_auth.c ntlm.h -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -else INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -endif LDADD = -L$(top_builddir)/lib -lntlmauth -lsspwin32 -lnetapi32 \ -ladvapi32 -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) Index: squid3/helpers/ntlm_auth/fakeauth/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/helpers/ntlm_auth/fakeauth/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/helpers/ntlm_auth/fakeauth/Makefile.am 25 Feb 2003 02:48:29 -0000 1.1.2.1 +++ squid3/helpers/ntlm_auth/fakeauth/Makefile.am 21 Aug 2005 18:41:05 -0000 1.1.2.2 @@ -1,18 +1,13 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1.2.1 2003/02/25 02:48:29 hno Exp $ +# $Id: Makefile.am,v 1.1.2.2 2005/08/21 18:41:05 serassio Exp $ # # Uncomment and customize the following to suit your needs: # libexec_PROGRAMS = fakeauth_auth fakeauth_auth_SOURCES = fakeauth_auth.c ntlm.h -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -else INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -endif LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) Index: squid3/lib/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/Makefile.am,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -u -r1.6.2.10 -r1.6.2.11 --- squid3/lib/Makefile.am 24 Dec 2004 08:40:05 -0000 1.6.2.10 +++ squid3/lib/Makefile.am 21 Aug 2005 18:41:06 -0000 1.6.2.11 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.6.2.10 2004/12/24 08:40:05 serassio Exp $ +# $Id: Makefile.am,v 1.6.2.11 2005/08/21 18:41:06 serassio Exp $ # DIST_SUBDIRS = libTrie cppunit-1.10.0 @@ -28,6 +28,7 @@ else MD5SOURCE= endif + if ENABLE_WIN32SPECIFIC LIBSSPWIN32=libsspwin32.a else @@ -36,11 +37,8 @@ if ENABLE_MINGW32SPECIFIC WIN32SRC = win32lib.c -INCLUDES = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src else WIN32SRC= -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@ endif EXTRA_LIBRARIES = \ @@ -96,6 +94,7 @@ libsspwin32_a_SOURCES = \ sspwin32.c +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include @SQUID_CPPUNIT_INC@ ##FIXME - set these in configure.in and reuse TESTS=$(check_PROGRAMS) Index: squid3/snmplib/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/snmplib/Makefile.am,v retrieving revision 1.3.16.3 retrieving revision 1.3.16.4 diff -u -r1.3.16.3 -r1.3.16.4 --- squid3/snmplib/Makefile.am 28 Feb 2004 12:37:37 -0000 1.3.16.3 +++ squid3/snmplib/Makefile.am 21 Aug 2005 18:41:06 -0000 1.3.16.4 @@ -10,12 +10,7 @@ mib.c snmp_api_error.c \ snmp_msg.c \ snmp_pdu.c snmplib_debug.c -if ENABLE_MINGW32SPECIFIC -INCLUDES = -I$(top_srcdir)/port/win32/include \ - -I$(top_builddir)/include -I$(top_srcdir)/include -else INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -endif VERSION = 3.4 DEFS = -DSQUID_SNMP=1 Index: squid3/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v retrieving revision 1.26.2.43 retrieving revision 1.26.2.44 diff -u -r1.26.2.43 -r1.26.2.44 --- squid3/src/Makefile.am 24 Apr 2005 08:00:42 -0000 1.26.2.43 +++ squid3/src/Makefile.am 21 Aug 2005 18:41:06 -0000 1.26.2.44 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.26.2.43 2005/04/24 08:00:42 serassio Exp $ +# $Id: Makefile.am,v 1.26.2.44 2005/08/21 18:41:06 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -156,10 +156,8 @@ endif if ENABLE_MINGW32SPECIFIC -MINGWINCLUDES = -I$(top_srcdir)/port/win32/include MINGWEXLIB = -lmingwex else -MINGWINCLUDES = MINGWEXLIB = endif @@ -171,7 +169,7 @@ EXTRA_LIBRARIES = libAIO.a libWinAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a libWinDiskThreads.a noinst_LIBRARIES = @DISK_LIBS@ -INCLUDES = $(MINGWINCLUDES) -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include +INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include INCLUDES += @SQUID_CPPUNIT_INC@ EXTRA_PROGRAMS = \ Index: squid3/src/auth/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/auth/Makefile.am,v retrieving revision 1.3.16.4 retrieving revision 1.3.16.5 diff -u -r1.3.16.4 -r1.3.16.5 --- squid3/src/auth/Makefile.am 21 Aug 2005 07:18:05 -0000 1.3.16.4 +++ squid3/src/auth/Makefile.am 21 Aug 2005 18:41:06 -0000 1.3.16.5 @@ -1,6 +1,6 @@ # Makefile for authentication modules in the Squid Object Cache server # -# $Id: Makefile.am,v 1.3.16.4 2005/08/21 07:18:05 serassio Exp $ +# $Id: Makefile.am,v 1.3.16.5 2005/08/21 18:41:06 serassio Exp $ # AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = @SQUID_CFLAGS@ @@ -16,10 +16,5 @@ libdigest_a_SOURCES = digest/auth_digest.cc digest/auth_digest.h libntlm_a_SOURCES = ntlm/auth_ntlm.cc ntlm/auth_ntlm.h -if ENABLE_WIN32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -else INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src -endif Index: squid3/src/fs/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/Makefile.am,v retrieving revision 1.5.2.11 retrieving revision 1.5.2.12 diff -u -r1.5.2.11 -r1.5.2.12 --- squid3/src/fs/Makefile.am 21 Aug 2005 07:18:05 -0000 1.5.2.11 +++ squid3/src/fs/Makefile.am 21 Aug 2005 18:41:06 -0000 1.5.2.12 @@ -1,6 +1,6 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.am,v 1.5.2.11 2005/08/21 07:18:05 serassio Exp $ +# $Id: Makefile.am,v 1.5.2.12 2005/08/21 18:41:06 serassio Exp $ # AUTOMAKE_OPTIONS = subdir-objects @@ -12,14 +12,6 @@ EXTRA_LIBRARIES = libcoss.a libnull.a libufs.a noinst_LIBRARIES = @STORE_LIBS@ -if ENABLE_WIN32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/src -else -INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/src -endif - libcoss_a_SOURCES = \ coss/store_coss.h \ coss/store_io_coss.cc \ @@ -39,6 +31,8 @@ ufs/StoreFSufs.h \ null/StoreFSnull.h +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(top_srcdir)/src ## targets below to emulate distributed makefiles coss/all: libcoss.a Index: squid3/src/repl/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/repl/Makefile.am,v retrieving revision 1.4.16.4 retrieving revision 1.4.16.5 diff -u -r1.4.16.4 -r1.4.16.5 --- squid3/src/repl/Makefile.am 21 Aug 2005 07:18:05 -0000 1.4.16.4 +++ squid3/src/repl/Makefile.am 21 Aug 2005 18:41:06 -0000 1.4.16.5 @@ -1,6 +1,6 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.am,v 1.4.16.4 2005/08/21 07:18:05 serassio Exp $ +# $Id: Makefile.am,v 1.4.16.5 2005/08/21 18:41:06 serassio Exp $ # AUTOMAKE_OPTIONS = subdir-objects @@ -15,11 +15,6 @@ liblru_a_SOURCES = lru/store_repl_lru.cc libheap_a_SOURCES = heap/store_heap_replacement.h heap/store_heap_replacement.cc heap/store_repl_heap.cc -if ENABLE_WIN32SPECIFIC -INCLUDES = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -else INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src -endif