This should wrap this freshen up

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88559 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.mak b/Apache.mak
index ede1d704402734697e8bd09a48bfb8349ce918c1..bda91f9a7a1c1360bcdfeb6f2306ec4c6f4e7d29 100644 (file)
--- a/Apache.mak
+++ b/Apache.mak
@@ -39,14 +39,14 @@ ALL : "$(OUTDIR)\Apache.exe"
 
 !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 @@ ALL : "$(OUTDIR)\Apache.exe"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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"\
@@ -302,6 +274,34 @@ LINK32_OBJS= \
 
 !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 
+
 SOURCE=.\os\win32\apache.rc
 DEP_RSC_APACH=\
        ".\os\win32\apache.ico"\

diff --git a/libhttpd.mak b/libhttpd.mak
index 6404a21333e8f12f59cdece3884129b3f18130ce..f29a2f6f84b65c58bb549024b3bb6edcf12d6c82 100644 (file)
--- a/libhttpd.mak
+++ b/libhttpd.mak
@@ -41,16 +41,16 @@ ALL : "$(OUTDIR)\libhttpd.dll"
 
 !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 @@ ALL : "$(OUTDIR)\libhttpd.dll"
 
 !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 @@ CLEAN :
     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=.
 
@@ -2495,34 +2495,6 @@ NODEP_CPP_SERVI=\
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!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" : 
@@ -2668,6 +2640,34 @@ NODEP_CPP_SERVI=\
 
 !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 
+
 
 !ENDIF 
 

diff --git a/modules/aaa/mod_auth_anon.mak b/modules/aaa/mod_auth_anon.mak
index d020de0dc33fc6b7a43736518b5eb39c00fbba65..ecf019e0462a2212bf066f18d5cf0a0a625e1a6c 100644 (file)
--- a/modules/aaa/mod_auth_anon.mak
+++ b/modules/aaa/mod_auth_anon.mak
@@ -43,13 +43,13 @@ ALL : "$(OUTDIR)\mod_auth_anon.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_auth_anon.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +240,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_auth_anon.c
 DEP_CPP_MOD_A=\
        "..\..\include\ap_config.h"\

diff --git a/modules/aaa/mod_auth_dbm.mak b/modules/aaa/mod_auth_dbm.mak
index 948eb2211327469f8eab55632e7406bca22b3dde..c15f0d066410d02b22dcfd7bcd9e76507c2e89fd 100644 (file)
--- a/modules/aaa/mod_auth_dbm.mak
+++ b/modules/aaa/mod_auth_dbm.mak
@@ -43,14 +43,14 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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,18 +275,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_auth_dbm.c
 DEP_CPP_MOD_A=\
        "..\..\include\ap_config.h"\

diff --git a/modules/aaa/mod_auth_digest.mak b/modules/aaa/mod_auth_digest.mak
index eb13f7aa319349598b57edd672dc6828775259d1..491b8dab7d77354ab13caf19a323991cf180fc72 100644 (file)
--- a/modules/aaa/mod_auth_digest.mak
+++ b/modules/aaa/mod_auth_digest.mak
@@ -43,14 +43,14 @@ ALL : "$(OUTDIR)\mod_auth_digest.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_auth_digest.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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,18 +274,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_auth_digest.c
 DEP_CPP_MOD_A=\
        "..\..\include\ap_config.h"\

diff --git a/modules/cache/mod_file_cache.mak b/modules/cache/mod_file_cache.mak
index 54e896658dd670c6e2adcbc55af21a8fb930c869..1297cd3efc52d41e78a2a79b4da889d07432cbf1 100644 (file)
--- a/modules/cache/mod_file_cache.mak
+++ b/modules/cache/mod_file_cache.mak
@@ -43,13 +43,13 @@ ALL : "$(OUTDIR)\mod_file_cache.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_file_cache.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +241,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_file_cache.c
 DEP_CPP_MOD_F=\
        "..\..\include\ap_config.h"\

diff --git a/modules/dav/fs/mod_dav_fs.mak b/modules/dav/fs/mod_dav_fs.mak
index d07443a3cbdcc65f391b4acec240d7aab7aa8155..b1e210a42afd3a87c9c0c45aa4dbc6bf2e347983 100644 (file)
--- a/modules/dav/fs/mod_dav_fs.mak
+++ b/modules/dav/fs/mod_dav_fs.mak
@@ -42,14 +42,15 @@ ALL : "$(OUTDIR)\mod_dav_fs.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_dav_fs.so"
 
 !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 @@ CLEAN :
     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=.
 
