Refreshing the .mak files. Dang... should have done this in the a.m.

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

diff --git a/libhttpd.mak b/libhttpd.mak
index 7ce46a97edc4e5e00fa58671b2cc04d3b2e0df25..96af42eb7bee2c1d67224b570e2c6d954b609022 100644 (file)
--- a/libhttpd.mak
+++ b/libhttpd.mak
@@ -58,6 +58,7 @@ CLEAN :
        -@erase "$(INTDIR)\buildmark.obj"
        -@erase "$(INTDIR)\config.obj"
        -@erase "$(INTDIR)\connection.obj"
+       -@erase "$(INTDIR)\core.obj"
        -@erase "$(INTDIR)\error_bucket.obj"
        -@erase "$(INTDIR)\http_core.obj"
        -@erase "$(INTDIR)\http_protocol.obj"
@@ -85,7 +86,9 @@ CLEAN :
        -@erase "$(INTDIR)\mod_userdir.obj"
        -@erase "$(INTDIR)\modules.obj"
        -@erase "$(INTDIR)\mpm_winnt.obj"
+       -@erase "$(INTDIR)\protocol.obj"
        -@erase "$(INTDIR)\registry.obj"
+       -@erase "$(INTDIR)\request.obj"
        -@erase "$(INTDIR)\rfc1413.obj"
        -@erase "$(INTDIR)\scoreboard.obj"
        -@erase "$(INTDIR)\service.obj"
@@ -110,8 +113,8 @@ CLEAN :
 CPP=cl.exe
 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"$(INTDIR)\libhttpd" /FD /c 
+ "./os/win32" /I "./modules/http" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
+ "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /c 
 CPP_OBJS=.\Release/
 CPP_SBRS=.
 
@@ -161,6 +164,7 @@ LINK32_OBJS= \
        "$(INTDIR)\buildmark.obj" \
        "$(INTDIR)\config.obj" \
        "$(INTDIR)\connection.obj" \
+       "$(INTDIR)\core.obj" \
        "$(INTDIR)\error_bucket.obj" \
        "$(INTDIR)\http_core.obj" \
        "$(INTDIR)\http_protocol.obj" \
@@ -187,7 +191,9 @@ LINK32_OBJS= \
        "$(INTDIR)\mod_userdir.obj" \
        "$(INTDIR)\modules.obj" \
        "$(INTDIR)\mpm_winnt.obj" \
+       "$(INTDIR)\protocol.obj" \
        "$(INTDIR)\registry.obj" \
+       "$(INTDIR)\request.obj" \
        "$(INTDIR)\rfc1413.obj" \
        "$(INTDIR)\scoreboard.obj" \
        "$(INTDIR)\service.obj" \
@@ -243,6 +249,7 @@ CLEAN :
        -@erase "$(INTDIR)\buildmark.obj"
        -@erase "$(INTDIR)\config.obj"
        -@erase "$(INTDIR)\connection.obj"
+       -@erase "$(INTDIR)\core.obj"
        -@erase "$(INTDIR)\error_bucket.obj"
        -@erase "$(INTDIR)\http_core.obj"
        -@erase "$(INTDIR)\http_protocol.obj"
@@ -270,7 +277,9 @@ CLEAN :
        -@erase "$(INTDIR)\mod_userdir.obj"
        -@erase "$(INTDIR)\modules.obj"
        -@erase "$(INTDIR)\mpm_winnt.obj"
+       -@erase "$(INTDIR)\protocol.obj"
        -@erase "$(INTDIR)\registry.obj"
+       -@erase "$(INTDIR)\request.obj"
        -@erase "$(INTDIR)\rfc1413.obj"
        -@erase "$(INTDIR)\scoreboard.obj"
        -@erase "$(INTDIR)\service.obj"
@@ -296,8 +305,8 @@ CLEAN :
 CPP=cl.exe
 CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\srclib\apr\include"\
  /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite"\
- /I "./os/win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /c 
+ /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
+ "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /c 
 CPP_OBJS=.\Debug/
 CPP_SBRS=.
 
@@ -348,6 +357,7 @@ LINK32_OBJS= \
        "$(INTDIR)\buildmark.obj" \
        "$(INTDIR)\config.obj" \
        "$(INTDIR)\connection.obj" \
+       "$(INTDIR)\core.obj" \
        "$(INTDIR)\error_bucket.obj" \
        "$(INTDIR)\http_core.obj" \
        "$(INTDIR)\http_protocol.obj" \
@@ -374,7 +384,9 @@ LINK32_OBJS= \
        "$(INTDIR)\mod_userdir.obj" \
        "$(INTDIR)\modules.obj" \
        "$(INTDIR)\mpm_winnt.obj" \
+       "$(INTDIR)\protocol.obj" \
        "$(INTDIR)\registry.obj" \
+       "$(INTDIR)\request.obj" \
        "$(INTDIR)\rfc1413.obj" \
        "$(INTDIR)\scoreboard.obj" \
        "$(INTDIR)\service.obj" \
@@ -710,6 +722,7 @@ DEP_CPP_VHOST=\
        ".\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"\
@@ -747,27 +760,23 @@ SOURCE=.\modules\http\http_core.c
 DEP_CPP_HTTP_=\
        ".\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_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\scoreboard.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"\
+       ".\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"\
@@ -777,11 +786,8 @@ DEP_CPP_HTTP_=\
        ".\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"\
@@ -1055,6 +1061,7 @@ DEP_CPP_MOD_AS=\
        ".\include\util_filter.h"\
        ".\include\util_script.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"\
