From e935387c91ccf0ed3f76ca1ed92c838148b59152 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 22 Mar 2001 05:56:59 +0000 Subject: [PATCH] This should wrap this freshen up git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88559 13f79535-47bb-0310-9956-ffa450edef68 --- Apache.mak | 76 ++++++++++----------- libhttpd.mak | 88 ++++++++++++------------ modules/aaa/mod_auth_anon.mak | 76 ++++++++++----------- modules/aaa/mod_auth_dbm.mak | 92 +++++++++++++------------- modules/aaa/mod_auth_digest.mak | 93 +++++++++++++------------- modules/cache/mod_file_cache.mak | 77 ++++++++++----------- modules/dav/fs/mod_dav_fs.mak | 103 +++++++++++++++-------------- modules/dav/main/mod_dav.mak | 92 +++++++++++++------------- modules/generators/mod_info.mak | 77 +++++++++++---------- modules/generators/mod_status.mak | 76 ++++++++++----------- modules/mappers/mod_rewrite.mak | 76 ++++++++++----------- modules/mappers/mod_speling.mak | 76 ++++++++++----------- modules/metadata/mod_cern_meta.mak | 76 ++++++++++----------- modules/metadata/mod_expires.mak | 76 ++++++++++----------- modules/metadata/mod_headers.mak | 76 ++++++++++----------- modules/metadata/mod_usertrack.mak | 76 ++++++++++----------- server/gen_test_char.mak | 23 +++---- server/gen_uri_delims.mak | 4 +- support/ab.mak | 20 +++--- support/htdigest.mak | 20 +++--- support/htpasswd.mak | 20 +++--- support/logresolve.mak | 4 +- support/rotatelogs.mak | 4 +- 23 files changed, 701 insertions(+), 700 deletions(-) diff --git a/Apache.mak b/Apache.mak index ede1d70440..bda91f9a7a 100644 --- 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 6404a21333..f29a2f6f84 100644 --- 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 d020de0dc3..ecf019e046 100644 --- 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 948eb22113..c15f0d0664 100644 --- 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 eb13f7aa31..491b8dab7d 100644 --- 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 54e896658d..1297cd3efc 100644 --- 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 d07443a3cb..b1e210a42a 100644 --- 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 863977df68..c78ca28ee1 100644 --- 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 9b7e2fe4b2..0a1411ebbd 100644 --- 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 9a2d56f61d..0fb8ad086e 100644 --- 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 dac57cc987..6347ffcd06 100644 --- 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 be08f084cd..739f542509 100644 --- 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 2e3ab9ac7f..7794347b60 100644 --- 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 31b7506570..081e0f6ab5 100644 --- 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 503cdce673..03639d9731 100644 --- 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 5fdcec3ca5..39ec1439d8 100644 --- 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 4c3cb32428..c8bc107bb1 100644 --- 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 5084add7e0..9bb952efbd 100644 --- 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 3691c90a47..392a6c9b28 100644 --- 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 2db4089c95..cf1caa31b1 100644 --- 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 ca5cf42d4a..467603cd73 100644 --- 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 278daf8a32..4ba45f86da 100644 --- 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 e96167867a..779134849e 100644 --- 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=. -- 2.50.1