@@ -415,44 +416,16 @@ NODEP_CPP_REPOS=\
 "$(INTDIR)\repos.obj" : $(SOURCE) $(DEP_CPP_REPOS) "$(INTDIR)"
 
 
-!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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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,18 +489,46 @@ NODEP_CPP_REPOS=\
 !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 
+
 
 !ENDIF 
 

diff --git a/modules/dav/main/mod_dav.mak b/modules/dav/main/mod_dav.mak
index 863977df68d058b1d71e9d2242e9180a8caaf3d4..c78ca28ee1e23e627e11295c06323c84cd0020f9 100644 (file)
--- a/modules/dav/main/mod_dav.mak
+++ b/modules/dav/main/mod_dav.mak
@@ -41,14 +41,14 @@ ALL : "$(OUTDIR)\mod_dav.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_dav.so"
 
 !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 @@ CLEAN :
     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=.
 
@@ -569,44 +569,16 @@ NODEP_CPP_UTIL_L=\
 "$(INTDIR)\util_lock.obj" : $(SOURCE) $(DEP_CPP_UTIL_L) "$(INTDIR)"
 
 
-!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 @@ NODEP_CPP_UTIL_L=\
 !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 @@ NODEP_CPP_UTIL_L=\
 !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,18 +614,46 @@ NODEP_CPP_UTIL_L=\
 !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 
+
 
 !ENDIF 
 

diff --git a/modules/generators/mod_info.mak b/modules/generators/mod_info.mak
index 9b7e2fe4b2d5592e5bbb1100a53f72ab7124096e..0a1411ebbdd6d75cefd09f00648bb7fe906fdc10 100644 (file)
--- a/modules/generators/mod_info.mak
+++ b/modules/generators/mod_info.mak
@@ -41,13 +41,13 @@ ALL : "$(OUTDIR)\mod_info.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_info.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +233,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_info.c
 DEP_CPP_MOD_I=\
        "..\..\include\ap_config.h"\

diff --git a/modules/generators/mod_status.mak b/modules/generators/mod_status.mak
index 9a2d56f61dc435a8d9b051769be9b0942cfb9578..0fb8ad086e174dac646cc335c0e5ef489283350e 100644 (file)
--- a/modules/generators/mod_status.mak
+++ b/modules/generators/mod_status.mak
@@ -42,13 +42,13 @@ ALL : "$(OUTDIR)\mod_status.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_status.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +238,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_status.c
 DEP_CPP_MOD_S=\
        "..\..\include\ap_config.h"\

diff --git a/modules/mappers/mod_rewrite.mak b/modules/mappers/mod_rewrite.mak
index dac57cc987d1c3395c7261bc35eb3c19886e52a5..6347ffcd06a00b2eaee19d4fab9b5ff36d9bf50f 100644 (file)
--- a/modules/mappers/mod_rewrite.mak
+++ b/modules/mappers/mod_rewrite.mak
@@ -42,13 +42,13 @@ ALL : "$(OUTDIR)\mod_rewrite.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_rewrite.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +240,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_rewrite.c
 DEP_CPP_MOD_R=\
        "..\..\include\ap_config.h"\

diff --git a/modules/mappers/mod_speling.mak b/modules/mappers/mod_speling.mak
index be08f084cdeff07086cef3a6221e3e7f08ea504c..739f542509f9f979d2536927b573d6f188d8abc6 100644 (file)
--- a/modules/mappers/mod_speling.mak
+++ b/modules/mappers/mod_speling.mak
@@ -42,13 +42,13 @@ ALL : "$(OUTDIR)\mod_speling.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_speling.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +238,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_speling.c
 DEP_CPP_MOD_S=\
        "..\..\include\ap_config.h"\

diff --git a/modules/metadata/mod_cern_meta.mak b/modules/metadata/mod_cern_meta.mak
index 2e3ab9ac7f597d41c394a04b5f0c9f769b7d9573..7794347b60dba80702f95b2c9e1ded37f8693bd7 100644 (file)
--- a/modules/metadata/mod_cern_meta.mak
+++ b/modules/metadata/mod_cern_meta.mak
@@ -43,13 +43,13 @@ ALL : "$(OUTDIR)\mod_cern_meta.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_cern_meta.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +240,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_cern_meta.c
 DEP_CPP_MOD_C=\
        "..\..\include\ap_config.h"\