@@ -1150,6 +1157,7 @@ DEP_CPP_MOD_AUT=\
        ".\include\util_filter.h"\
        ".\include\util_script.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"\
@@ -1202,6 +1210,7 @@ DEP_CPP_MOD_C=\
        ".\include\util_script.h"\
        ".\include\util_uri.h"\
        ".\modules\filters\mod_include.h"\
+       ".\modules\http\mod_core.h"\
        ".\os\win32\os.h"\
        ".\srclib\apr-util\include\apr_buckets.h"\
        ".\srclib\apr-util\include\apr_hooks.h"\
@@ -1338,6 +1347,7 @@ DEP_CPP_MOD_I=\
        ".\include\util_filter.h"\
        ".\include\util_script.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"\
@@ -1425,7 +1435,7 @@ NODEP_CPP_MOD_IN=\
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\os\win32\mod_isapi.c
+SOURCE=.\modules\arch\win32\mod_isapi.c
 DEP_CPP_MOD_IS=\
        ".\include\ap_config.h"\
        ".\include\ap_mmn.h"\
@@ -1441,6 +1451,7 @@ DEP_CPP_MOD_IS=\
        ".\include\util_filter.h"\
        ".\include\util_script.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"\
@@ -1484,6 +1495,7 @@ DEP_CPP_MOD_L=\
        ".\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"\
@@ -1619,6 +1631,7 @@ DEP_CPP_MOD_S=\
        ".\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"\
@@ -1728,6 +1741,65 @@ NODEP_CPP_MOD_U=\
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\server\core.c
+DEP_CPP_CORE_=\
+       ".\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"\
+       
+NODEP_CPP_CORE_=\
+       ".\include\ap_config_auto.h"\
+       
+
+"$(INTDIR)\core.obj" : $(SOURCE) $(DEP_CPP_CORE_) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\server\error_bucket.c
 DEP_CPP_ERROR=\
        ".\include\ap_config.h"\
@@ -1736,6 +1808,7 @@ DEP_CPP_ERROR=\
        ".\include\http_protocol.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"\
@@ -1768,6 +1841,111 @@ NODEP_CPP_ERROR=\
        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\server\protocol.c
+DEP_CPP_PROTO=\
+       ".\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"\
+       ".\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"\
+       
+NODEP_CPP_PROTO=\
+       ".\include\ap_config_auto.h"\
+       
+
+"$(INTDIR)\protocol.obj" : $(SOURCE) $(DEP_CPP_PROTO) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\server\request.c
+DEP_CPP_REQUE=\
+       ".\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"\
+       
+NODEP_CPP_REQUE=\
+       ".\include\ap_config_auto.h"\
+       
+
+"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\server\rfc1413.c
 DEP_CPP_RFC14=\
        ".\include\ap_config.h"\
@@ -1822,6 +2000,7 @@ DEP_CPP_UTIL_=\
        ".\include\util_cfgtree.h"\
        ".\include\util_charset.h"\
        ".\include\util_ebcdic.h"\
+       ".\include\util_filter.h"\
        ".\include\util_uri.h"\
        ".\os\win32\os.h"\
        ".\server\test_char.h"\
@@ -2115,6 +2294,7 @@ DEP_CPP_UTIL_X=\
        ".\include\http_protocol.h"\
        ".\include\httpd.h"\
        ".\include\pcreposix.h"\
+       ".\include\util_filter.h"\
        ".\include\util_uri.h"\
        ".\include\util_xml.h"\
        ".\os\win32\os.h"\

diff --git a/modules/aaa/mod_auth_digest.mak b/modules/aaa/mod_auth_digest.mak
index c0a089e2e002e3ce8f28493618d2e122242d4e80..eb13f7aa319349598b57edd672dc6828775259d1 100644 (file)
--- a/modules/aaa/mod_auth_digest.mak
+++ b/modules/aaa/mod_auth_digest.mak
@@ -360,7 +360,6 @@ DEP_CPP_MOD_A=\
        
 NODEP_CPP_MOD_A=\
        "..\..\include\ap_config_auto.h"\
-       ".\ap_config_auto.h"\
        
 
 "$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"

diff --git a/modules/dav/main/mod_dav.mak b/modules/dav/main/mod_dav.mak
index 12703eb0292187372d8810de8e6346453509a9b0..863977df68d058b1d71e9d2242e9180a8caaf3d4 100644 (file)
--- a/modules/dav/main/mod_dav.mak
+++ b/modules/dav/main/mod_dav.mak
@@ -530,6 +530,7 @@ 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"\

diff --git a/modules/generators/mod_info.mak b/modules/generators/mod_info.mak
index 1589315cbd8860e0e725e9fd18539b9d3deea215..9b7e2fe4b2d5592e5bbb1100a53f72ab7124096e 100644 (file)
--- a/modules/generators/mod_info.mak
+++ b/modules/generators/mod_info.mak
@@ -278,6 +278,7 @@ SOURCE=.\mod_info.c
 DEP_CPP_MOD_I=\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_mmn.h"\
+       "..\..\include\ap_mpm.h"\
        "..\..\include\ap_release.h"\
        "..\..\include\http_config.h"\
        "..\..\include\http_core.h"\
@@ -287,6 +288,7 @@ 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"\

diff --git a/modules/generators/mod_status.mak b/modules/generators/mod_status.mak
index ec42ee711feefb0d49b51b30dcb9c02e98784f2b..9a2d56f61dc435a8d9b051769be9b0942cfb9578 100644 (file)
--- a/modules/generators/mod_status.mak
+++ b/modules/generators/mod_status.mak
@@ -292,6 +292,7 @@ DEP_CPP_MOD_S=\
        "..\..\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"\