diff options
| -rw-r--r-- | Apache.mak | 78 | ||||
| -rw-r--r-- | libhttpd.mak | 2376 | ||||
| -rw-r--r-- | modules/aaa/mod_auth_anon.mak | 77 | ||||
| -rw-r--r-- | modules/aaa/mod_auth_dbm.mak | 109 | ||||
| -rw-r--r-- | modules/aaa/mod_auth_digest.mak | 104 | ||||
| -rw-r--r-- | modules/cache/mod_file_cache.mak | 77 | ||||
| -rw-r--r-- | modules/dav/fs/mod_dav_fs.mak | 234 | ||||
| -rw-r--r-- | modules/dav/main/mod_dav.mak | 204 | ||||
| -rw-r--r-- | modules/generators/mod_info.mak | 78 | ||||
| -rw-r--r-- | modules/generators/mod_status.mak | 93 | ||||
| -rw-r--r-- | modules/mappers/mod_rewrite.mak | 77 | ||||
| -rw-r--r-- | modules/mappers/mod_speling.mak | 75 | ||||
| -rw-r--r-- | modules/metadata/mod_cern_meta.mak | 75 | ||||
| -rw-r--r-- | modules/metadata/mod_expires.mak | 75 | ||||
| -rw-r--r-- | modules/metadata/mod_headers.mak | 76 | ||||
| -rw-r--r-- | modules/metadata/mod_usertrack.mak | 75 | ||||
| -rw-r--r-- | server/gen_test_char.mak | 33 | ||||
| -rw-r--r-- | server/gen_uri_delims.mak | 79 | ||||
| -rw-r--r-- | srclib/expat-lite/libexpat.mak | 44 | ||||
| -rw-r--r-- | srclib/pcre/dftables.mak | 2 | ||||
| -rw-r--r-- | support/ab.mak | 93 | ||||
| -rw-r--r-- | support/htdigest.mak | 41 | ||||
| -rw-r--r-- | support/htpasswd.mak | 95 | ||||
| -rw-r--r-- | support/logresolve.mak | 112 | ||||
| -rw-r--r-- | support/rotatelogs.mak | 33 |
25 files changed, 3073 insertions, 1342 deletions
diff --git a/Apache.mak b/Apache.mak index ac5d57b3d6..fd8bfe2563 100644 --- a/Apache.mak +++ b/Apache.mak @@ -39,14 +39,14 @@ ALL : "$(OUTDIR)\Apache.exe" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\ "libapr - Win32 Release" "$(OUTDIR)\Apache.exe" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\ + "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -132,14 +132,14 @@ ALL : "$(OUTDIR)\Apache.exe" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\ "libapr - Win32 Debug" "$(OUTDIR)\Apache.exe" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\ + "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -247,34 +247,6 @@ LINK32_OBJS= \ !IF "$(CFG)" == "Apache - Win32 Release" -"libhttpd - Win32 Release" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" - cd "." - -"libhttpd - Win32 ReleaseCLEAN" : - cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ - CFG="libhttpd - Win32 Release" RECURSE=1 - cd "." - -!ELSEIF "$(CFG)" == "Apache - Win32 Debug" - -"libhttpd - Win32 Debug" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" - cd "." - -"libhttpd - Win32 DebugCLEAN" : - cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - 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" + +"libhttpd - Win32 Release" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" + cd "." + +"libhttpd - Win32 ReleaseCLEAN" : + cd "." + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ + CFG="libhttpd - Win32 Release" RECURSE=1 + cd "." + +!ELSEIF "$(CFG)" == "Apache - Win32 Debug" + +"libhttpd - Win32 Debug" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" + cd "." + +"libhttpd - Win32 DebugCLEAN" : + cd "." + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\ + RECURSE=1 + cd "." + +!ENDIF + SOURCE=.\os\win32\apache.rc DEP_RSC_APACH=\ ".\os\win32\apache.ico"\ @@ -328,6 +328,7 @@ DEP_CPP_MAIN_=\ ".\include\ap_config.h"\ ".\include\ap_mmn.h"\ ".\include\ap_mpm.h"\ + ".\include\ap_release.h"\ ".\include\http_config.h"\ ".\include\http_log.h"\ ".\include\http_main.h"\ @@ -339,9 +340,11 @@ DEP_CPP_MAIN_=\ ".\include\util_ebcdic.h"\ ".\include\util_uri.h"\ ".\os\win32\os.h"\ - ".\srclib\apr-util\include\ap_hooks.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ ".\srclib\apr\include\apr.h"\ ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ ".\srclib\apr\include\apr_file_io.h"\ ".\srclib\apr\include\apr_general.h"\ ".\srclib\apr\include\apr_getopt.h"\ @@ -352,12 +355,13 @@ DEP_CPP_MAIN_=\ ".\srclib\apr\include\apr_tables.h"\ ".\srclib\apr\include\apr_thread_proc.h"\ ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ ".\srclib\apr\include\apr_xlate.h"\ - ".\srclib\apr\network_io\os2\os2nerrno.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MAIN_=\ ".\include\ap_config_auto.h"\ - ".\include\ap_config_path.h"\ ".\server\xmlparse.h"\ diff --git a/libhttpd.mak b/libhttpd.mak index 28c7806601..2488aa1d1f 100644 --- a/libhttpd.mak +++ b/libhttpd.mak @@ -41,20 +41,63 @@ ALL : "$(OUTDIR)\libhttpd.dll" !ELSE -ALL : "libaprutil - Win32 Release" "libexpat - Win32 Release"\ - "httpd - Win32 Release" "pcreposix - Win32 Release" "pcre - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\libhttpd.dll" +ALL : "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release"\ + "pcreposix - Win32 Release" "pcre - Win32 Release" "libexpat - Win32 Release"\ + "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\libhttpd.dll" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "pcre - Win32 ReleaseCLEAN"\ - "pcreposix - Win32 ReleaseCLEAN" "httpd - Win32 ReleaseCLEAN"\ - "libexpat - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\ + "libexpat - Win32 ReleaseCLEAN" "pcre - Win32 ReleaseCLEAN"\ + "pcreposix - Win32 ReleaseCLEAN" "gen_test_char - Win32 ReleaseCLEAN"\ + "gen_uri_delims - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\libhttpd.obj" + -@erase "$(INTDIR)\buildmark.obj" + -@erase "$(INTDIR)\config.obj" + -@erase "$(INTDIR)\connection.obj" + -@erase "$(INTDIR)\error_bucket.obj" + -@erase "$(INTDIR)\http_core.obj" + -@erase "$(INTDIR)\http_protocol.obj" + -@erase "$(INTDIR)\http_request.obj" + -@erase "$(INTDIR)\listen.obj" + -@erase "$(INTDIR)\log.obj" + -@erase "$(INTDIR)\mod_access.obj" + -@erase "$(INTDIR)\mod_actions.obj" + -@erase "$(INTDIR)\mod_alias.obj" + -@erase "$(INTDIR)\mod_asis.obj" + -@erase "$(INTDIR)\mod_auth.obj" + -@erase "$(INTDIR)\mod_autoindex.obj" + -@erase "$(INTDIR)\mod_cgi.obj" + -@erase "$(INTDIR)\mod_dir.obj" + -@erase "$(INTDIR)\mod_env.obj" + -@erase "$(INTDIR)\mod_imap.obj" + -@erase "$(INTDIR)\mod_include.obj" + -@erase "$(INTDIR)\mod_isapi.obj" + -@erase "$(INTDIR)\mod_log_config.obj" + -@erase "$(INTDIR)\mod_mime.obj" + -@erase "$(INTDIR)\mod_negotiation.obj" + -@erase "$(INTDIR)\mod_setenvif.obj" + -@erase "$(INTDIR)\mod_so.obj" + -@erase "$(INTDIR)\mod_userdir.obj" + -@erase "$(INTDIR)\modules.obj" + -@erase "$(INTDIR)\mpm_winnt.obj" + -@erase "$(INTDIR)\registry.obj" + -@erase "$(INTDIR)\rfc1413.obj" + -@erase "$(INTDIR)\scoreboard.obj" + -@erase "$(INTDIR)\service.obj" + -@erase "$(INTDIR)\util.obj" + -@erase "$(INTDIR)\util_cfgtree.obj" + -@erase "$(INTDIR)\util_date.obj" + -@erase "$(INTDIR)\util_filter.obj" + -@erase "$(INTDIR)\util_md5.obj" + -@erase "$(INTDIR)\util_script.obj" + -@erase "$(INTDIR)\util_uri.obj" + -@erase "$(INTDIR)\util_win32.obj" + -@erase "$(INTDIR)\util_xml.obj" + -@erase "$(INTDIR)\vhost.obj" -@erase "$(OUTDIR)\libhttpd.dll" -@erase "$(OUTDIR)\libhttpd.exp" -@erase "$(OUTDIR)\libhttpd.lib" @@ -65,8 +108,9 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I ".\include" /I ".\lib\apr\include" /I\ - ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"\ +CPP_PROJ=/nologo /MD /W3 /O2 /I ".\include" /I ".\srclib\apr\include" /I\ + ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I\ + "./os/win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"\ /Fo"$(INTDIR)\\" /Fd"Debug\libhttpd" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -111,14 +155,52 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib\ /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libhttpd.pdb"\ - /map:"$(INTDIR)\libhttpd.map" /machine:I386 /def:".\libhttpd.def"\ - /out:"$(OUTDIR)\libhttpd.dll" /implib:"$(OUTDIR)\libhttpd.lib"\ - /base:@"os\win32\BaseAddr.ref",libhttpd -DEF_FILE= \ - ".\libhttpd.def" + /map:"$(INTDIR)\libhttpd.map" /machine:I386 /out:"$(OUTDIR)\libhttpd.dll"\ + /implib:"$(OUTDIR)\libhttpd.lib" /base:@"os\win32\BaseAddr.ref",libhttpd LINK32_OBJS= \ - "$(INTDIR)\libhttpd.obj" \ - ".\LibR\httpd.lib" \ + "$(INTDIR)\buildmark.obj" \ + "$(INTDIR)\config.obj" \ + "$(INTDIR)\connection.obj" \ + "$(INTDIR)\error_bucket.obj" \ + "$(INTDIR)\http_core.obj" \ + "$(INTDIR)\http_protocol.obj" \ + "$(INTDIR)\http_request.obj" \ + "$(INTDIR)\listen.obj" \ + "$(INTDIR)\log.obj" \ + "$(INTDIR)\mod_access.obj" \ + "$(INTDIR)\mod_actions.obj" \ + "$(INTDIR)\mod_alias.obj" \ + "$(INTDIR)\mod_asis.obj" \ + "$(INTDIR)\mod_auth.obj" \ + "$(INTDIR)\mod_autoindex.obj" \ + "$(INTDIR)\mod_cgi.obj" \ + "$(INTDIR)\mod_dir.obj" \ + "$(INTDIR)\mod_env.obj" \ + "$(INTDIR)\mod_imap.obj" \ + "$(INTDIR)\mod_include.obj" \ + "$(INTDIR)\mod_isapi.obj" \ + "$(INTDIR)\mod_log_config.obj" \ + "$(INTDIR)\mod_mime.obj" \ + "$(INTDIR)\mod_negotiation.obj" \ + "$(INTDIR)\mod_setenvif.obj" \ + "$(INTDIR)\mod_so.obj" \ + "$(INTDIR)\mod_userdir.obj" \ + "$(INTDIR)\modules.obj" \ + "$(INTDIR)\mpm_winnt.obj" \ + "$(INTDIR)\registry.obj" \ + "$(INTDIR)\rfc1413.obj" \ + "$(INTDIR)\scoreboard.obj" \ + "$(INTDIR)\service.obj" \ + "$(INTDIR)\util.obj" \ + "$(INTDIR)\util_cfgtree.obj" \ + "$(INTDIR)\util_date.obj" \ + "$(INTDIR)\util_filter.obj" \ + "$(INTDIR)\util_md5.obj" \ + "$(INTDIR)\util_script.obj" \ + "$(INTDIR)\util_uri.obj" \ + "$(INTDIR)\util_win32.obj" \ + "$(INTDIR)\util_xml.obj" \ + "$(INTDIR)\vhost.obj" \ ".\srclib\apr-util\Release\libaprutil.lib" \ ".\srclib\apr\Release\libapr.lib" \ ".\srclib\expat-lite\Release\libexpat.lib" \ @@ -144,21 +226,64 @@ ALL : "$(OUTDIR)\libhttpd.dll" !ELSE -ALL : "libaprutil - Win32 Debug" "libexpat - Win32 Debug" "httpd - Win32 Debug"\ - "pcreposix - Win32 Debug" "pcre - Win32 Debug" "libapr - Win32 Debug"\ - "$(OUTDIR)\libhttpd.dll" +ALL : "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug"\ + "pcreposix - Win32 Debug" "pcre - Win32 Debug" "libexpat - Win32 Debug"\ + "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\libhttpd.dll" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "pcre - Win32 DebugCLEAN"\ - "pcreposix - Win32 DebugCLEAN" "httpd - Win32 DebugCLEAN"\ - "libexpat - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\ + "libexpat - Win32 DebugCLEAN" "pcre - Win32 DebugCLEAN"\ + "pcreposix - Win32 DebugCLEAN" "gen_test_char - Win32 DebugCLEAN"\ + "gen_uri_delims - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF + -@erase "$(INTDIR)\buildmark.obj" + -@erase "$(INTDIR)\config.obj" + -@erase "$(INTDIR)\connection.obj" + -@erase "$(INTDIR)\error_bucket.obj" + -@erase "$(INTDIR)\http_core.obj" + -@erase "$(INTDIR)\http_protocol.obj" + -@erase "$(INTDIR)\http_request.obj" -@erase "$(INTDIR)\libhttpd.idb" - -@erase "$(INTDIR)\libhttpd.obj" + -@erase "$(INTDIR)\listen.obj" + -@erase "$(INTDIR)\log.obj" + -@erase "$(INTDIR)\mod_access.obj" + -@erase "$(INTDIR)\mod_actions.obj" + -@erase "$(INTDIR)\mod_alias.obj" + -@erase "$(INTDIR)\mod_asis.obj" + -@erase "$(INTDIR)\mod_auth.obj" + -@erase "$(INTDIR)\mod_autoindex.obj" + -@erase "$(INTDIR)\mod_cgi.obj" + -@erase "$(INTDIR)\mod_dir.obj" + -@erase "$(INTDIR)\mod_env.obj" + -@erase "$(INTDIR)\mod_imap.obj" + -@erase "$(INTDIR)\mod_include.obj" + -@erase "$(INTDIR)\mod_isapi.obj" + -@erase "$(INTDIR)\mod_log_config.obj" + -@erase "$(INTDIR)\mod_mime.obj" + -@erase "$(INTDIR)\mod_negotiation.obj" + -@erase "$(INTDIR)\mod_setenvif.obj" + -@erase "$(INTDIR)\mod_so.obj" + -@erase "$(INTDIR)\mod_userdir.obj" + -@erase "$(INTDIR)\modules.obj" + -@erase "$(INTDIR)\mpm_winnt.obj" + -@erase "$(INTDIR)\registry.obj" + -@erase "$(INTDIR)\rfc1413.obj" + -@erase "$(INTDIR)\scoreboard.obj" + -@erase "$(INTDIR)\service.obj" + -@erase "$(INTDIR)\util.obj" + -@erase "$(INTDIR)\util_cfgtree.obj" + -@erase "$(INTDIR)\util_date.obj" + -@erase "$(INTDIR)\util_filter.obj" + -@erase "$(INTDIR)\util_md5.obj" + -@erase "$(INTDIR)\util_script.obj" + -@erase "$(INTDIR)\util_uri.obj" + -@erase "$(INTDIR)\util_win32.obj" + -@erase "$(INTDIR)\util_xml.obj" + -@erase "$(INTDIR)\vhost.obj" -@erase "$(OUTDIR)\libhttpd.dll" -@erase "$(OUTDIR)\libhttpd.exp" -@erase "$(OUTDIR)\libhttpd.lib" @@ -169,8 +294,9 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\lib\apr\include" /I\ - ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"\ +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" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /c CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -215,14 +341,53 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib\ /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libhttpd.pdb"\ - /map:"$(INTDIR)\libhttpd.map" /debug /machine:I386 /def:".\libhttpd.def"\ + /map:"$(INTDIR)\libhttpd.map" /debug /machine:I386\ /out:"$(OUTDIR)\libhttpd.dll" /implib:"$(OUTDIR)\libhttpd.lib"\ /base:@"os\win32\BaseAddr.ref",libhttpd -DEF_FILE= \ - ".\libhttpd.def" LINK32_OBJS= \ - "$(INTDIR)\libhttpd.obj" \ - ".\LibD\httpd.lib" \ + "$(INTDIR)\buildmark.obj" \ + "$(INTDIR)\config.obj" \ + "$(INTDIR)\connection.obj" \ + "$(INTDIR)\error_bucket.obj" \ + "$(INTDIR)\http_core.obj" \ + "$(INTDIR)\http_protocol.obj" \ + "$(INTDIR)\http_request.obj" \ + "$(INTDIR)\listen.obj" \ + "$(INTDIR)\log.obj" \ + "$(INTDIR)\mod_access.obj" \ + "$(INTDIR)\mod_actions.obj" \ + "$(INTDIR)\mod_alias.obj" \ + "$(INTDIR)\mod_asis.obj" \ + "$(INTDIR)\mod_auth.obj" \ + "$(INTDIR)\mod_autoindex.obj" \ + "$(INTDIR)\mod_cgi.obj" \ + "$(INTDIR)\mod_dir.obj" \ + "$(INTDIR)\mod_env.obj" \ + "$(INTDIR)\mod_imap.obj" \ + "$(INTDIR)\mod_include.obj" \ + "$(INTDIR)\mod_isapi.obj" \ + "$(INTDIR)\mod_log_config.obj" \ + "$(INTDIR)\mod_mime.obj" \ + "$(INTDIR)\mod_negotiation.obj" \ + "$(INTDIR)\mod_setenvif.obj" \ + "$(INTDIR)\mod_so.obj" \ + "$(INTDIR)\mod_userdir.obj" \ + "$(INTDIR)\modules.obj" \ + "$(INTDIR)\mpm_winnt.obj" \ + "$(INTDIR)\registry.obj" \ + "$(INTDIR)\rfc1413.obj" \ + "$(INTDIR)\scoreboard.obj" \ + "$(INTDIR)\service.obj" \ + "$(INTDIR)\util.obj" \ + "$(INTDIR)\util_cfgtree.obj" \ + "$(INTDIR)\util_date.obj" \ + "$(INTDIR)\util_filter.obj" \ + "$(INTDIR)\util_md5.obj" \ + "$(INTDIR)\util_script.obj" \ + "$(INTDIR)\util_uri.obj" \ + "$(INTDIR)\util_win32.obj" \ + "$(INTDIR)\util_xml.obj" \ + "$(INTDIR)\vhost.obj" \ ".\srclib\apr-util\Debug\libaprutil.lib" \ ".\srclib\apr\Debug\libapr.lib" \ ".\srclib\expat-lite\Debug\libexpat.lib" \ @@ -239,6 +404,1989 @@ LINK32_OBJS= \ !IF "$(CFG)" == "libhttpd - Win32 Release" || "$(CFG)" ==\ "libhttpd - Win32 Debug" +SOURCE=.\server\buildmark.c +DEP_CPP_BUILD=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_BUILD=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\os\win32\modules.c +DEP_CPP_MODUL=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MODUL=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\gen_test_char.exe + +!IF "$(CFG)" == "libhttpd - Win32 Release" + +InputPath=.\server\gen_test_char.exe + +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h + echo Generated test_char.h from gen_test_char.exe + + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +InputPath=.\server\gen_test_char.exe + +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h + echo Generated test_char.h from gen_test_char.exe + + +!ENDIF + +SOURCE=.\server\gen_uri_delims.exe + +!IF "$(CFG)" == "libhttpd - Win32 Release" + +InputPath=.\server\gen_uri_delims.exe + +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_uri_delims.exe >.\server\uri_delims.h + echo Generated uri_delims.h from gen_uri_delims.exe + + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +InputPath=.\server\gen_uri_delims.exe + +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_uri_delims.exe >.\server\uri_delims.h + echo Generated uri_delims.h from gen_uri_delims.exe + + +!ENDIF + +SOURCE=.\server\config.c +DEP_CPP_CONFI=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_CONFI=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\config.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\connection.c +DEP_CPP_CONNE=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_mpm.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_connection.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\scoreboard.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm_default.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_CONNE=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\connection.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\log.c +DEP_CPP_LOG_C=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_signal.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_LOG_C=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\log.obj" : $(SOURCE) $(DEP_CPP_LOG_C) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\scoreboard.c +DEP_CPP_SCORE=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_mpm.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\scoreboard.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm.h"\ + ".\server\mpm\winnt\mpm_default.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_shmem.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_SCORE=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\scoreboard.obj" : $(SOURCE) $(DEP_CPP_SCORE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\vhost.c +DEP_CPP_VHOST=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_VHOST=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\vhost.obj" : $(SOURCE) $(DEP_CPP_VHOST) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\http\http_core.c +DEP_CPP_HTTP_=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_connection.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\rfc1413.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_charset.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_filter.h"\ + ".\include\util_md5.h"\ + ".\include\util_uri.h"\ + ".\modules\http\mod_core.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_fnmatch.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_md5.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_HTTP_=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\http\http_protocol.c +DEP_CPP_HTTP_P=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_charset.h"\ + ".\include\util_date.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\modules\http\mod_core.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_signal.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_HTTP_P=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\http\http_request.c +DEP_CPP_HTTP_R=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_charset.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\modules\http\mod_core.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_fnmatch.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_HTTP_R=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\aaa\mod_access.c +DEP_CPP_MOD_A=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MOD_A=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_actions.c +DEP_CPP_MOD_AC=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_AC=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_alias.c +DEP_CPP_MOD_AL=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MOD_AL=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\generators\mod_asis.c +DEP_CPP_MOD_AS=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_AS=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\aaa\mod_auth.c +DEP_CPP_MOD_AU=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_AU=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\generators\mod_autoindex.c +DEP_CPP_MOD_AUT=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_fnmatch.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_AUT=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\generators\mod_cgi.c +DEP_CPP_MOD_C=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_mpm.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\modules\filters\mod_include.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_optional.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_C=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_dir.c +DEP_CPP_MOD_D=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_D=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\metadata\mod_env.c +DEP_CPP_MOD_E=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MOD_E=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_imap.c +DEP_CPP_MOD_I=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_I=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\filters\mod_include.c +DEP_CPP_MOD_IN=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_charset.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\modules\filters\mod_include.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_optional.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_hash.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_IN=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\os\win32\mod_isapi.c +DEP_CPP_MOD_IS=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_IS=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\loggers\mod_log_config.c +DEP_CPP_MOD_L=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_L=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\http\mod_mime.c +DEP_CPP_MOD_M=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MOD_M=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_negotiation.c +DEP_CPP_MOD_N=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_N=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\metadata\mod_setenvif.c +DEP_CPP_MOD_S=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MOD_S=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_so.c +DEP_CPP_MOD_SO=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MOD_SO=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\mappers\mod_userdir.c +DEP_CPP_MOD_U=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_MOD_U=\ + ".\include\ap_config_auto.h"\ + ".\modules\mappers\unixd.h"\ + + +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\modules\http\error_bucket.c +DEP_CPP_ERROR=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_protocol.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_ERROR=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\error_bucket.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\rfc1413.c +DEP_CPP_RFC14=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\rfc1413.h"\ + ".\include\util_charset.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_RFC14=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util.c +DEP_CPP_UTIL_=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_charset.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\test_char.h"\ + ".\srclib\apr-util\include\apr_base64.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + {$(INCLUDE)}"netdb.h"\ + {$(INCLUDE)}"sys\socket.h"\ + +NODEP_CPP_UTIL_=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"\ + ".\server\test_char.h" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_cfgtree.c +DEP_CPP_UTIL_C=\ + ".\include\ap_config.h"\ + ".\include\util_cfgtree.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_tables.h"\ + +NODEP_CPP_UTIL_C=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_cfgtree.obj" : $(SOURCE) $(DEP_CPP_UTIL_C) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_date.c +DEP_CPP_UTIL_D=\ + ".\include\ap_config.h"\ + ".\include\util_date.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_UTIL_D=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_filter.c +DEP_CPP_UTIL_F=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_filter.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_UTIL_F=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_filter.obj" : $(SOURCE) $(DEP_CPP_UTIL_F) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_md5.c +DEP_CPP_UTIL_M=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_charset.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_md5.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_md5.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_UTIL_M=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_script.c +DEP_CPP_UTIL_S=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\http_protocol.h"\ + ".\include\http_request.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_charset.h"\ + ".\include\util_date.h"\ + ".\include\util_ebcdic.h"\ + ".\include\util_filter.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + ".\srclib\apr\include\apr_xlate.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_UTIL_S=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_uri.c +DEP_CPP_UTIL_U=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\uri_delims.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_UTIL_U=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"\ + ".\server\uri_delims.h" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\os\win32\util_win32.c +DEP_CPP_UTIL_W=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_UTIL_W=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\util_xml.c +DEP_CPP_UTIL_X=\ + ".\include\ap_config.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_uri.h"\ + ".\include\util_xml.h"\ + ".\os\win32\os.h"\ + ".\srclib\apr-util\include\apr_buckets.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apr_ring.h"\ + ".\srclib\apr-util\include\apr_xml.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr-util\include\apu_compat.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_compat.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_mmap.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_UTIL_X=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\util_xml.obj" : $(SOURCE) $(DEP_CPP_UTIL_X) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\listen.c +DEP_CPP_LISTE=\ + ".\include\ap_config.h"\ + ".\include\ap_listen.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\mpm_common.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_LISTE=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\listen.obj" : $(SOURCE) $(DEP_CPP_LISTE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\mpm\winnt\mpm_winnt.c +DEP_CPP_MPM_W=\ + ".\include\ap_config.h"\ + ".\include\ap_listen.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_mpm.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_connection.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\mpm_common.h"\ + ".\include\pcreposix.h"\ + ".\include\scoreboard.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm.h"\ + ".\server\mpm\winnt\mpm_default.h"\ + ".\server\mpm\winnt\mpm_winnt.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_dso.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_getopt.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_lock.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_portable.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + +NODEP_CPP_MPM_W=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\mpm_winnt.obj" : $(SOURCE) $(DEP_CPP_MPM_W) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\mpm\winnt\registry.c +DEP_CPP_REGIS=\ + ".\include\ap_config.h"\ + ".\include\ap_listen.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm.h"\ + ".\server\mpm\winnt\mpm_winnt.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_REGIS=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=.\server\mpm\winnt\service.c +DEP_CPP_SERVI=\ + ".\include\ap_config.h"\ + ".\include\ap_listen.h"\ + ".\include\ap_mmn.h"\ + ".\include\ap_release.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\pcreposix.h"\ + ".\include\util_cfgtree.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\server\mpm\winnt\mpm.h"\ + ".\server\mpm\winnt\mpm_winnt.h"\ + ".\srclib\apr-util\include\apr_hooks.h"\ + ".\srclib\apr-util\include\apu.h"\ + ".\srclib\apr\include\apr.h"\ + ".\srclib\apr\include\apr_errno.h"\ + ".\srclib\apr\include\apr_file_info.h"\ + ".\srclib\apr\include\apr_file_io.h"\ + ".\srclib\apr\include\apr_general.h"\ + ".\srclib\apr\include\apr_lib.h"\ + ".\srclib\apr\include\apr_network_io.h"\ + ".\srclib\apr\include\apr_pools.h"\ + ".\srclib\apr\include\apr_strings.h"\ + ".\srclib\apr\include\apr_tables.h"\ + ".\srclib\apr\include\apr_thread_proc.h"\ + ".\srclib\apr\include\apr_time.h"\ + ".\srclib\apr\include\apr_user.h"\ + ".\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + +NODEP_CPP_SERVI=\ + ".\include\ap_config_auto.h"\ + + +"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + !IF "$(CFG)" == "libhttpd - Win32 Release" @@ -270,6 +2418,63 @@ LINK32_OBJS= \ !IF "$(CFG)" == "libhttpd - Win32 Release" +"libaprutil - Win32 Release" : + cd ".\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ + + cd "..\.." + +"libaprutil - Win32 ReleaseCLEAN" : + cd ".\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ + CFG="libaprutil - Win32 Release" RECURSE=1 + cd "..\.." + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +"libaprutil - Win32 Debug" : + cd ".\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" + cd "..\.." + +"libaprutil - Win32 DebugCLEAN" : + cd ".\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ + CFG="libaprutil - Win32 Debug" RECURSE=1 + cd "..\.." + +!ENDIF + +!IF "$(CFG)" == "libhttpd - Win32 Release" + +"libexpat - Win32 Release" : + cd ".\srclib\expat-lite" + $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release" + cd "..\.." + +"libexpat - Win32 ReleaseCLEAN" : + cd ".\srclib\expat-lite" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\ + CFG="libexpat - Win32 Release" RECURSE=1 + cd "..\.." + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +"libexpat - Win32 Debug" : + cd ".\srclib\expat-lite" + $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug" + cd "..\.." + +"libexpat - Win32 DebugCLEAN" : + cd ".\srclib\expat-lite" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\ + RECURSE=1 + cd "..\.." + +!ENDIF + +!IF "$(CFG)" == "libhttpd - Win32 Release" + "pcre - Win32 Release" : cd ".\srclib\pcre" $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Release" @@ -326,95 +2531,64 @@ LINK32_OBJS= \ !IF "$(CFG)" == "libhttpd - Win32 Release" -"httpd - Win32 Release" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\httpd.mak" CFG="httpd - Win32 Release" - cd "." - -"httpd - Win32 ReleaseCLEAN" : - cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\httpd.mak" CFG="httpd - Win32 Release"\ - RECURSE=1 - cd "." - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -"httpd - Win32 Debug" : - cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\httpd.mak" CFG="httpd - Win32 Debug" - cd "." - -"httpd - Win32 DebugCLEAN" : - cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\httpd.mak" CFG="httpd - Win32 Debug"\ - RECURSE=1 - cd "." - -!ENDIF - -!IF "$(CFG)" == "libhttpd - Win32 Release" - -"libexpat - Win32 Release" : - cd ".\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release" - cd "..\.." +"gen_test_char - Win32 Release" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak"\ + CFG="gen_test_char - Win32 Release" + cd ".." -"libexpat - Win32 ReleaseCLEAN" : - cd ".\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\ - CFG="libexpat - Win32 Release" RECURSE=1 - cd "..\.." +"gen_test_char - Win32 ReleaseCLEAN" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_test_char.mak"\ + CFG="gen_test_char - Win32 Release" RECURSE=1 + cd ".." !ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" -"libexpat - Win32 Debug" : - cd ".\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug" - cd "..\.." +"gen_test_char - Win32 Debug" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak"\ + CFG="gen_test_char - Win32 Debug" + cd ".." -"libexpat - Win32 DebugCLEAN" : - cd ".\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\ - RECURSE=1 - cd "..\.." +"gen_test_char - Win32 DebugCLEAN" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_test_char.mak"\ + CFG="gen_test_char - Win32 Debug" RECURSE=1 + cd ".." !ENDIF !IF "$(CFG)" == "libhttpd - Win32 Release" -"libaprutil - Win32 Release" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\.." +"gen_uri_delims - Win32 Release" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\ + CFG="gen_uri_delims - Win32 Release" + cd ".." -"libaprutil - Win32 ReleaseCLEAN" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\.." +"gen_uri_delims - Win32 ReleaseCLEAN" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\ + CFG="gen_uri_delims - Win32 Release" RECURSE=1 + cd ".." !ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" -"libaprutil - Win32 Debug" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\.." +"gen_uri_delims - Win32 Debug" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\ + CFG="gen_uri_delims - Win32 Debug" + cd ".." -"libaprutil - Win32 DebugCLEAN" : - cd ".\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\.." +"gen_uri_delims - Win32 DebugCLEAN" : + cd ".\server" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\ + CFG="gen_uri_delims - Win32 Debug" RECURSE=1 + cd ".." !ENDIF -SOURCE=.\os\win32\libhttpd.c - -"$(INTDIR)\libhttpd.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - !ENDIF diff --git a/modules/aaa/mod_auth_anon.mak b/modules/aaa/mod_auth_anon.mak index 08f64e4e4b..a916d81c8a 100644 --- a/modules/aaa/mod_auth_anon.mak +++ b/modules/aaa/mod_auth_anon.mak @@ -43,14 +43,13 @@ ALL : "$(OUTDIR)\mod_auth_anon.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_auth_anon.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_auth_anon.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -117,7 +116,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_auth_anon.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_auth_anon.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -139,14 +137,13 @@ ALL : "$(OUTDIR)\mod_auth_anon.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_anon.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_auth_anon.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -214,7 +211,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_auth_anon.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_auth_anon.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -231,12 +227,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_anon - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\aaa" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\aaa" @@ -244,12 +240,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\aaa" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\aaa" @@ -259,12 +255,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_anon - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\aaa" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\aaa" @@ -272,51 +268,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\aaa" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\aaa" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\aaa" - -!ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\aaa" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\aaa" - -!ENDIF - SOURCE=.\mod_auth_anon.c DEP_CPP_MOD_A=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -328,15 +296,16 @@ DEP_CPP_MOD_A=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ - "..\..\srclib\apr\include\apr_lib.h"\ "..\..\srclib\apr\include\apr_lock.h"\ "..\..\srclib\apr\include\apr_mmap.h"\ "..\..\srclib\apr\include\apr_network_io.h"\ @@ -346,11 +315,13 @@ DEP_CPP_MOD_A=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_A=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" diff --git a/modules/aaa/mod_auth_dbm.mak b/modules/aaa/mod_auth_dbm.mak index f5af717338..0c757c7e8d 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 : "libaprutil - Win32 Release" "libapr - Win32 Release"\ - "libhttpd - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so" +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\ + "libapr - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\ + "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -140,14 +140,14 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug"\ - "libhttpd - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so" +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\ + "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\ + "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -232,41 +232,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" -"libhttpd - Win32 Release" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" - cd ".\modules\aaa" - -"libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ - CFG="libhttpd - Win32 Release" RECURSE=1 - cd ".\modules\aaa" - -!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" - -"libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" - cd ".\modules\aaa" - -"libhttpd - Win32 DebugCLEAN" : - cd "\test\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 "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\aaa" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\aaa" @@ -274,12 +246,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\aaa" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\aaa" @@ -288,20 +260,14 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" -!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" - -!ENDIF - -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" - "libaprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -309,22 +275,51 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" "libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" !ENDIF +!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" + +"libhttpd - Win32 Release" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" + cd ".\modules\aaa" + +"libhttpd - Win32 ReleaseCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ + CFG="libhttpd - Win32 Release" RECURSE=1 + cd ".\modules\aaa" + +!ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" + +"libhttpd - Win32 Debug" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" + cd ".\modules\aaa" + +"libhttpd - Win32 DebugCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\ + RECURSE=1 + cd ".\modules\aaa" + +!ENDIF + SOURCE=.\mod_auth_dbm.c DEP_CPP_MOD_A=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -336,13 +331,15 @@ DEP_CPP_MOD_A=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ "..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -354,11 +351,13 @@ DEP_CPP_MOD_A=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_A=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" diff --git a/modules/aaa/mod_auth_digest.mak b/modules/aaa/mod_auth_digest.mak index 56c0284a4b..34f3fc85ca 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 : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\ "libapr - Win32 Release" "$(OUTDIR)\mod_auth_digest.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\ + "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -139,14 +139,14 @@ ALL : "$(OUTDIR)\mod_auth_digest.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\ "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_digest.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\ + "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -231,12 +231,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_digest - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\aaa" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\aaa" @@ -244,12 +244,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\aaa" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\aaa" @@ -258,42 +258,14 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_auth_digest - Win32 Release" -"libhttpd - Win32 Release" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" - cd ".\modules\aaa" - -"libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ - CFG="libhttpd - Win32 Release" RECURSE=1 - cd ".\modules\aaa" - -!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" - -"libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" - cd ".\modules\aaa" - -"libhttpd - Win32 DebugCLEAN" : - cd "\test\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" - "libaprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -301,23 +273,51 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" "libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" !ENDIF +!IF "$(CFG)" == "mod_auth_digest - Win32 Release" + +"libhttpd - Win32 Release" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" + cd ".\modules\aaa" + +"libhttpd - Win32 ReleaseCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ + CFG="libhttpd - Win32 Release" RECURSE=1 + cd ".\modules\aaa" + +!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" + +"libhttpd - Win32 Debug" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" + cd ".\modules\aaa" + +"libhttpd - Win32 DebugCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\ + RECURSE=1 + cd ".\modules\aaa" + +!ENDIF + SOURCE=.\mod_auth_digest.c DEP_CPP_MOD_A=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ - "..\..\include\http_conf_globals.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -330,14 +330,16 @@ DEP_CPP_MOD_A=\ "..\..\include\util_md5.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_base64.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ - "..\..\srclib\apr-util\include\ap_sha1.h"\ + "..\..\srclib\apr-util\include\apr_base64.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apr_sha1.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -352,12 +354,14 @@ DEP_CPP_MOD_A=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ "..\..\srclib\apr\include\apr_xlate.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_A=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ ".\ap_config_auto.h"\ diff --git a/modules/cache/mod_file_cache.mak b/modules/cache/mod_file_cache.mak index 4358f98a69..18367e3d51 100644 --- a/modules/cache/mod_file_cache.mak +++ b/modules/cache/mod_file_cache.mak @@ -43,14 +43,13 @@ ALL : "$(OUTDIR)\mod_file_cache.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_file_cache.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_file_cache.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -117,7 +116,6 @@ LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_file_cache.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_file_cache.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -139,14 +137,13 @@ ALL : "$(OUTDIR)\mod_file_cache.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_file_cache.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_file_cache.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -214,7 +211,6 @@ LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_file_cache.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_file_cache.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -231,12 +227,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_file_cache - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\cache" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\cache" @@ -244,12 +240,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\cache" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\cache" @@ -259,12 +255,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_file_cache - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\cache" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\cache" @@ -272,51 +268,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\cache" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\cache" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\cache" - -!ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\cache" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\cache" - -!ENDIF - SOURCE=.\mod_file_cache.c DEP_CPP_MOD_F=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -328,15 +296,16 @@ DEP_CPP_MOD_F=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ - "..\..\srclib\apr\include\apr_lib.h"\ "..\..\srclib\apr\include\apr_lock.h"\ "..\..\srclib\apr\include\apr_mmap.h"\ "..\..\srclib\apr\include\apr_network_io.h"\ @@ -346,11 +315,13 @@ DEP_CPP_MOD_F=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_F=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_file_cache.obj" : $(SOURCE) $(DEP_CPP_MOD_F) "$(INTDIR)" diff --git a/modules/dav/fs/mod_dav_fs.mak b/modules/dav/fs/mod_dav_fs.mak index 493f0056ed..46e4ecabaf 100644 --- a/modules/dav/fs/mod_dav_fs.mak +++ b/modules/dav/fs/mod_dav_fs.mak @@ -42,16 +42,14 @@ ALL : "$(OUTDIR)\mod_dav_fs.so" !ELSE -ALL : "libaprutil - Win32 Release" "libexpat - Win32 Release"\ - "mod_dav - Win32 Release" "libapr - Win32 Release" "libhttpd - Win32 Release"\ - "$(OUTDIR)\mod_dav_fs.so" +ALL : "mod_dav - Win32 Release" "libhttpd - Win32 Release"\ + "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_dav_fs.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"\ - "mod_dav - Win32 ReleaseCLEAN" "libexpat - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\ + "libhttpd - Win32 ReleaseCLEAN" "mod_dav - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -128,7 +126,6 @@ LINK32_OBJS= \ "..\..\..\Release\libhttpd.lib" \ "..\..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\..\srclib\apr\Release\libapr.lib" \ - "..\..\..\srclib\expat-lite\Release\libexpat.lib" \ "..\main\Release\mod_dav.lib" "$(OUTDIR)\mod_dav_fs.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -150,16 +147,14 @@ ALL : "$(OUTDIR)\mod_dav_fs.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libexpat - Win32 Debug"\ - "mod_dav - Win32 Debug" "libapr - Win32 Debug" "libhttpd - Win32 Debug"\ - "$(OUTDIR)\mod_dav_fs.so" +ALL : "mod_dav - Win32 Debug" "libhttpd - Win32 Debug"\ + "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_dav_fs.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"\ - "mod_dav - Win32 DebugCLEAN" "libexpat - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\ + "libhttpd - Win32 DebugCLEAN" "mod_dav - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -237,7 +232,6 @@ LINK32_OBJS= \ "..\..\..\Debug\libhttpd.lib" \ "..\..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\..\srclib\apr\Debug\libapr.lib" \ - "..\..\..\srclib\expat-lite\Debug\libexpat.lib" \ "..\main\Debug\mod_dav.lib" "$(OUTDIR)\mod_dav_fs.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -254,32 +248,37 @@ SOURCE=.\dbm.c DEP_CPP_DBM_C=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ - "..\..\..\srclib\apr-util\include\apr_sdbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ "..\..\..\srclib\apr\include\apr_strings.h"\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ "..\main\mod_dav.h"\ ".\repos.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_DBM_C=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\dbm.obj" : $(SOURCE) $(DEP_CPP_DBM_C) "$(INTDIR)" @@ -289,34 +288,40 @@ SOURCE=.\lock.c DEP_CPP_LOCK_=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_log.h"\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ "..\..\..\srclib\apr\include\apr_strings.h"\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ "..\..\..\srclib\apr\include\apr_uuid.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ "..\main\mod_dav.h"\ ".\repos.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_LOCK_=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\lock.obj" : $(SOURCE) $(DEP_CPP_LOCK_) "$(INTDIR)" @@ -326,6 +331,7 @@ SOURCE=.\mod_dav_fs.c DEP_CPP_MOD_D=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_config.h"\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ @@ -333,25 +339,30 @@ DEP_CPP_MOD_D=\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ "..\main\mod_dav.h"\ ".\repos.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MOD_D=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_dav_fs.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" @@ -361,6 +372,7 @@ SOURCE=.\repos.c DEP_CPP_REPOS=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_log.h"\ "..\..\..\include\http_protocol.h"\ "..\..\..\include\http_request.h"\ @@ -370,17 +382,21 @@ DEP_CPP_REPOS=\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_buckets.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_dso.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_lock.h"\ "..\..\..\srclib\apr\include\apr_mmap.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ @@ -390,13 +406,15 @@ DEP_CPP_REPOS=\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ "..\main\mod_dav.h"\ ".\repos.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_REPOS=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\repos.obj" : $(SOURCE) $(DEP_CPP_REPOS) "$(INTDIR)" @@ -404,41 +422,13 @@ NODEP_CPP_REPOS=\ !IF "$(CFG)" == "mod_dav_fs - Win32 Release" -"libhttpd - Win32 Release" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" - cd ".\modules\dav\fs" - -"libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ - CFG="libhttpd - Win32 Release" RECURSE=1 - cd ".\modules\dav\fs" - -!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" - -"libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" - cd ".\modules\dav\fs" - -"libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\ - RECURSE=1 - cd ".\modules\dav\fs" - -!ENDIF - -!IF "$(CFG)" == "mod_dav_fs - Win32 Release" - "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\dav\fs" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\dav\fs" @@ -446,12 +436,12 @@ NODEP_CPP_REPOS=\ !ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\dav\fs" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\dav\fs" @@ -460,92 +450,86 @@ NODEP_CPP_REPOS=\ !IF "$(CFG)" == "mod_dav_fs - Win32 Release" -!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" - -!ENDIF - -!IF "$(CFG)" == "mod_dav_fs - Win32 Release" - -"mod_dav - Win32 Release" : - cd "\test\httpd-2.0\modules\dav\main" - $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release" - cd "..\fs" +"libaprutil - Win32 Release" : + cd "\clean\httpd-2.0\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ + + cd "..\..\modules\dav\fs" -"mod_dav - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\modules\dav\main" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release"\ - RECURSE=1 - cd "..\fs" +"libaprutil - Win32 ReleaseCLEAN" : + cd "\clean\httpd-2.0\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ + CFG="libaprutil - Win32 Release" RECURSE=1 + cd "..\..\modules\dav\fs" !ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" -"mod_dav - Win32 Debug" : - cd "\test\httpd-2.0\modules\dav\main" - $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug" - cd "..\fs" +"libaprutil - Win32 Debug" : + cd "\clean\httpd-2.0\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" + cd "..\..\modules\dav\fs" -"mod_dav - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\modules\dav\main" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug"\ - RECURSE=1 - cd "..\fs" +"libaprutil - Win32 DebugCLEAN" : + cd "\clean\httpd-2.0\srclib\apr-util" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ + CFG="libaprutil - Win32 Debug" RECURSE=1 + cd "..\..\modules\dav\fs" !ENDIF !IF "$(CFG)" == "mod_dav_fs - Win32 Release" -"libexpat - Win32 Release" : - cd "\test\httpd-2.0\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release" - cd "..\..\modules\dav\fs" +"libhttpd - Win32 Release" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" + cd ".\modules\dav\fs" -"libexpat - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\ - CFG="libexpat - Win32 Release" RECURSE=1 - cd "..\..\modules\dav\fs" +"libhttpd - Win32 ReleaseCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ + CFG="libhttpd - Win32 Release" RECURSE=1 + cd ".\modules\dav\fs" !ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" -"libexpat - Win32 Debug" : - cd "\test\httpd-2.0\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug" - cd "..\..\modules\dav\fs" +"libhttpd - Win32 Debug" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" + cd ".\modules\dav\fs" -"libexpat - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\expat-lite" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\ +"libhttpd - Win32 DebugCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\ RECURSE=1 - cd "..\..\modules\dav\fs" + cd ".\modules\dav\fs" !ENDIF !IF "$(CFG)" == "mod_dav_fs - Win32 Release" -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\dav\fs" +"mod_dav - Win32 Release" : + cd "\clean\httpd-2.0\modules\dav\main" + $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release" + cd "..\fs" -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\dav\fs" +"mod_dav - Win32 ReleaseCLEAN" : + cd "\clean\httpd-2.0\modules\dav\main" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release"\ + RECURSE=1 + cd "..\fs" !ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug" -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\dav\fs" +"mod_dav - Win32 Debug" : + cd "\clean\httpd-2.0\modules\dav\main" + $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug" + cd "..\fs" -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\dav\fs" +"mod_dav - Win32 DebugCLEAN" : + 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 diff --git a/modules/dav/main/mod_dav.mak b/modules/dav/main/mod_dav.mak index f93e967c72..c13d4e2238 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 : "libaprutil - Win32 Release" "libapr - Win32 Release"\ - "libhttpd - Win32 Release" "$(OUTDIR)\mod_dav.so" +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\ + "libapr - Win32 Release" "$(OUTDIR)\mod_dav.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\ + "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -150,14 +150,14 @@ ALL : "$(OUTDIR)\mod_dav.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libapr - Win32 Debug"\ - "libhttpd - Win32 Debug" "$(OUTDIR)\mod_dav.so" +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\ + "libapr - Win32 Debug" "$(OUTDIR)\mod_dav.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\ + "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -256,30 +256,36 @@ SOURCE=.\liveprop.c DEP_CPP_LIVEP=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ "..\..\..\srclib\apr\include\apr_strings.h"\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_LIVEP=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\liveprop.obj" : $(SOURCE) $(DEP_CPP_LIVEP) "$(INTDIR)" @@ -289,6 +295,7 @@ SOURCE=.\mod_dav.c DEP_CPP_MOD_D=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_config.h"\ "..\..\..\include\http_core.h"\ "..\..\..\include\http_log.h"\ @@ -303,13 +310,18 @@ DEP_CPP_MOD_D=\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_buckets.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_dso.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ @@ -323,12 +335,14 @@ DEP_CPP_MOD_D=\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_D=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_dav.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" @@ -338,6 +352,7 @@ SOURCE=.\props.c DEP_CPP_PROPS=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_log.h"\ "..\..\..\include\http_request.h"\ "..\..\..\include\httpd.h"\ @@ -346,16 +361,20 @@ DEP_CPP_PROPS=\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_buckets.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_mmap.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ @@ -363,12 +382,13 @@ DEP_CPP_PROPS=\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_PROPS=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\props.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)" @@ -378,29 +398,35 @@ SOURCE=.\providers.c DEP_CPP_PROVI=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_PROVI=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\providers.obj" : $(SOURCE) $(DEP_CPP_PROVI) "$(INTDIR)" @@ -410,30 +436,36 @@ SOURCE=.\std_liveprop.c DEP_CPP_STD_L=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ "..\..\..\srclib\apr\include\apr_pools.h"\ "..\..\..\srclib\apr\include\apr_strings.h"\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_STD_L=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\std_liveprop.obj" : $(SOURCE) $(DEP_CPP_STD_L) "$(INTDIR)" @@ -443,6 +475,7 @@ SOURCE=.\util.c DEP_CPP_UTIL_=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_config.h"\ "..\..\..\include\http_log.h"\ "..\..\..\include\http_protocol.h"\ @@ -455,13 +488,18 @@ DEP_CPP_UTIL_=\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_buckets.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_dso.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ @@ -475,12 +513,14 @@ DEP_CPP_UTIL_=\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_UTIL_=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" @@ -490,6 +530,7 @@ SOURCE=.\util_lock.c DEP_CPP_UTIL_L=\ "..\..\..\include\ap_config.h"\ "..\..\..\include\ap_mmn.h"\ + "..\..\..\include\ap_release.h"\ "..\..\..\include\http_config.h"\ "..\..\..\include\http_core.h"\ "..\..\..\include\http_log.h"\ @@ -497,21 +538,24 @@ DEP_CPP_UTIL_L=\ "..\..\..\include\httpd.h"\ "..\..\..\include\pcreposix.h"\ "..\..\..\include\util_cfgtree.h"\ - "..\..\..\include\util_filter.h"\ "..\..\..\include\util_uri.h"\ "..\..\..\include\util_xml.h"\ "..\..\..\os\win32\os.h"\ - "..\..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_buckets.h"\ "..\..\..\srclib\apr-util\include\apr_dbm.h"\ + "..\..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\..\srclib\apr-util\include\apr_xml.h"\ + "..\..\..\srclib\apr-util\include\apu.h"\ + "..\..\..\srclib\apr-util\include\apu_compat.h"\ "..\..\..\srclib\apr\include\apr.h"\ + "..\..\..\srclib\apr\include\apr_compat.h"\ "..\..\..\srclib\apr\include\apr_dso.h"\ "..\..\..\srclib\apr\include\apr_errno.h"\ + "..\..\..\srclib\apr\include\apr_file_info.h"\ "..\..\..\srclib\apr\include\apr_file_io.h"\ "..\..\..\srclib\apr\include\apr_general.h"\ "..\..\..\srclib\apr\include\apr_hash.h"\ - "..\..\..\srclib\apr\include\apr_lib.h"\ "..\..\..\srclib\apr\include\apr_lock.h"\ "..\..\..\srclib\apr\include\apr_mmap.h"\ "..\..\..\srclib\apr\include\apr_network_io.h"\ @@ -521,12 +565,14 @@ DEP_CPP_UTIL_L=\ "..\..\..\srclib\apr\include\apr_tables.h"\ "..\..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\..\srclib\apr\include\apr_time.h"\ - "..\..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\..\srclib\apr\include\apr_user.h"\ + "..\..\..\srclib\apr\include\apr_want.h"\ ".\mod_dav.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_UTIL_L=\ "..\..\..\include\ap_config_auto.h"\ - "..\..\..\include\ap_config_path.h"\ "$(INTDIR)\util_lock.obj" : $(SOURCE) $(DEP_CPP_UTIL_L) "$(INTDIR)" @@ -534,41 +580,13 @@ NODEP_CPP_UTIL_L=\ !IF "$(CFG)" == "mod_dav - Win32 Release" -"libhttpd - Win32 Release" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" - cd ".\modules\dav\main" - -"libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ - CFG="libhttpd - Win32 Release" RECURSE=1 - cd ".\modules\dav\main" - -!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug" - -"libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" - cd ".\modules\dav\main" - -"libhttpd - Win32 DebugCLEAN" : - cd "\test\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 "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\dav\main" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\dav\main" @@ -576,12 +594,12 @@ NODEP_CPP_UTIL_L=\ !ELSEIF "$(CFG)" == "mod_dav - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\dav\main" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\dav\main" @@ -591,13 +609,13 @@ NODEP_CPP_UTIL_L=\ !IF "$(CFG)" == "mod_dav - Win32 Release" "libaprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -605,18 +623,46 @@ NODEP_CPP_UTIL_L=\ !ELSEIF "$(CFG)" == "mod_dav - Win32 Debug" "libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" !ENDIF +!IF "$(CFG)" == "mod_dav - Win32 Release" + +"libhttpd - Win32 Release" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" + cd ".\modules\dav\main" + +"libhttpd - Win32 ReleaseCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ + CFG="libhttpd - Win32 Release" RECURSE=1 + cd ".\modules\dav\main" + +!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug" + +"libhttpd - Win32 Debug" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" + cd ".\modules\dav\main" + +"libhttpd - Win32 DebugCLEAN" : + cd "\clean\httpd-2.0" + $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - 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 bc2f152688..ec154f8603 100644 --- a/modules/generators/mod_info.mak +++ b/modules/generators/mod_info.mak @@ -41,14 +41,13 @@ ALL : "$(OUTDIR)\mod_info.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_info.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_info.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -114,7 +113,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_info.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -136,14 +134,12 @@ ALL : "$(OUTDIR)\mod_info.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_info.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_info.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -209,7 +205,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_info.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -226,12 +221,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_info - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\generators" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\generators" @@ -239,12 +234,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\generators" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\generators" @@ -254,12 +249,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_info - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\generators" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\generators" @@ -267,52 +262,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\generators" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\generators" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\generators" - -!ELSEIF "$(CFG)" == "mod_info - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\generators" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\generators" - -!ENDIF - SOURCE=.\mod_info.c DEP_CPP_MOD_I=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ - "..\..\include\http_conf_globals.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -321,16 +287,17 @@ DEP_CPP_MOD_I=\ "..\..\include\httpd.h"\ "..\..\include\pcreposix.h"\ "..\..\include\util_cfgtree.h"\ - "..\..\include\util_filter.h"\ "..\..\include\util_script.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -339,14 +306,17 @@ DEP_CPP_MOD_I=\ "..\..\srclib\apr\include\apr_network_io.h"\ "..\..\srclib\apr\include\apr_pools.h"\ "..\..\srclib\apr\include\apr_portable.h"\ + "..\..\srclib\apr\include\apr_strings.h"\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_I=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" diff --git a/modules/generators/mod_status.mak b/modules/generators/mod_status.mak index 9e65212968..af298b061e 100644 --- a/modules/generators/mod_status.mak +++ b/modules/generators/mod_status.mak @@ -42,14 +42,13 @@ ALL : "$(OUTDIR)\mod_status.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_status.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_status.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -65,8 +64,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D\ - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_status" /FD /c + "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I\ + "../../server/mpm/winnt" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\ + /Fd"$(INTDIR)\mod_status" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -115,7 +115,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_status.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_status.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -137,14 +136,12 @@ ALL : "$(OUTDIR)\mod_status.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_status.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_status.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -161,8 +158,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /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_status" /FD /c + "..\..\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 CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -211,7 +209,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_status.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_status.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -228,12 +225,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_status - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\generators" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\generators" @@ -241,12 +238,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\generators" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\generators" @@ -256,12 +253,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_status - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\generators" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\generators" @@ -269,70 +266,46 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\generators" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\generators" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\generators" - -!ELSEIF "$(CFG)" == "mod_status - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\generators" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\generators" - -!ENDIF - SOURCE=.\mod_status.c DEP_CPP_MOD_S=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ "..\..\include\http_protocol.h"\ "..\..\include\httpd.h"\ - "..\..\include\mpm_status.h"\ "..\..\include\pcreposix.h"\ + "..\..\include\scoreboard.h"\ "..\..\include\util_cfgtree.h"\ - "..\..\include\util_filter.h"\ + "..\..\include\util_script.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\server\mpm\winnt\mpm_default.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ - "..\..\srclib\apr\include\apr_lib.h"\ "..\..\srclib\apr\include\apr_lock.h"\ "..\..\srclib\apr\include\apr_mmap.h"\ "..\..\srclib\apr\include\apr_network_io.h"\ @@ -341,11 +314,13 @@ DEP_CPP_MOD_S=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_S=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" diff --git a/modules/mappers/mod_rewrite.mak b/modules/mappers/mod_rewrite.mak index bc916cc618..a34febf22b 100644 --- a/modules/mappers/mod_rewrite.mak +++ b/modules/mappers/mod_rewrite.mak @@ -42,14 +42,13 @@ ALL : "$(OUTDIR)\mod_rewrite.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_rewrite.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_rewrite.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -116,7 +115,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_rewrite.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_rewrite.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -138,14 +136,13 @@ ALL : "$(OUTDIR)\mod_rewrite.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_rewrite.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_rewrite.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -214,7 +211,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_rewrite.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_rewrite.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -231,12 +227,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_rewrite - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\mappers" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\mappers" @@ -244,12 +240,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\mappers" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\mappers" @@ -259,12 +255,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_rewrite - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\mappers" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\mappers" @@ -272,52 +268,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\mappers" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\mappers" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\mappers" - -!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\mappers" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\mappers" - -!ENDIF - SOURCE=.\mod_rewrite.c DEP_CPP_MOD_R=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ - "..\..\include\http_conf_globals.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -330,12 +297,14 @@ DEP_CPP_MOD_R=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_dso.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -344,17 +313,19 @@ DEP_CPP_MOD_R=\ "..\..\srclib\apr\include\apr_network_io.h"\ "..\..\srclib\apr\include\apr_pools.h"\ "..\..\srclib\apr\include\apr_portable.h"\ + "..\..\srclib\apr\include\apr_signal.h"\ "..\..\srclib\apr\include\apr_strings.h"\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ "..\..\srclib\apr\include\apr_user.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_want.h"\ ".\mod_rewrite.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ NODEP_CPP_MOD_R=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ ".\unixd.h"\ diff --git a/modules/mappers/mod_speling.mak b/modules/mappers/mod_speling.mak index 3c1b4d90a8..c43aabaaa4 100644 --- a/modules/mappers/mod_speling.mak +++ b/modules/mappers/mod_speling.mak @@ -42,14 +42,13 @@ ALL : "$(OUTDIR)\mod_speling.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_speling.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_speling.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -115,7 +114,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_speling.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_speling.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -137,14 +135,13 @@ ALL : "$(OUTDIR)\mod_speling.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_speling.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_speling.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -212,7 +209,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_speling.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_speling.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -229,12 +225,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_speling - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\mappers" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\mappers" @@ -242,12 +238,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\mappers" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\mappers" @@ -257,12 +253,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_speling - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\mappers" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\mappers" @@ -270,51 +266,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\mappers" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\mappers" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\mappers" - -!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\mappers" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\mappers" - -!ENDIF - SOURCE=.\mod_speling.c DEP_CPP_MOD_S=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ @@ -325,11 +293,13 @@ DEP_CPP_MOD_S=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -340,11 +310,12 @@ DEP_CPP_MOD_S=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MOD_S=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" diff --git a/modules/metadata/mod_cern_meta.mak b/modules/metadata/mod_cern_meta.mak index fd56ab50ef..7c311e2469 100644 --- a/modules/metadata/mod_cern_meta.mak +++ b/modules/metadata/mod_cern_meta.mak @@ -43,14 +43,13 @@ ALL : "$(OUTDIR)\mod_cern_meta.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_cern_meta.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_cern_meta.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -117,7 +116,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_cern_meta.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -139,14 +137,13 @@ ALL : "$(OUTDIR)\mod_cern_meta.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_cern_meta.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_cern_meta.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -214,7 +211,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_cern_meta.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -231,12 +227,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_cern_meta - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\metadata" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\metadata" @@ -244,12 +240,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\metadata" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\metadata" @@ -259,12 +255,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_cern_meta - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\metadata" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\metadata" @@ -272,51 +268,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\metadata" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\metadata" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\metadata" - -!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\metadata" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\metadata" - -!ENDIF - SOURCE=.\mod_cern_meta.c DEP_CPP_MOD_C=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_log.h"\ "..\..\include\http_request.h"\ @@ -327,11 +295,13 @@ DEP_CPP_MOD_C=\ "..\..\include\util_script.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -342,11 +312,12 @@ DEP_CPP_MOD_C=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MOD_C=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" diff --git a/modules/metadata/mod_expires.mak b/modules/metadata/mod_expires.mak index 9859f31fd0..9520ff0911 100644 --- a/modules/metadata/mod_expires.mak +++ b/modules/metadata/mod_expires.mak @@ -42,14 +42,13 @@ ALL : "$(OUTDIR)\mod_expires.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_expires.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_expires.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -115,7 +114,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_expires.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_expires.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -137,14 +135,13 @@ ALL : "$(OUTDIR)\mod_expires.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_expires.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_expires.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -212,7 +209,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_expires.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_expires.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -229,12 +225,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_expires - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\metadata" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\metadata" @@ -242,12 +238,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\metadata" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\metadata" @@ -257,12 +253,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_expires - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\metadata" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\metadata" @@ -270,51 +266,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\metadata" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\metadata" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\metadata" - -!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\metadata" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\metadata" - -!ENDIF - SOURCE=.\mod_expires.c DEP_CPP_MOD_E=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_log.h"\ "..\..\include\http_request.h"\ @@ -324,11 +292,13 @@ DEP_CPP_MOD_E=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -339,11 +309,12 @@ DEP_CPP_MOD_E=\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_thread_proc.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MOD_E=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" diff --git a/modules/metadata/mod_headers.mak b/modules/metadata/mod_headers.mak index c7f79c7c43..0b96e80fa2 100644 --- a/modules/metadata/mod_headers.mak +++ b/modules/metadata/mod_headers.mak @@ -42,14 +42,13 @@ ALL : "$(OUTDIR)\mod_headers.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_headers.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_headers.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -115,7 +114,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_headers.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_headers.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -137,14 +135,13 @@ ALL : "$(OUTDIR)\mod_headers.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_headers.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_headers.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -212,7 +209,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_headers.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_headers.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -229,12 +225,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_headers - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\metadata" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\metadata" @@ -242,12 +238,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\metadata" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\metadata" @@ -257,12 +253,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_headers - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\metadata" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\metadata" @@ -270,51 +266,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\metadata" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\metadata" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\metadata" - -!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\metadata" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\metadata" - -!ENDIF - SOURCE=.\mod_headers.c DEP_CPP_MOD_H=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ @@ -323,25 +291,27 @@ DEP_CPP_MOD_H=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ - "..\..\srclib\apr\include\apr_lib.h"\ "..\..\srclib\apr\include\apr_mmap.h"\ "..\..\srclib\apr\include\apr_network_io.h"\ "..\..\srclib\apr\include\apr_pools.h"\ "..\..\srclib\apr\include\apr_strings.h"\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MOD_H=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" diff --git a/modules/metadata/mod_usertrack.mak b/modules/metadata/mod_usertrack.mak index 0b2bfc425f..40663be7be 100644 --- a/modules/metadata/mod_usertrack.mak +++ b/modules/metadata/mod_usertrack.mak @@ -43,14 +43,13 @@ ALL : "$(OUTDIR)\mod_usertrack.so" !ELSE -ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\ - "libapr - Win32 Release" "$(OUTDIR)\mod_usertrack.so" +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\ + "$(OUTDIR)\mod_usertrack.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\ - "libaprutil - Win32 ReleaseCLEAN" +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -117,7 +116,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_usertrack.obj" \ "..\..\Release\libhttpd.lib" \ - "..\..\srclib\apr-util\Release\libaprutil.lib" \ "..\..\srclib\apr\Release\libapr.lib" "$(OUTDIR)\mod_usertrack.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -139,14 +137,13 @@ ALL : "$(OUTDIR)\mod_usertrack.so" !ELSE -ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\ - "libapr - Win32 Debug" "$(OUTDIR)\mod_usertrack.so" +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\ + "$(OUTDIR)\mod_usertrack.so" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\ - "libaprutil - Win32 DebugCLEAN" +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF @@ -214,7 +211,6 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ LINK32_OBJS= \ "$(INTDIR)\mod_usertrack.obj" \ "..\..\Debug\libhttpd.lib" \ - "..\..\srclib\apr-util\Debug\libaprutil.lib" \ "..\..\srclib\apr\Debug\libapr.lib" "$(OUTDIR)\mod_usertrack.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -231,12 +227,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_usertrack - Win32 Release" "libapr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" cd "..\..\modules\metadata" "libapr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\ RECURSE=1 cd "..\..\modules\metadata" @@ -244,12 +240,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" "libapr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" cd "..\..\modules\metadata" "libapr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\ RECURSE=1 cd "..\..\modules\metadata" @@ -259,12 +255,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "mod_usertrack - Win32 Release" "libhttpd - Win32 Release" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" cd ".\modules\metadata" "libhttpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\ CFG="libhttpd - Win32 Release" RECURSE=1 cd ".\modules\metadata" @@ -272,51 +268,23 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" "libhttpd - Win32 Debug" : - cd "\test\httpd-2.0" + cd "\clean\httpd-2.0" $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" cd ".\modules\metadata" "libhttpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" + 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" - -"libaprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\ - - cd "..\..\modules\metadata" - -"libaprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Release" RECURSE=1 - cd "..\..\modules\metadata" - -!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" - -"libaprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" - cd "..\..\modules\metadata" - -"libaprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\ - CFG="libaprutil - Win32 Debug" RECURSE=1 - cd "..\..\modules\metadata" - -!ENDIF - SOURCE=.\mod_usertrack.c DEP_CPP_MOD_U=\ "..\..\include\ap_config.h"\ "..\..\include\ap_mmn.h"\ + "..\..\include\ap_release.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_request.h"\ @@ -326,11 +294,13 @@ DEP_CPP_MOD_U=\ "..\..\include\util_filter.h"\ "..\..\include\util_uri.h"\ "..\..\os\win32\os.h"\ - "..\..\srclib\apr-util\include\ap_buckets.h"\ - "..\..\srclib\apr-util\include\ap_hooks.h"\ - "..\..\srclib\apr-util\include\ap_ring.h"\ + "..\..\srclib\apr-util\include\apr_buckets.h"\ + "..\..\srclib\apr-util\include\apr_hooks.h"\ + "..\..\srclib\apr-util\include\apr_ring.h"\ + "..\..\srclib\apr-util\include\apu.h"\ "..\..\srclib\apr\include\apr.h"\ "..\..\srclib\apr\include\apr_errno.h"\ + "..\..\srclib\apr\include\apr_file_info.h"\ "..\..\srclib\apr\include\apr_file_io.h"\ "..\..\srclib\apr\include\apr_general.h"\ "..\..\srclib\apr\include\apr_lib.h"\ @@ -340,11 +310,12 @@ DEP_CPP_MOD_U=\ "..\..\srclib\apr\include\apr_strings.h"\ "..\..\srclib\apr\include\apr_tables.h"\ "..\..\srclib\apr\include\apr_time.h"\ - "..\..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\..\srclib\apr\include\apr_user.h"\ + "..\..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_MOD_U=\ "..\..\include\ap_config_auto.h"\ - "..\..\include\ap_config_path.h"\ "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" diff --git a/server/gen_test_char.mak b/server/gen_test_char.mak index be19582c9d..9fd6e7d27b 100644 --- a/server/gen_test_char.mak +++ b/server/gen_test_char.mak @@ -52,6 +52,7 @@ CLEAN :"apr - Win32 ReleaseCLEAN" "aprutil - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF + -@erase "$(INTDIR)\gen_test_char.idb" -@erase "$(INTDIR)\gen_test_char.obj" -@erase "$(OUTDIR)\gen_test_char.exe" @@ -60,8 +61,8 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\srclib\apr\include" /I\ - "../srclib/apr-util/include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D\ - "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"Release\gen_test_char"/FD /c + "..\srclib\apr-util\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D\ + "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -147,7 +148,7 @@ CLEAN : 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\ + "..\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_OBJS=.\Debug/ @@ -211,12 +212,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "gen_test_char - Win32 Release" "apr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" cd "..\..\server" "apr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\ RECURSE=1 cd "..\..\server" @@ -224,12 +225,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug" "apr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" cd "..\..\server" "apr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\ cd "..\..\server" @@ -239,12 +240,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "gen_test_char - Win32 Release" "aprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -252,12 +253,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug" "aprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -268,13 +269,16 @@ SOURCE=.\gen_test_char.c DEP_CPP_GEN_T=\ "..\include\ap_config.h"\ "..\include\ap_mmn.h"\ + "..\include\ap_release.h"\ "..\include\httpd.h"\ "..\include\pcreposix.h"\ "..\include\util_uri.h"\ "..\os\win32\os.h"\ - "..\srclib\apr-util\include\ap_hooks.h"\ + "..\srclib\apr-util\include\apr_hooks.h"\ + "..\srclib\apr-util\include\apu.h"\ "..\srclib\apr\include\apr.h"\ "..\srclib\apr\include\apr_errno.h"\ + "..\srclib\apr\include\apr_file_info.h"\ "..\srclib\apr\include\apr_file_io.h"\ "..\srclib\apr\include\apr_general.h"\ "..\srclib\apr\include\apr_lib.h"\ @@ -282,11 +286,12 @@ DEP_CPP_GEN_T=\ "..\srclib\apr\include\apr_pools.h"\ "..\srclib\apr\include\apr_tables.h"\ "..\srclib\apr\include\apr_time.h"\ - "..\srclib\apr\network_io\os2\os2nerrno.h"\ + "..\srclib\apr\include\apr_user.h"\ + "..\srclib\apr\include\apr_want.h"\ + {$(INCLUDE)}"arpa\inet.h"\ NODEP_CPP_GEN_T=\ "..\include\ap_config_auto.h"\ - "..\include\ap_config_path.h"\ "$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)" diff --git a/server/gen_uri_delims.mak b/server/gen_uri_delims.mak index 3278c2021a..5084add7e0 100644 --- a/server/gen_uri_delims.mak +++ b/server/gen_uri_delims.mak @@ -43,16 +43,11 @@ ALL : "$(OUTDIR)\gen_uri_delims.exe" !ELSE -ALL : "aprutil - Win32 Release" "apr - Win32 Release"\ - "$(OUTDIR)\gen_uri_delims.exe" +ALL : "$(OUTDIR)\gen_uri_delims.exe" !ENDIF -!IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 ReleaseCLEAN" "aprutil - Win32 ReleaseCLEAN" -!ELSE CLEAN : -!ENDIF -@erase "$(INTDIR)\gen_uri_delims.idb" -@erase "$(INTDIR)\gen_uri_delims.obj" -@erase "$(OUTDIR)\gen_uri_delims.exe" @@ -106,9 +101,7 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no\ /pdb:"$(OUTDIR)\Release\gen_uri_delims.pdb" /machine:I386\ /out:"$(OUTDIR)\gen_uri_delims.exe" LINK32_OBJS= \ - "$(INTDIR)\gen_uri_delims.obj" \ - "..\srclib\apr-util\LibR\aprutil.lib" \ - "..\srclib\apr\LibR\apr.lib" + "$(INTDIR)\gen_uri_delims.obj" "$(OUTDIR)\gen_uri_delims.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -129,16 +122,11 @@ ALL : "$(OUTDIR)\gen_uri_delims.exe" !ELSE -ALL : "aprutil - Win32 Debug" "apr - Win32 Debug"\ - "$(OUTDIR)\gen_uri_delims.exe" +ALL : "$(OUTDIR)\gen_uri_delims.exe" !ENDIF -!IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 DebugCLEAN" "aprutil - Win32 DebugCLEAN" -!ELSE CLEAN : -!ENDIF -@erase "$(INTDIR)\gen_uri_delims.idb" -@erase "$(INTDIR)\gen_uri_delims.obj" -@erase "$(OUTDIR)\Debug\gen_uri_delims.pdb" @@ -193,9 +181,7 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no\ /pdb:"$(OUTDIR)\Debug\gen_uri_delims.pdb" /debug /machine:I386\ /out:"$(OUTDIR)\gen_uri_delims.exe" LINK32_OBJS= \ - "$(INTDIR)\gen_uri_delims.obj" \ - "..\srclib\apr-util\LibD\aprutil.lib" \ - "..\srclib\apr\LibD\apr.lib" + "$(INTDIR)\gen_uri_delims.obj" "$(OUTDIR)\gen_uri_delims.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -207,63 +193,6 @@ LINK32_OBJS= \ !IF "$(CFG)" == "gen_uri_delims - Win32 Release" || "$(CFG)" ==\ "gen_uri_delims - Win32 Debug" - -!IF "$(CFG)" == "gen_uri_delims - Win32 Release" - -"apr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" - cd "..\..\server" - -"apr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\ - RECURSE=1 - cd "..\..\server" - -!ELSEIF "$(CFG)" == "gen_uri_delims - Win32 Debug" - -"apr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" - cd "..\..\server" - -"apr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\ - - cd "..\..\server" - -!ENDIF - -!IF "$(CFG)" == "gen_uri_delims - Win32 Release" - -"aprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" - cd "..\..\server" - -"aprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\ - RECURSE=1 - cd "..\..\server" - -!ELSEIF "$(CFG)" == "gen_uri_delims - Win32 Debug" - -"aprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" - cd "..\..\server" - -"aprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\ - RECURSE=1 - cd "..\..\server" - -!ENDIF - SOURCE=.\gen_uri_delims.c "$(INTDIR)\gen_uri_delims.obj" : $(SOURCE) "$(INTDIR)" diff --git a/srclib/expat-lite/libexpat.mak b/srclib/expat-lite/libexpat.mak index 912afaa7c0..7ab0154f60 100644 --- a/srclib/expat-lite/libexpat.mak +++ b/srclib/expat-lite/libexpat.mak @@ -234,9 +234,18 @@ SOURCE=".\hashtable.c" DEP_CPP_HASHT=\ ".\hashtable.h"\ ".\xmldef.h"\ + {$(INCLUDE)}"ap_config.h"\ + {$(INCLUDE)}"ap_ctype.h"\ + {$(INCLUDE)}"ap_mmn.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + {$(INCLUDE)}"hsregex.h"\ + {$(INCLUDE)}"netdb.h"\ + {$(INCLUDE)}"os.h"\ + {$(INCLUDE)}"sys\socket.h"\ NODEP_CPP_HASHT=\ - ".\ap_config.h"\ + "..\..\..\..\apache\include\ap_config_auto.h"\ ".\nspr.h"\ @@ -250,9 +259,18 @@ DEP_CPP_XMLPA=\ ".\xmlparse.h"\ ".\xmlrole.h"\ ".\xmltok.h"\ + {$(INCLUDE)}"ap_config.h"\ + {$(INCLUDE)}"ap_ctype.h"\ + {$(INCLUDE)}"ap_mmn.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + {$(INCLUDE)}"hsregex.h"\ + {$(INCLUDE)}"netdb.h"\ + {$(INCLUDE)}"os.h"\ + {$(INCLUDE)}"sys\socket.h"\ NODEP_CPP_XMLPA=\ - ".\ap_config.h"\ + "..\..\..\..\apache\include\ap_config_auto.h"\ ".\nspr.h"\ @@ -264,9 +282,18 @@ DEP_CPP_XMLRO=\ ".\xmldef.h"\ ".\xmlrole.h"\ ".\xmltok.h"\ + {$(INCLUDE)}"ap_config.h"\ + {$(INCLUDE)}"ap_ctype.h"\ + {$(INCLUDE)}"ap_mmn.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + {$(INCLUDE)}"hsregex.h"\ + {$(INCLUDE)}"netdb.h"\ + {$(INCLUDE)}"os.h"\ + {$(INCLUDE)}"sys\socket.h"\ NODEP_CPP_XMLRO=\ - ".\ap_config.h"\ + "..\..\..\..\apache\include\ap_config_auto.h"\ ".\nspr.h"\ @@ -285,9 +312,18 @@ DEP_CPP_XMLTO=\ ".\xmltok_impl.c"\ ".\xmltok_impl.h"\ ".\xmltok_ns.c"\ + {$(INCLUDE)}"ap_config.h"\ + {$(INCLUDE)}"ap_ctype.h"\ + {$(INCLUDE)}"ap_mmn.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"dirent.h"\ + {$(INCLUDE)}"hsregex.h"\ + {$(INCLUDE)}"netdb.h"\ + {$(INCLUDE)}"os.h"\ + {$(INCLUDE)}"sys\socket.h"\ NODEP_CPP_XMLTO=\ - ".\ap_config.h"\ + "..\..\..\..\apache\include\ap_config_auto.h"\ ".\nspr.h"\ diff --git a/srclib/pcre/dftables.mak b/srclib/pcre/dftables.mak index 4d9216d435..1b8e847689 100644 --- a/srclib/pcre/dftables.mak +++ b/srclib/pcre/dftables.mak @@ -55,7 +55,7 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"\ +CPP_PROJ=/nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. diff --git a/support/ab.mak b/support/ab.mak index aa9e311edd..02f83e8d0e 100644 --- a/support/ab.mak +++ b/support/ab.mak @@ -39,14 +39,12 @@ ALL : "$(OUTDIR)\ab.exe" !ELSE -ALL : "aprutil - Win32 Release" "httpd - Win32 Release" "apr - Win32 Release"\ - "$(OUTDIR)\ab.exe" +ALL : "aprutil - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\ab.exe" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 ReleaseCLEAN" "httpd - Win32 ReleaseCLEAN"\ - "aprutil - Win32 ReleaseCLEAN" +CLEAN :"apr - Win32 ReleaseCLEAN" "aprutil - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -60,9 +58,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ab" /FD /c + "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\ + "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ab"\ + /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -107,7 +105,6 @@ LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ /map:"$(INTDIR)\ab.map" /machine:I386 /out:"$(OUTDIR)\ab.exe" LINK32_OBJS= \ "$(INTDIR)\ab.obj" \ - "..\LibR\httpd.lib" \ "..\srclib\apr-util\LibR\aprutil.lib" \ "..\srclib\apr\LibR\apr.lib" @@ -130,21 +127,19 @@ ALL : "$(OUTDIR)\ab.exe" !ELSE -ALL : "aprutil - Win32 Debug" "httpd - Win32 Debug" "apr - Win32 Debug"\ - "$(OUTDIR)\ab.exe" +ALL : "aprutil - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\ab.exe" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 DebugCLEAN" "httpd - Win32 DebugCLEAN"\ - "aprutil - Win32 DebugCLEAN" +CLEAN :"apr - Win32 DebugCLEAN" "aprutil - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF -@erase "$(INTDIR)\ab.idb" -@erase "$(INTDIR)\ab.obj" -@erase "$(OUTDIR)\ab.exe" - -@erase "$(OUTDIR)\ab.ilk" + -@erase "$(OUTDIR)\ab.map" -@erase "$(OUTDIR)\ab.pdb" "$(OUTDIR)" : @@ -152,9 +147,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ab" /FD /c + "../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 CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -195,11 +190,10 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ - /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\ab.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ab.exe" /pdbtype:sept + /subsystem:console /incremental:no /pdb:"$(OUTDIR)\ab.pdb"\ + /map:"$(INTDIR)\ab.map" /debug /machine:I386 /out:"$(OUTDIR)\ab.exe" LINK32_OBJS= \ "$(INTDIR)\ab.obj" \ - "..\LibD\httpd.lib" \ "..\srclib\apr-util\LibD\aprutil.lib" \ "..\srclib\apr\LibD\apr.lib" @@ -216,12 +210,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "ab - Win32 Release" "apr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" cd "..\..\support" "apr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\ RECURSE=1 cd "..\..\support" @@ -229,12 +223,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "ab - Win32 Debug" "apr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" cd "..\..\support" "apr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\ cd "..\..\support" @@ -243,41 +237,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "ab - Win32 Release" -"httpd - Win32 Release" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\httpd.mak" CFG="httpd - Win32 Release" - cd ".\support" - -"httpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\httpd.mak" CFG="httpd - Win32 Release"\ - RECURSE=1 - cd ".\support" - -!ELSEIF "$(CFG)" == "ab - Win32 Debug" - -"httpd - Win32 Debug" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\httpd.mak" CFG="httpd - Win32 Debug" - cd ".\support" - -"httpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\httpd.mak" CFG="httpd - Win32 Debug"\ - RECURSE=1 - cd ".\support" - -!ENDIF - -!IF "$(CFG)" == "ab - Win32 Release" - "aprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -285,12 +251,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "ab - Win32 Debug" "aprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -299,13 +265,11 @@ LINK32_OBJS= \ SOURCE=.\ab.c DEP_CPP_AB_C0=\ - "..\include\ap_config.h"\ - "..\include\ap_mmn.h"\ - "..\os\win32\os.h"\ - "..\srclib\apr-util\include\ap_base64.h"\ - "..\srclib\apr-util\include\ap_hooks.h"\ + "..\srclib\apr-util\include\apr_base64.h"\ + "..\srclib\apr-util\include\apu.h"\ "..\srclib\apr\include\apr.h"\ "..\srclib\apr\include\apr_errno.h"\ + "..\srclib\apr\include\apr_file_info.h"\ "..\srclib\apr\include\apr_file_io.h"\ "..\srclib\apr\include\apr_general.h"\ "..\srclib\apr\include\apr_getopt.h"\ @@ -313,14 +277,11 @@ DEP_CPP_AB_C0=\ "..\srclib\apr\include\apr_network_io.h"\ "..\srclib\apr\include\apr_pools.h"\ "..\srclib\apr\include\apr_strings.h"\ - "..\srclib\apr\include\apr_tables.h"\ "..\srclib\apr\include\apr_time.h"\ + "..\srclib\apr\include\apr_user.h"\ + "..\srclib\apr\include\apr_want.h"\ "..\srclib\apr\include\apr_xlate.h"\ - "..\srclib\apr\network_io\os2\os2nerrno.h"\ - -NODEP_CPP_AB_C0=\ - "..\include\ap_config_auto.h"\ - "..\include\ap_config_path.h"\ + {$(INCLUDE)}"arpa\inet.h"\ "$(INTDIR)\ab.obj" : $(SOURCE) $(DEP_CPP_AB_C0) "$(INTDIR)" diff --git a/support/htdigest.mak b/support/htdigest.mak index 5cab25f163..f617b30fb3 100644 --- a/support/htdigest.mak +++ b/support/htdigest.mak @@ -60,9 +60,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest" /FD /c + "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\ + "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\ + /Fd"$(INTDIR)\htdigest" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -141,7 +141,7 @@ CLEAN : -@erase "$(INTDIR)\htdigest.idb" -@erase "$(INTDIR)\htdigest.obj" -@erase "$(OUTDIR)\htdigest.exe" - -@erase "$(OUTDIR)\htdigest.ilk" + -@erase "$(OUTDIR)\htdigest.map" -@erase "$(OUTDIR)\htdigest.pdb" "$(OUTDIR)" : @@ -149,9 +149,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest" /FD /c + "../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 CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -192,8 +192,9 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ - /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\htdigest.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\htdigest.exe" /pdbtype:sept + /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htdigest.pdb"\ + /map:"$(INTDIR)\htdigest.map" /debug /machine:I386\ + /out:"$(OUTDIR)\htdigest.exe" LINK32_OBJS= \ "$(INTDIR)\htdigest.obj" \ "..\srclib\apr-util\LibD\aprutil.lib" \ @@ -213,12 +214,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "htdigest - Win32 Release" "apr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" cd "..\..\support" "apr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\ RECURSE=1 cd "..\..\support" @@ -226,12 +227,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "htdigest - Win32 Debug" "apr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" cd "..\..\support" "apr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\ cd "..\..\support" @@ -241,12 +242,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "htdigest - Win32 Release" "aprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -254,12 +255,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "htdigest - Win32 Debug" "aprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -270,14 +271,18 @@ SOURCE=.\htdigest.c DEP_CPP_HTDIG=\ "..\srclib\apr\include\apr.h"\ "..\srclib\apr\include\apr_errno.h"\ + "..\srclib\apr\include\apr_file_info.h"\ "..\srclib\apr\include\apr_file_io.h"\ "..\srclib\apr\include\apr_general.h"\ "..\srclib\apr\include\apr_lib.h"\ "..\srclib\apr\include\apr_md5.h"\ "..\srclib\apr\include\apr_pools.h"\ + "..\srclib\apr\include\apr_signal.h"\ "..\srclib\apr\include\apr_time.h"\ + "..\srclib\apr\include\apr_user.h"\ + "..\srclib\apr\include\apr_want.h"\ "..\srclib\apr\include\apr_xlate.h"\ - "..\srclib\apr\network_io\os2\os2nerrno.h"\ + {$(INCLUDE)}"arpa\inet.h"\ "$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)" diff --git a/support/htpasswd.mak b/support/htpasswd.mak index e103d93cea..ea68acd91f 100644 --- a/support/htpasswd.mak +++ b/support/htpasswd.mak @@ -41,14 +41,12 @@ ALL : "$(OUTDIR)\htpasswd.exe" !ELSE -ALL : "aprutil - Win32 Release" "httpd - Win32 Release" "apr - Win32 Release"\ - "$(OUTDIR)\htpasswd.exe" +ALL : "aprutil - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\htpasswd.exe" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 ReleaseCLEAN" "httpd - Win32 ReleaseCLEAN"\ - "aprutil - Win32 ReleaseCLEAN" +CLEAN :"apr - Win32 ReleaseCLEAN" "aprutil - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF @@ -62,9 +60,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd" /FD /c + "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\ + "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\ + /Fd"$(INTDIR)\htpasswd" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -109,7 +107,6 @@ LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ /map:"$(INTDIR)\htpasswd.map" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\htpasswd.obj" \ - "..\LibR\httpd.lib" \ "..\srclib\apr-util\LibR\aprutil.lib" \ "..\srclib\apr\LibR\apr.lib" @@ -132,21 +129,19 @@ ALL : "$(OUTDIR)\htpasswd.exe" !ELSE -ALL : "aprutil - Win32 Debug" "httpd - Win32 Debug" "apr - Win32 Debug"\ - "$(OUTDIR)\htpasswd.exe" +ALL : "aprutil - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\htpasswd.exe" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 DebugCLEAN" "httpd - Win32 DebugCLEAN"\ - "aprutil - Win32 DebugCLEAN" +CLEAN :"apr - Win32 DebugCLEAN" "aprutil - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF -@erase "$(INTDIR)\htpasswd.idb" -@erase "$(INTDIR)\htpasswd.obj" -@erase "$(OUTDIR)\htpasswd.exe" - -@erase "$(OUTDIR)\htpasswd.ilk" + -@erase "$(OUTDIR)\htpasswd.map" -@erase "$(OUTDIR)\htpasswd.pdb" "$(OUTDIR)" : @@ -154,9 +149,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd" /FD /c + "../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 CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -197,11 +192,11 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ - /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept + /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb"\ + /map:"$(INTDIR)\htpasswd.map" /debug /machine:I386\ + /out:"$(OUTDIR)\htpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\htpasswd.obj" \ - "..\LibD\httpd.lib" \ "..\srclib\apr-util\LibD\aprutil.lib" \ "..\srclib\apr\LibD\apr.lib" @@ -219,12 +214,12 @@ LINK32_OBJS= \ !IF "$(CFG)" == "htpasswd - Win32 Release" "apr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" cd "..\..\support" "apr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\ RECURSE=1 cd "..\..\support" @@ -232,12 +227,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" "apr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" cd "..\..\support" "apr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" + cd "\clean\httpd-2.0\srclib\apr" $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\ cd "..\..\support" @@ -246,41 +241,13 @@ LINK32_OBJS= \ !IF "$(CFG)" == "htpasswd - Win32 Release" -"httpd - Win32 Release" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\httpd.mak" CFG="httpd - Win32 Release" - cd ".\support" - -"httpd - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\httpd.mak" CFG="httpd - Win32 Release"\ - RECURSE=1 - cd ".\support" - -!ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" - -"httpd - Win32 Debug" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) /F ".\httpd.mak" CFG="httpd - Win32 Debug" - cd ".\support" - -"httpd - Win32 DebugCLEAN" : - cd "\test\httpd-2.0" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\httpd.mak" CFG="httpd - Win32 Debug"\ - RECURSE=1 - cd ".\support" - -!ENDIF - -!IF "$(CFG)" == "htpasswd - Win32 Release" - "aprutil - Win32 Release" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -288,12 +255,12 @@ LINK32_OBJS= \ !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" "aprutil - Win32 Debug" : - cd "\test\httpd-2.0\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 "\test\httpd-2.0\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" @@ -302,27 +269,23 @@ LINK32_OBJS= \ SOURCE=.\htpasswd.c DEP_CPP_HTPAS=\ - "..\include\ap_config.h"\ - "..\include\ap_mmn.h"\ - "..\os\win32\os.h"\ - "..\srclib\apr-util\include\ap_hooks.h"\ - "..\srclib\apr-util\include\ap_sha1.h"\ + "..\srclib\apr-util\include\apr_sha1.h"\ + "..\srclib\apr-util\include\apu.h"\ "..\srclib\apr\include\apr.h"\ "..\srclib\apr\include\apr_errno.h"\ + "..\srclib\apr\include\apr_file_info.h"\ "..\srclib\apr\include\apr_file_io.h"\ "..\srclib\apr\include\apr_general.h"\ "..\srclib\apr\include\apr_lib.h"\ "..\srclib\apr\include\apr_md5.h"\ "..\srclib\apr\include\apr_pools.h"\ + "..\srclib\apr\include\apr_signal.h"\ "..\srclib\apr\include\apr_strings.h"\ - "..\srclib\apr\include\apr_tables.h"\ "..\srclib\apr\include\apr_time.h"\ + "..\srclib\apr\include\apr_user.h"\ + "..\srclib\apr\include\apr_want.h"\ "..\srclib\apr\include\apr_xlate.h"\ - "..\srclib\apr\network_io\os2\os2nerrno.h"\ - -NODEP_CPP_HTPAS=\ - "..\include\ap_config_auto.h"\ - "..\include\ap_config_path.h"\ + {$(INCLUDE)}"arpa\inet.h"\ "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)" diff --git a/support/logresolve.mak b/support/logresolve.mak index baa5f77969..3b92c3b432 100644 --- a/support/logresolve.mak +++ b/support/logresolve.mak @@ -42,16 +42,11 @@ ALL : "$(OUTDIR)\logresolve.exe" !ELSE -ALL : "aprutil - Win32 Release" "apr - Win32 Release"\ - "$(OUTDIR)\logresolve.exe" +ALL : "$(OUTDIR)\logresolve.exe" !ENDIF -!IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 ReleaseCLEAN" "aprutil - Win32 ReleaseCLEAN" -!ELSE CLEAN : -!ENDIF -@erase "$(INTDIR)\logresolve.idb" -@erase "$(INTDIR)\logresolve.obj" -@erase "$(OUTDIR)\logresolve.exe" @@ -62,9 +57,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\logresolve" /FD /c + "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\ + "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\ + /Fd"$(INTDIR)\logresolve" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -108,9 +103,7 @@ LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ /subsystem:console /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb"\ /map:"$(INTDIR)\logresolve.map" /machine:I386 /out:"$(OUTDIR)\logresolve.exe" LINK32_OBJS= \ - "$(INTDIR)\logresolve.obj" \ - "..\srclib\apr-util\LibR\aprutil.lib" \ - "..\srclib\apr\LibR\apr.lib" + "$(INTDIR)\logresolve.obj" "$(OUTDIR)\logresolve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -131,19 +124,15 @@ ALL : "$(OUTDIR)\logresolve.exe" !ELSE -ALL : "aprutil - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\logresolve.exe" +ALL : "$(OUTDIR)\logresolve.exe" !ENDIF -!IF "$(RECURSE)" == "1" -CLEAN :"apr - Win32 DebugCLEAN" "aprutil - Win32 DebugCLEAN" -!ELSE CLEAN : -!ENDIF -@erase "$(INTDIR)\logresolve.idb" -@erase "$(INTDIR)\logresolve.obj" -@erase "$(OUTDIR)\logresolve.exe" - -@erase "$(OUTDIR)\logresolve.ilk" + -@erase "$(OUTDIR)\logresolve.map" -@erase "$(OUTDIR)\logresolve.pdb" "$(OUTDIR)" : @@ -151,9 +140,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\logresolve" /FD /c + "../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 CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -194,12 +183,11 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ - /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\logresolve.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\logresolve.exe" /pdbtype:sept + /subsystem:console /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb"\ + /map:"$(INTDIR)\logresolve.map" /debug /machine:I386\ + /out:"$(OUTDIR)\logresolve.exe" LINK32_OBJS= \ - "$(INTDIR)\logresolve.obj" \ - "..\srclib\apr-util\LibD\aprutil.lib" \ - "..\srclib\apr\LibD\apr.lib" + "$(INTDIR)\logresolve.obj" "$(OUTDIR)\logresolve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -211,80 +199,14 @@ LINK32_OBJS= \ !IF "$(CFG)" == "logresolve - Win32 Release" || "$(CFG)" ==\ "logresolve - Win32 Debug" - -!IF "$(CFG)" == "logresolve - Win32 Release" - -"apr - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" - cd "..\..\support" - -"apr - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\ - RECURSE=1 - cd "..\..\support" - -!ELSEIF "$(CFG)" == "logresolve - Win32 Debug" - -"apr - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" - cd "..\..\support" - -"apr - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\ - - cd "..\..\support" - -!ENDIF - -!IF "$(CFG)" == "logresolve - Win32 Release" - -"aprutil - Win32 Release" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" - cd "..\..\support" - -"aprutil - Win32 ReleaseCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\ - RECURSE=1 - cd "..\..\support" - -!ELSEIF "$(CFG)" == "logresolve - Win32 Debug" - -"aprutil - Win32 Debug" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" - cd "..\..\support" - -"aprutil - Win32 DebugCLEAN" : - cd "\test\httpd-2.0\srclib\apr-util" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\ - RECURSE=1 - cd "..\..\support" - -!ENDIF - SOURCE=.\logresolve.c DEP_CPP_LOGRE=\ - "..\include\ap_config.h"\ - "..\include\ap_mmn.h"\ - "..\os\win32\os.h"\ - "..\srclib\apr-util\include\ap_hooks.h"\ "..\srclib\apr\include\apr.h"\ "..\srclib\apr\include\apr_errno.h"\ - "..\srclib\apr\include\apr_general.h"\ "..\srclib\apr\include\apr_lib.h"\ - "..\srclib\apr\include\apr_pools.h"\ - "..\srclib\apr\include\apr_tables.h"\ - "..\srclib\apr\network_io\os2\os2nerrno.h"\ - -NODEP_CPP_LOGRE=\ - "..\include\ap_config_auto.h"\ - "..\include\ap_config_path.h"\ + {$(INCLUDE)}"arpa\inet.h"\ + {$(INCLUDE)}"netdb.h"\ + {$(INCLUDE)}"sys\socket.h"\ "$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)" diff --git a/support/rotatelogs.mak b/support/rotatelogs.mak index e6d2eb7936..e96167867a 100644 --- a/support/rotatelogs.mak +++ b/support/rotatelogs.mak @@ -57,9 +57,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MD /W3 /O2 /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs" /FD /c + "../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\ + "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\ + /Fd"$(INTDIR)\rotatelogs" /FD /c CPP_OBJS=.\Release/ CPP_SBRS=. @@ -132,7 +132,7 @@ CLEAN : -@erase "$(INTDIR)\rotatelogs.idb" -@erase "$(INTDIR)\rotatelogs.obj" -@erase "$(OUTDIR)\rotatelogs.exe" - -@erase "$(OUTDIR)\rotatelogs.ilk" + -@erase "$(OUTDIR)\rotatelogs.map" -@erase "$(OUTDIR)\rotatelogs.pdb" "$(OUTDIR)" : @@ -140,9 +140,9 @@ CLEAN : CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\ - "../srclib/apr-util/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs" /FD /c + "../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 CPP_OBJS=.\Debug/ CPP_SBRS=. @@ -183,8 +183,9 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo\ - /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\rotatelogs.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept + /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb"\ + /map:"$(INTDIR)\rotatelogs.map" /debug /machine:I386\ + /out:"$(OUTDIR)\rotatelogs.exe" LINK32_OBJS= \ "$(INTDIR)\rotatelogs.obj" @@ -200,21 +201,7 @@ LINK32_OBJS= \ "rotatelogs - Win32 Debug" SOURCE=.\rotatelogs.c DEP_CPP_ROTAT=\ - "..\include\ap_config.h"\ - "..\include\ap_mmn.h"\ - "..\os\win32\os.h"\ - "..\srclib\apr-util\include\ap_hooks.h"\ "..\srclib\apr\include\apr.h"\ - "..\srclib\apr\include\apr_errno.h"\ - "..\srclib\apr\include\apr_general.h"\ - "..\srclib\apr\include\apr_lib.h"\ - "..\srclib\apr\include\apr_pools.h"\ - "..\srclib\apr\include\apr_tables.h"\ - "..\srclib\apr\network_io\os2\os2nerrno.h"\ - -NODEP_CPP_ROTAT=\ - "..\include\ap_config_auto.h"\ - "..\include\ap_config_path.h"\ "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)" |