diff --git a/modules/metadata/mod_expires.mak b/modules/metadata/mod_expires.mak
index 31b75065704d07f259bb25ec068f7845b2431756..081e0f6ab5a570ae65dcf73931231e81e7a9fb46 100644 (file)
--- a/modules/metadata/mod_expires.mak
+++ b/modules/metadata/mod_expires.mak
@@ -42,13 +42,13 @@ ALL : "$(OUTDIR)\mod_expires.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_expires.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +238,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_expires.c
 DEP_CPP_MOD_E=\
        "..\..\include\ap_config.h"\

diff --git a/modules/metadata/mod_headers.mak b/modules/metadata/mod_headers.mak
index 503cdce67362b61113dbbea8ae97a04d9e91f16f..03639d9731cd749c5f9635039b9dddb36a5d991e 100644 (file)
--- a/modules/metadata/mod_headers.mak
+++ b/modules/metadata/mod_headers.mak
@@ -42,13 +42,13 @@ ALL : "$(OUTDIR)\mod_headers.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_headers.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +238,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_headers.c
 DEP_CPP_MOD_H=\
        "..\..\include\ap_config.h"\

diff --git a/modules/metadata/mod_usertrack.mak b/modules/metadata/mod_usertrack.mak
index 5fdcec3ca54dad6b686a18a4e9a99b881f815b3f..39ec1439d86592d223db5f2491d5efe3dc43c010 100644 (file)
--- a/modules/metadata/mod_usertrack.mak
+++ b/modules/metadata/mod_usertrack.mak
@@ -43,13 +43,13 @@ ALL : "$(OUTDIR)\mod_usertrack.so"
 
 !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 @@ ALL : "$(OUTDIR)\mod_usertrack.so"
 
 !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 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 
 !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,18 +240,46 @@ LINK32_OBJS= \
 !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 
+
 SOURCE=.\mod_usertrack.c
 DEP_CPP_MOD_U=\
        "..\..\include\ap_config.h"\

diff --git a/server/gen_test_char.mak b/server/gen_test_char.mak
index 4c3cb3242844e918c7eacb962de715936d7bd884..c8bc107bb1442835652ca1d2143c94e7aa57bf3a 100644 (file)
--- a/server/gen_test_char.mak
+++ b/server/gen_test_char.mak
@@ -147,10 +147,9 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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"

diff --git a/server/gen_uri_delims.mak b/server/gen_uri_delims.mak
index 5084add7e0b2b1ae0ae641fabba0088dbe4624db..9bb952efbd713535d36deb29ba71248f3360e5f3 100644 (file)
--- a/server/gen_uri_delims.mak
+++ b/server/gen_uri_delims.mak
@@ -136,8 +136,8 @@ CLEAN :
     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=.
 

diff --git a/support/ab.mak b/support/ab.mak
index 3691c90a472e004de8a9eeb6c491c693324689ab..392a6c9b28764f83a94af98a96baf863474a3901 100644 (file)
--- a/support/ab.mak
+++ b/support/ab.mak
@@ -146,10 +146,10 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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"

diff --git a/support/htdigest.mak b/support/htdigest.mak
index 2db4089c95f7f67c47c8a89b0fd62020ba72695a..cf1caa31b11a7a8707e75435cf1214e7b99fc419 100644 (file)
--- a/support/htdigest.mak
+++ b/support/htdigest.mak
@@ -148,10 +148,10 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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"

diff --git a/support/htpasswd.mak b/support/htpasswd.mak
index ca5cf42d4a6ece50f8dd3dc07c0fa027e561511f..467603cd73e1dec9f15f02fbe2275baa596f04b3 100644 (file)
--- a/support/htpasswd.mak
+++ b/support/htpasswd.mak
@@ -148,10 +148,10 @@ CLEAN :
     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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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"

diff --git a/support/logresolve.mak b/support/logresolve.mak
index 278daf8a32e146b8ccbf1c22f1f325019804ba4d..4ba45f86dad44d936e42f90e116b9645bf2f5083 100644 (file)
--- a/support/logresolve.mak
+++ b/support/logresolve.mak
@@ -139,10 +139,10 @@ CLEAN :
     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=.
 

diff --git a/support/rotatelogs.mak b/support/rotatelogs.mak
index e96167867ad09cad52ee0d1226ca6e484cea2183..779134849e255091706a94752ff45437559f500f 100644 (file)
--- a/support/rotatelogs.mak
+++ b/support/rotatelogs.mak
@@ -139,10 +139,10 @@ CLEAN :
     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=.