You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/03/22 06:57:01 UTC
cvs commit: httpd-2.0/support ab.mak htdigest.mak htpasswd.mak logresolve.mak rotatelogs.mak
wrowe 01/03/21 21:57:01
Modified: . Apache.mak libhttpd.mak
server gen_test_char.mak gen_uri_delims.mak
modules/aaa mod_auth_anon.mak mod_auth_dbm.mak
mod_auth_digest.mak
modules/cache mod_file_cache.mak
modules/dav/fs mod_dav_fs.mak
modules/dav/main mod_dav.mak
modules/generators mod_info.mak mod_status.mak
modules/mappers mod_rewrite.mak mod_speling.mak
modules/metadata mod_cern_meta.mak mod_expires.mak
mod_headers.mak mod_usertrack.mak
support ab.mak htdigest.mak htpasswd.mak logresolve.mak
rotatelogs.mak
Log:
This should wrap this freshen up
Revision Changes Path
1.4 +38 -38 httpd-2.0/Apache.mak
Index: Apache.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache.mak 2001/02/25 22:20:22 1.3
+++ Apache.mak 2001/03/22 05:56:37 1.4
@@ -39,14 +39,14 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
- "libapr - Win32 Release" "$(OUTDIR)\Apache.exe"
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
+ "libaprutil - Win32 Release" "$(OUTDIR)\Apache.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
+ "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -132,14 +132,14 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
- "libapr - Win32 Debug" "$(OUTDIR)\Apache.exe"
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
+ "libaprutil - Win32 Debug" "$(OUTDIR)\Apache.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
+ "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -154,9 +154,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./os/win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "./os/win32" /I\
"./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D\
- "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c
+ "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -219,34 +219,6 @@
!IF "$(CFG)" == "Apache - Win32 Release"
-"libapr - Win32 Release" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\.."
-
-"libapr - Win32 ReleaseCLEAN" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\.."
-
-!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\.."
-
-"libapr - Win32 DebugCLEAN" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\.."
-
-!ENDIF
-
-!IF "$(CFG)" == "Apache - Win32 Release"
-
"libaprutil - Win32 Release" :
cd ".\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
@@ -299,6 +271,34 @@
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd "."
+
+!ENDIF
+
+!IF "$(CFG)" == "Apache - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\.."
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\.."
+
+!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\.."
+
+"libapr - Win32 DebugCLEAN" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\.."
!ENDIF
1.8 +44 -44 httpd-2.0/libhttpd.mak
Index: libhttpd.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/libhttpd.mak,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libhttpd.mak 2001/03/08 16:11:19 1.7
+++ libhttpd.mak 2001/03/22 05:56:37 1.8
@@ -41,16 +41,16 @@
!ELSE
-ALL : "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release"\
- "pcreposix - Win32 Release" "pcre - Win32 Release" "libaprutil - Win32 Release"\
- "libapr - Win32 Release" "$(OUTDIR)\libhttpd.dll"
+ALL : "libapr - Win32 Release" "gen_uri_delims - Win32 Release"\
+ "gen_test_char - Win32 Release" "pcreposix - Win32 Release"\
+ "pcre - Win32 Release" "libaprutil - Win32 Release" "$(OUTDIR)\libhttpd.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "pcre - Win32 ReleaseCLEAN" "pcreposix - Win32 ReleaseCLEAN"\
- "gen_test_char - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN"
+CLEAN :"libaprutil - Win32 ReleaseCLEAN" "pcre - Win32 ReleaseCLEAN"\
+ "pcreposix - Win32 ReleaseCLEAN" "gen_test_char - Win32 ReleaseCLEAN"\
+ "gen_uri_delims - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -230,16 +230,16 @@
!ELSE
-ALL : "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug"\
- "pcreposix - Win32 Debug" "pcre - Win32 Debug" "libaprutil - Win32 Debug"\
- "libapr - Win32 Debug" "$(OUTDIR)\libhttpd.dll"
+ALL : "libapr - Win32 Debug" "gen_uri_delims - Win32 Debug"\
+ "gen_test_char - Win32 Debug" "pcreposix - Win32 Debug" "pcre - Win32 Debug"\
+ "libaprutil - Win32 Debug" "$(OUTDIR)\libhttpd.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "pcre - Win32 DebugCLEAN" "pcreposix - Win32 DebugCLEAN"\
- "gen_test_char - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN"
+CLEAN :"libaprutil - Win32 DebugCLEAN" "pcre - Win32 DebugCLEAN"\
+ "pcreposix - Win32 DebugCLEAN" "gen_test_char - Win32 DebugCLEAN"\
+ "gen_uri_delims - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -300,10 +300,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\srclib\apr\include"\
- /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite"\
- /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I ".\include" /I ".\srclib\apr\include" /I\
+ ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I\
+ "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
+ "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -2497,34 +2497,6 @@
!IF "$(CFG)" == "libhttpd - Win32 Release"
-"libapr - Win32 Release" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\.."
-
-"libapr - Win32 ReleaseCLEAN" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\.."
-
-!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\.."
-
-"libapr - Win32 DebugCLEAN" :
- cd ".\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\.."
-
-!ENDIF
-
-!IF "$(CFG)" == "libhttpd - Win32 Release"
-
"libaprutil - Win32 Release" :
cd ".\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
@@ -2665,6 +2637,34 @@
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
CFG="gen_uri_delims - Win32 Debug" RECURSE=1
cd ".."
+
+!ENDIF
+
+!IF "$(CFG)" == "libhttpd - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\.."
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\.."
+
+!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\.."
+
+"libapr - Win32 DebugCLEAN" :
+ cd ".\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\.."
!ENDIF
1.4 +11 -12 httpd-2.0/server/gen_test_char.mak
Index: gen_test_char.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/server/gen_test_char.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gen_test_char.mak 2001/02/25 22:20:24 1.3
+++ gen_test_char.mak 2001/03/22 05:56:39 1.4
@@ -147,10 +147,9 @@
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I\
- "..\srclib\apr\include" /I "..\srclib\apr-util\include" /I "..\os\win32" /D\
- "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\gen_test_char" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\include" /I "..\srclib\apr\include" /I\
+ "..\srclib\apr-util\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D\
+ "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -212,12 +211,12 @@
!IF "$(CFG)" == "gen_test_char - Win32 Release"
"apr - Win32 Release" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\..\server"
"apr - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\..\server"
@@ -225,12 +224,12 @@
!ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug"
"apr - Win32 Debug" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\..\server"
"apr - Win32 DebugCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
cd "..\..\server"
@@ -240,12 +239,12 @@
!IF "$(CFG)" == "gen_test_char - Win32 Release"
"aprutil - Win32 Release" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release"
cd "..\..\server"
"aprutil - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
RECURSE=1
cd "..\..\server"
@@ -253,12 +252,12 @@
!ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug"
"aprutil - Win32 Debug" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"
cd "..\..\server"
"aprutil - Win32 DebugCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
RECURSE=1
cd "..\..\server"
1.3 +2 -2 httpd-2.0/server/gen_uri_delims.mak
Index: gen_uri_delims.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/server/gen_uri_delims.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gen_uri_delims.mak 2001/02/25 02:53:29 1.2
+++ gen_uri_delims.mak 2001/03/22 05:56:39 1.3
@@ -136,8 +136,8 @@
if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\
- "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\
+ "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
1.4 +38 -38 httpd-2.0/modules/aaa/mod_auth_anon.mak
Index: mod_auth_anon.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_anon.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_auth_anon.mak 2001/02/25 22:20:22 1.3
+++ mod_auth_anon.mak 2001/03/22 05:56:41 1.4
@@ -43,13 +43,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_auth_anon.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -137,13 +137,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_auth_anon.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -159,9 +159,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -226,41 +226,13 @@
!IF "$(CFG)" == "mod_auth_anon - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\aaa"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\aaa"
-
-!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\aaa"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\aaa"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_auth_anon - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\aaa"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\aaa"
@@ -268,15 +240,43 @@
!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\aaa"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\aaa"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_auth_anon - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\aaa"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\aaa"
+
+!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\aaa"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\aaa"
!ENDIF
1.4 +46 -46 httpd-2.0/modules/aaa/mod_auth_dbm.mak
Index: mod_auth_dbm.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_auth_dbm.mak 2001/02/25 22:20:22 1.3
+++ mod_auth_dbm.mak 2001/03/22 05:56:41 1.4
@@ -43,14 +43,14 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
- "libapr - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so"
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
+ "libaprutil - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
+ "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -140,14 +140,14 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
- "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so"
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
+ "libaprutil - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
+ "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -163,10 +163,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I\
"..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
- "AP_AUTH_DBM_USE_APR" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c
+ "AP_AUTH_DBM_USE_APR" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -232,42 +232,14 @@
!IF "$(CFG)" == "mod_auth_dbm - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\aaa"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\aaa"
-
-!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\aaa"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\aaa"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_auth_dbm - Win32 Release"
-
"libaprutil - Win32 Release" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
cd "..\..\modules\aaa"
"libaprutil - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Release" RECURSE=1
cd "..\..\modules\aaa"
@@ -275,12 +247,12 @@
!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug"
"libaprutil - Win32 Debug" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug"
cd "..\..\modules\aaa"
"libaprutil - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Debug" RECURSE=1
cd "..\..\modules\aaa"
@@ -290,12 +262,12 @@
!IF "$(CFG)" == "mod_auth_dbm - Win32 Release"
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\aaa"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\aaa"
@@ -303,15 +275,43 @@
!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\aaa"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\aaa"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_auth_dbm - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\aaa"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\aaa"
+
+!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\aaa"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\aaa"
!ENDIF
1.5 +47 -46 httpd-2.0/modules/aaa/mod_auth_digest.mak
Index: mod_auth_digest.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_auth_digest.mak 2001/03/08 05:38:17 1.4
+++ mod_auth_digest.mak 2001/03/22 05:56:41 1.5
@@ -43,14 +43,14 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
- "libapr - Win32 Release" "$(OUTDIR)\mod_auth_digest.so"
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
+ "libaprutil - Win32 Release" "$(OUTDIR)\mod_auth_digest.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
+ "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -139,14 +139,14 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
- "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_digest.so"
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
+ "libaprutil - Win32 Debug" "$(OUTDIR)\mod_auth_digest.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
+ "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -162,9 +162,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest" /FD /ZI\
+ /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -230,42 +231,14 @@
!IF "$(CFG)" == "mod_auth_digest - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\aaa"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\aaa"
-
-!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\aaa"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\aaa"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_auth_digest - Win32 Release"
-
"libaprutil - Win32 Release" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
cd "..\..\modules\aaa"
"libaprutil - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Release" RECURSE=1
cd "..\..\modules\aaa"
@@ -273,12 +246,12 @@
!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug"
"libaprutil - Win32 Debug" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug"
cd "..\..\modules\aaa"
"libaprutil - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Debug" RECURSE=1
cd "..\..\modules\aaa"
@@ -288,12 +261,12 @@
!IF "$(CFG)" == "mod_auth_digest - Win32 Release"
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\aaa"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\aaa"
@@ -301,15 +274,43 @@
!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\aaa"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\aaa"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_auth_digest - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\aaa"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\aaa"
+
+!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\aaa"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\aaa"
!ENDIF
1.4 +39 -38 httpd-2.0/modules/cache/mod_file_cache.mak
Index: mod_file_cache.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_file_cache.mak 2001/02/25 22:20:22 1.3
+++ mod_file_cache.mak 2001/03/22 05:56:43 1.4
@@ -43,13 +43,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_file_cache.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -137,13 +137,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_file_cache.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -159,9 +159,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_file_cache" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_file_cache" /FD /ZI /c\
+
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -226,41 +227,13 @@
!IF "$(CFG)" == "mod_file_cache - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\cache"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\cache"
-
-!ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\cache"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\cache"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_file_cache - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\cache"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\cache"
@@ -268,15 +241,43 @@
!ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\cache"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\cache"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_file_cache - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\cache"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\cache"
+
+!ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\cache"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\cache"
!ENDIF
1.4 +52 -51 httpd-2.0/modules/dav/fs/mod_dav_fs.mak
Index: mod_dav_fs.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/mod_dav_fs.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_dav_fs.mak 2001/02/25 22:20:23 1.3
+++ mod_dav_fs.mak 2001/03/22 05:56:45 1.4
@@ -42,14 +42,15 @@
!ELSE
-ALL : "mod_dav - Win32 Release" "libhttpd - Win32 Release"\
- "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_dav_fs.so"
+ALL : "libapr - Win32 Release" "mod_dav - Win32 Release"\
+ "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
+ "$(OUTDIR)\mod_dav_fs.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "libhttpd - Win32 ReleaseCLEAN" "mod_dav - Win32 ReleaseCLEAN"
+CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
+ "mod_dav - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -147,14 +148,14 @@
!ELSE
-ALL : "mod_dav - Win32 Debug" "libhttpd - Win32 Debug"\
- "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_dav_fs.so"
+ALL : "libapr - Win32 Debug" "mod_dav - Win32 Debug" "libhttpd - Win32 Debug"\
+ "libaprutil - Win32 Debug" "$(OUTDIR)\mod_dav_fs.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "libhttpd - Win32 DebugCLEAN" "mod_dav - Win32 DebugCLEAN"
+CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
+ "mod_dav - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -173,11 +174,11 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\main" /I "..\..\..\srclib\aputil"\
- /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\main" /I "..\..\..\srclib\aputil" /I\
+ "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I\
"..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I\
"..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav_fs" /FD /c
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav_fs" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -417,42 +418,14 @@
!IF "$(CFG)" == "mod_dav_fs - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\dav\fs"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\dav\fs"
-
-!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\dav\fs"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\dav\fs"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_dav_fs - Win32 Release"
-
"libaprutil - Win32 Release" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
cd "..\..\modules\dav\fs"
"libaprutil - Win32 ReleaseCLEAN" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Release" RECURSE=1
cd "..\..\modules\dav\fs"
@@ -460,12 +433,12 @@
!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug"
"libaprutil - Win32 Debug" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug"
cd "..\..\modules\dav\fs"
"libaprutil - Win32 DebugCLEAN" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Debug" RECURSE=1
cd "..\..\modules\dav\fs"
@@ -475,12 +448,12 @@
!IF "$(CFG)" == "mod_dav_fs - Win32 Release"
"libhttpd - Win32 Release" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\dav\fs"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\dav\fs"
@@ -488,12 +461,12 @@
!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\dav\fs"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\dav\fs"
@@ -503,12 +476,12 @@
!IF "$(CFG)" == "mod_dav_fs - Win32 Release"
"mod_dav - Win32 Release" :
- cd "..\../..\modules\dav\main"
+ cd "\clean\httpd-2.0\modules\dav\main"
$(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release"
cd "..\fs"
"mod_dav - Win32 ReleaseCLEAN" :
- cd "..\../..\modules\dav\main"
+ cd "\clean\httpd-2.0\modules\dav\main"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release"\
RECURSE=1
cd "..\fs"
@@ -516,15 +489,43 @@
!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug"
"mod_dav - Win32 Debug" :
- cd "..\../..\modules\dav\main"
+ cd "\clean\httpd-2.0\modules\dav\main"
$(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug"
cd "..\fs"
"mod_dav - Win32 DebugCLEAN" :
- cd "..\../..\modules\dav\main"
+ cd "\clean\httpd-2.0\modules\dav\main"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug"\
RECURSE=1
cd "..\fs"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_dav_fs - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\dav\fs"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\dav\fs"
+
+!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\dav\fs"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\dav\fs"
!ENDIF
1.5 +46 -46 httpd-2.0/modules/dav/main/mod_dav.mak
Index: mod_dav.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_dav.mak 2001/03/08 05:38:17 1.4
+++ mod_dav.mak 2001/03/22 05:56:47 1.5
@@ -41,14 +41,14 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
- "libapr - Win32 Release" "$(OUTDIR)\mod_dav.so"
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
+ "libaprutil - Win32 Release" "$(OUTDIR)\mod_dav.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
- "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
+ "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -150,14 +150,14 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
- "libapr - Win32 Debug" "$(OUTDIR)\mod_dav.so"
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
+ "libaprutil - Win32 Debug" "$(OUTDIR)\mod_dav.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
- "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
+ "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -180,11 +180,11 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\srclib\aputil" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\..\srclib\aputil" /I\
"..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I\
"..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I\
"..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
- /D "DAV_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav" /FD /c
+ /D "DAV_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -571,42 +571,14 @@
!IF "$(CFG)" == "mod_dav - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\dav\main"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\dav\main"
-
-!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\dav\main"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\../..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\dav\main"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_dav - Win32 Release"
-
"libaprutil - Win32 Release" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
cd "..\..\modules\dav\main"
"libaprutil - Win32 ReleaseCLEAN" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Release" RECURSE=1
cd "..\..\modules\dav\main"
@@ -614,12 +586,12 @@
!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug"
"libaprutil - Win32 Debug" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug"
cd "..\..\modules\dav\main"
"libaprutil - Win32 DebugCLEAN" :
- cd "..\../..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
CFG="libaprutil - Win32 Debug" RECURSE=1
cd "..\..\modules\dav\main"
@@ -629,12 +601,12 @@
!IF "$(CFG)" == "mod_dav - Win32 Release"
"libhttpd - Win32 Release" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\dav\main"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\dav\main"
@@ -642,15 +614,43 @@
!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\dav\main"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\../.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\dav\main"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_dav - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\dav\main"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\dav\main"
+
+!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\dav\main"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\dav\main"
!ENDIF
1.5 +38 -39 httpd-2.0/modules/generators/mod_info.mak
Index: mod_info.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_info.mak 2001/03/08 05:38:17 1.4
+++ mod_info.mak 2001/03/22 05:56:49 1.5
@@ -41,13 +41,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_info.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -134,18 +134,17 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_info.so"
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug" "$(OUTDIR)\mod_info.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
-@erase "$(INTDIR)\mod_info.idb"
-@erase "$(INTDIR)\mod_info.obj"
- -@erase "$(INTDIR)\mod_info.pdb"
-@erase "$(OUTDIR)\mod_info.exp"
-@erase "$(OUTDIR)\mod_info.lib"
-@erase "$(OUTDIR)\mod_info.so"
@@ -154,9 +153,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -220,41 +219,13 @@
!IF "$(CFG)" == "mod_info - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\generators"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\generators"
-
-!ELSEIF "$(CFG)" == "mod_info - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\generators"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\generators"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_info - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\generators"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\generators"
@@ -262,15 +233,43 @@
!ELSEIF "$(CFG)" == "mod_info - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\generators"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\generators"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_info - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\generators"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\generators"
+
+!ELSEIF "$(CFG)" == "mod_info - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\generators"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\generators"
!ENDIF
1.5 +38 -38 httpd-2.0/modules/generators/mod_status.mak
Index: mod_status.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_status.mak 2001/03/08 05:38:17 1.4
+++ mod_status.mak 2001/03/22 05:56:50 1.5
@@ -42,13 +42,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_status.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -136,12 +136,12 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_status.so"
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug" "$(OUTDIR)\mod_status.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -157,10 +157,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I\
"../../server/mpm/winnt" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\mod_status" /FD /c
+ /Fd"$(INTDIR)\mod_status" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -224,41 +224,13 @@
!IF "$(CFG)" == "mod_status - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\generators"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\generators"
-
-!ELSEIF "$(CFG)" == "mod_status - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\generators"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\generators"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_status - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\generators"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\generators"
@@ -266,15 +238,43 @@
!ELSEIF "$(CFG)" == "mod_status - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\generators"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\generators"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_status - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\generators"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\generators"
+
+!ELSEIF "$(CFG)" == "mod_status - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\generators"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\generators"
!ENDIF
1.4 +38 -38 httpd-2.0/modules/mappers/mod_rewrite.mak
Index: mod_rewrite.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_rewrite.mak 2001/02/25 22:20:23 1.3
+++ mod_rewrite.mak 2001/03/22 05:56:52 1.4
@@ -42,13 +42,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_rewrite.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -136,13 +136,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_rewrite.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -158,10 +158,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
"WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\mod_rewrite" /FD /c
+ /Fd"$(INTDIR)\mod_rewrite" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -226,41 +226,13 @@
!IF "$(CFG)" == "mod_rewrite - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\mappers"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\mappers"
-
-!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\mappers"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\mappers"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_rewrite - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\mappers"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\mappers"
@@ -268,15 +240,43 @@
!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\mappers"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\mappers"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_rewrite - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\mappers"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\mappers"
+
+!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\mappers"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\mappers"
!ENDIF
1.4 +38 -38 httpd-2.0/modules/mappers/mod_speling.mak
Index: mod_speling.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_speling.mak 2001/02/25 22:20:23 1.3
+++ mod_speling.mak 2001/03/22 05:56:52 1.4
@@ -42,13 +42,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_speling.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -135,13 +135,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_speling.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -157,9 +157,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -224,41 +224,13 @@
!IF "$(CFG)" == "mod_speling - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\mappers"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\mappers"
-
-!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\mappers"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\mappers"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_speling - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\mappers"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\mappers"
@@ -266,15 +238,43 @@
!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\mappers"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\mappers"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_speling - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\mappers"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\mappers"
+
+!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\mappers"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\mappers"
!ENDIF
1.4 +38 -38 httpd-2.0/modules/metadata/mod_cern_meta.mak
Index: mod_cern_meta.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_cern_meta.mak 2001/02/25 22:20:24 1.3
+++ mod_cern_meta.mak 2001/03/22 05:56:55 1.4
@@ -43,13 +43,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_cern_meta.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -137,13 +137,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_cern_meta.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -159,9 +159,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -226,41 +226,13 @@
!IF "$(CFG)" == "mod_cern_meta - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_cern_meta - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\metadata"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\metadata"
@@ -268,15 +240,43 @@
!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\metadata"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\metadata"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_cern_meta - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
+
+!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
!ENDIF
1.4 +38 -38 httpd-2.0/modules/metadata/mod_expires.mak
Index: mod_expires.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_expires.mak 2001/02/25 22:20:24 1.3
+++ mod_expires.mak 2001/03/22 05:56:55 1.4
@@ -42,13 +42,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_expires.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -135,13 +135,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_expires.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -157,9 +157,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -224,41 +224,13 @@
!IF "$(CFG)" == "mod_expires - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_expires - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\metadata"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\metadata"
@@ -266,15 +238,43 @@
!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\metadata"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\metadata"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_expires - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
+
+!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
!ENDIF
1.4 +38 -38 httpd-2.0/modules/metadata/mod_headers.mak
Index: mod_headers.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_headers.mak 2001/02/25 22:20:24 1.3
+++ mod_headers.mak 2001/03/22 05:56:56 1.4
@@ -42,13 +42,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_headers.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -135,13 +135,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_headers.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -157,9 +157,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -224,41 +224,13 @@
!IF "$(CFG)" == "mod_headers - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_headers - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\metadata"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\metadata"
@@ -266,15 +238,43 @@
!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\metadata"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\metadata"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_headers - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
+
+!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
!ENDIF
1.4 +38 -38 httpd-2.0/modules/metadata/mod_usertrack.mak
Index: mod_usertrack.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_usertrack.mak 2001/02/25 22:20:24 1.3
+++ mod_usertrack.mak 2001/03/22 05:56:56 1.4
@@ -43,13 +43,13 @@
!ELSE
-ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
+ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
"$(OUTDIR)\mod_usertrack.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"
+CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -137,13 +137,13 @@
!ELSE
-ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
+ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
"$(OUTDIR)\mod_usertrack.so"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"
+CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -159,9 +159,9 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
"..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
- "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack" /FD /c
+ "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -226,41 +226,13 @@
!IF "$(CFG)" == "mod_usertrack - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\..\modules\metadata"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\..\modules\metadata"
-
-!ENDIF
-
-!IF "$(CFG)" == "mod_usertrack - Win32 Release"
-
"libhttpd - Win32 Release" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release"
cd ".\modules\metadata"
"libhttpd - Win32 ReleaseCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
CFG="libhttpd - Win32 Release" RECURSE=1
cd ".\modules\metadata"
@@ -268,15 +240,43 @@
!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug"
"libhttpd - Win32 Debug" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"
cd ".\modules\metadata"
"libhttpd - Win32 DebugCLEAN" :
- cd "..\.."
+ cd "\clean\httpd-2.0"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
RECURSE=1
cd ".\modules\metadata"
+
+!ENDIF
+
+!IF "$(CFG)" == "mod_usertrack - Win32 Release"
+
+"libapr - Win32 Release" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
+
+!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\..\modules\metadata"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "\clean\httpd-2.0\srclib\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\..\modules\metadata"
!ENDIF
1.4 +10 -10 httpd-2.0/support/ab.mak
Index: ab.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/support/ab.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ab.mak 2001/02/25 22:20:25 1.3
+++ ab.mak 2001/03/22 05:56:58 1.4
@@ -146,10 +146,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
"../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
"APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ab"\
- /FD /c
+ /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -210,12 +210,12 @@
!IF "$(CFG)" == "ab - Win32 Release"
"apr - Win32 Release" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\..\support"
"apr - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\..\support"
@@ -223,12 +223,12 @@
!ELSEIF "$(CFG)" == "ab - Win32 Debug"
"apr - Win32 Debug" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\..\support"
"apr - Win32 DebugCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
cd "..\..\support"
@@ -238,12 +238,12 @@
!IF "$(CFG)" == "ab - Win32 Release"
"aprutil - Win32 Release" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release"
cd "..\..\support"
"aprutil - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
RECURSE=1
cd "..\..\support"
@@ -251,12 +251,12 @@
!ELSEIF "$(CFG)" == "ab - Win32 Debug"
"aprutil - Win32 Debug" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"
cd "..\..\support"
"aprutil - Win32 DebugCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
RECURSE=1
cd "..\..\support"
1.4 +10 -10 httpd-2.0/support/htdigest.mak
Index: htdigest.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htdigest.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htdigest.mak 2001/02/25 22:20:25 1.3
+++ htdigest.mak 2001/03/22 05:56:59 1.4
@@ -148,10 +148,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
"../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
"APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\htdigest" /FD /c
+ /Fd"$(INTDIR)\htdigest" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -214,12 +214,12 @@
!IF "$(CFG)" == "htdigest - Win32 Release"
"apr - Win32 Release" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\..\support"
"apr - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\..\support"
@@ -227,12 +227,12 @@
!ELSEIF "$(CFG)" == "htdigest - Win32 Debug"
"apr - Win32 Debug" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\..\support"
"apr - Win32 DebugCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
cd "..\..\support"
@@ -242,12 +242,12 @@
!IF "$(CFG)" == "htdigest - Win32 Release"
"aprutil - Win32 Release" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release"
cd "..\..\support"
"aprutil - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
RECURSE=1
cd "..\..\support"
@@ -255,12 +255,12 @@
!ELSEIF "$(CFG)" == "htdigest - Win32 Debug"
"aprutil - Win32 Debug" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"
cd "..\..\support"
"aprutil - Win32 DebugCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
RECURSE=1
cd "..\..\support"
1.4 +10 -10 httpd-2.0/support/htpasswd.mak
Index: htpasswd.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htpasswd.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htpasswd.mak 2001/02/25 22:20:25 1.3
+++ htpasswd.mak 2001/03/22 05:56:59 1.4
@@ -148,10 +148,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
"../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
"APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\htpasswd" /FD /c
+ /Fd"$(INTDIR)\htpasswd" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -214,12 +214,12 @@
!IF "$(CFG)" == "htpasswd - Win32 Release"
"apr - Win32 Release" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\..\support"
"apr - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\..\support"
@@ -227,12 +227,12 @@
!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug"
"apr - Win32 Debug" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\..\support"
"apr - Win32 DebugCLEAN" :
- cd "..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
cd "..\..\support"
@@ -242,12 +242,12 @@
!IF "$(CFG)" == "htpasswd - Win32 Release"
"aprutil - Win32 Release" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release"
cd "..\..\support"
"aprutil - Win32 ReleaseCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
RECURSE=1
cd "..\..\support"
@@ -255,12 +255,12 @@
!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug"
"aprutil - Win32 Debug" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"
cd "..\..\support"
"aprutil - Win32 DebugCLEAN" :
- cd "..\srclib\apr-util"
+ cd "\clean\httpd-2.0\srclib\apr-util"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
RECURSE=1
cd "..\..\support"
1.4 +2 -2 httpd-2.0/support/logresolve.mak
Index: logresolve.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/support/logresolve.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- logresolve.mak 2001/02/25 22:20:25 1.3
+++ logresolve.mak 2001/03/22 05:56:59 1.4
@@ -139,10 +139,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
"../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
"APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\logresolve" /FD /c
+ /Fd"$(INTDIR)\logresolve" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
1.3 +2 -2 httpd-2.0/support/rotatelogs.mak
Index: rotatelogs.mak
===================================================================
RCS file: /home/cvs/httpd-2.0/support/rotatelogs.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rotatelogs.mak 2001/02/25 02:53:30 1.2
+++ rotatelogs.mak 2001/03/22 05:56:59 1.3
@@ -139,10 +139,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
"../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
"APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\rotatelogs" /FD /c
+ /Fd"$(INTDIR)\rotatelogs" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.