summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2011-05-07 04:36:03 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2011-05-07 04:36:03 +0000
commit8c7dad18b40d3e2d3b7db0c5bbe577cd33bf08a7 (patch)
tree4d133d52c3f4bee1e407f39a6023ee55064e7ccc
parent6b1b27e2b413da77a03e4aa9fda86904958ededf (diff)
downloadhttpd-8c7dad18b40d3e2d3b7db0c5bbe577cd33bf08a7.tar.gz
Regenerate dependencies; fixes an issue noted by Bert on the
apr project (abspath includes in RSC targets), and add srclib targets to the system INCLUDE path so that these are excluded from the dependencies; seperate builds will work without the srclib/ files. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100445 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/aaa/mod_auth_basic.dep30
-rw-r--r--modules/aaa/mod_auth_basic.mak4
-rw-r--r--modules/aaa/mod_auth_digest.dep31
-rw-r--r--modules/aaa/mod_auth_digest.mak4
-rw-r--r--modules/aaa/mod_authn_alias.dep24
-rw-r--r--modules/aaa/mod_authn_alias.mak4
-rw-r--r--modules/aaa/mod_authn_anon.dep29
-rw-r--r--modules/aaa/mod_authn_anon.mak4
-rw-r--r--modules/aaa/mod_authn_dbd.dep26
-rw-r--r--modules/aaa/mod_authn_dbd.mak4
-rw-r--r--modules/aaa/mod_authn_dbm.dep30
-rw-r--r--modules/aaa/mod_authn_dbm.mak4
-rw-r--r--modules/aaa/mod_authn_default.dep29
-rw-r--r--modules/aaa/mod_authn_default.mak4
-rw-r--r--modules/aaa/mod_authn_file.dep30
-rw-r--r--modules/aaa/mod_authn_file.mak4
-rw-r--r--modules/aaa/mod_authnz_ldap.dep36
-rw-r--r--modules/aaa/mod_authnz_ldap.mak4
-rw-r--r--modules/aaa/mod_authz_dbm.dep30
-rw-r--r--modules/aaa/mod_authz_dbm.mak4
-rw-r--r--modules/aaa/mod_authz_default.dep30
-rw-r--r--modules/aaa/mod_authz_default.mak4
-rw-r--r--modules/aaa/mod_authz_groupfile.dep29
-rw-r--r--modules/aaa/mod_authz_groupfile.mak4
-rw-r--r--modules/aaa/mod_authz_host.dep26
-rw-r--r--modules/aaa/mod_authz_host.mak4
-rw-r--r--modules/aaa/mod_authz_owner.dep29
-rw-r--r--modules/aaa/mod_authz_owner.mak4
-rw-r--r--modules/aaa/mod_authz_user.dep29
-rw-r--r--modules/aaa/mod_authz_user.mak4
-rw-r--r--modules/arch/win32/mod_isapi.dep29
-rw-r--r--modules/arch/win32/mod_isapi.mak4
-rw-r--r--modules/cache/mod_cache.dep76
-rw-r--r--modules/cache/mod_cache.mak4
-rw-r--r--modules/cache/mod_disk_cache.dep30
-rw-r--r--modules/cache/mod_disk_cache.mak4
-rw-r--r--modules/cache/mod_file_cache.dep29
-rw-r--r--modules/cache/mod_file_cache.mak4
-rw-r--r--modules/cache/mod_mem_cache.dep83
-rw-r--r--modules/cache/mod_mem_cache.mak4
-rw-r--r--modules/database/mod_dbd.dep30
-rw-r--r--modules/database/mod_dbd.mak4
-rw-r--r--modules/dav/fs/mod_dav_fs.dep85
-rw-r--r--modules/dav/fs/mod_dav_fs.mak4
-rw-r--r--modules/dav/lock/mod_dav_lock.dep44
-rw-r--r--modules/dav/lock/mod_dav_lock.mak4
-rw-r--r--modules/dav/main/mod_dav.dep149
-rw-r--r--modules/dav/main/mod_dav.mak4
-rw-r--r--modules/debug/mod_bucketeer.dep29
-rw-r--r--modules/debug/mod_bucketeer.mak4
-rw-r--r--modules/debug/mod_dumpio.dep25
-rw-r--r--modules/debug/mod_dumpio.mak4
-rw-r--r--modules/echo/mod_echo.dep24
-rw-r--r--modules/echo/mod_echo.mak4
-rw-r--r--modules/experimental/mod_case_filter.dep24
-rw-r--r--modules/experimental/mod_case_filter.mak4
-rw-r--r--modules/experimental/mod_case_filter_in.dep24
-rw-r--r--modules/experimental/mod_case_filter_in.mak4
-rw-r--r--modules/experimental/mod_example.dep29
-rw-r--r--modules/experimental/mod_example.mak4
-rw-r--r--modules/filters/mod_charset_lite.dep30
-rw-r--r--modules/filters/mod_charset_lite.mak4
-rw-r--r--modules/filters/mod_deflate.dep27
-rw-r--r--modules/filters/mod_deflate.mak4
-rw-r--r--modules/filters/mod_ext_filter.dep29
-rw-r--r--modules/filters/mod_ext_filter.mak4
-rw-r--r--modules/filters/mod_filter.dep25
-rw-r--r--modules/filters/mod_filter.mak4
-rw-r--r--modules/filters/mod_include.dep30
-rw-r--r--modules/filters/mod_include.mak4
-rw-r--r--modules/filters/mod_reqtimeout.dep29
-rw-r--r--modules/filters/mod_reqtimeout.mak4
-rw-r--r--modules/filters/mod_substitute.dep24
-rw-r--r--modules/filters/mod_substitute.mak4
-rw-r--r--modules/generators/mod_asis.dep29
-rw-r--r--modules/generators/mod_asis.mak4
-rw-r--r--modules/generators/mod_autoindex.dep29
-rw-r--r--modules/generators/mod_autoindex.mak4
-rw-r--r--modules/generators/mod_cgi.dep29
-rw-r--r--modules/generators/mod_cgi.mak4
-rw-r--r--modules/generators/mod_info.dep29
-rw-r--r--modules/generators/mod_info.mak4
-rw-r--r--modules/generators/mod_status.dep29
-rw-r--r--modules/generators/mod_status.mak4
-rw-r--r--modules/http/mod_mime.dep29
-rw-r--r--modules/http/mod_mime.mak4
-rw-r--r--modules/ldap/mod_ldap.dep91
-rw-r--r--modules/ldap/mod_ldap.mak4
-rw-r--r--modules/loggers/mod_log_config.dep30
-rw-r--r--modules/loggers/mod_log_config.mak4
-rw-r--r--modules/loggers/mod_log_forensic.dep29
-rw-r--r--modules/loggers/mod_log_forensic.mak4
-rw-r--r--modules/loggers/mod_logio.dep29
-rw-r--r--modules/loggers/mod_logio.mak4
-rw-r--r--modules/mappers/mod_actions.dep29
-rw-r--r--modules/mappers/mod_actions.mak4
-rw-r--r--modules/mappers/mod_alias.dep25
-rw-r--r--modules/mappers/mod_alias.mak4
-rw-r--r--modules/mappers/mod_dir.dep29
-rw-r--r--modules/mappers/mod_dir.mak4
-rw-r--r--modules/mappers/mod_imagemap.dep29
-rw-r--r--modules/mappers/mod_imagemap.mak4
-rw-r--r--modules/mappers/mod_negotiation.dep29
-rw-r--r--modules/mappers/mod_negotiation.mak4
-rw-r--r--modules/mappers/mod_rewrite.dep29
-rw-r--r--modules/mappers/mod_rewrite.mak4
-rw-r--r--modules/mappers/mod_speling.dep25
-rw-r--r--modules/mappers/mod_speling.mak4
-rw-r--r--modules/mappers/mod_userdir.dep24
-rw-r--r--modules/mappers/mod_userdir.mak4
-rw-r--r--modules/mappers/mod_vhost_alias.dep24
-rw-r--r--modules/mappers/mod_vhost_alias.mak4
-rw-r--r--modules/metadata/mod_cern_meta.dep29
-rw-r--r--modules/metadata/mod_cern_meta.mak4
-rw-r--r--modules/metadata/mod_env.dep25
-rw-r--r--modules/metadata/mod_env.mak4
-rw-r--r--modules/metadata/mod_expires.dep29
-rw-r--r--modules/metadata/mod_expires.mak4
-rw-r--r--modules/metadata/mod_headers.dep29
-rw-r--r--modules/metadata/mod_headers.mak4
-rw-r--r--modules/metadata/mod_ident.dep26
-rw-r--r--modules/metadata/mod_ident.mak4
-rw-r--r--modules/metadata/mod_mime_magic.dep29
-rw-r--r--modules/metadata/mod_mime_magic.mak4
-rw-r--r--modules/metadata/mod_setenvif.dep29
-rw-r--r--modules/metadata/mod_setenvif.mak4
-rw-r--r--modules/metadata/mod_unique_id.dep29
-rw-r--r--modules/metadata/mod_unique_id.mak4
-rw-r--r--modules/metadata/mod_usertrack.dep24
-rw-r--r--modules/metadata/mod_usertrack.mak4
-rw-r--r--modules/metadata/mod_version.dep25
-rw-r--r--modules/metadata/mod_version.mak4
-rw-r--r--modules/proxy/mod_proxy.dep55
-rw-r--r--modules/proxy/mod_proxy.mak4
-rw-r--r--modules/proxy/mod_proxy_ajp.dep127
-rw-r--r--modules/proxy/mod_proxy_ajp.mak4
-rw-r--r--modules/proxy/mod_proxy_balancer.dep31
-rw-r--r--modules/proxy/mod_proxy_balancer.mak4
-rw-r--r--modules/proxy/mod_proxy_connect.dep31
-rw-r--r--modules/proxy/mod_proxy_connect.mak4
-rw-r--r--modules/proxy/mod_proxy_ftp.dep31
-rw-r--r--modules/proxy/mod_proxy_ftp.mak4
-rw-r--r--modules/proxy/mod_proxy_http.dep31
-rw-r--r--modules/proxy/mod_proxy_http.mak4
-rw-r--r--modules/proxy/mod_proxy_scgi.dep31
-rw-r--r--modules/proxy/mod_proxy_scgi.mak4
-rw-r--r--modules/ssl/mod_ssl.dep616
-rw-r--r--modules/ssl/mod_ssl.mak6
148 files changed, 256 insertions, 3207 deletions
diff --git a/modules/aaa/mod_auth_basic.dep b/modules/aaa/mod_auth_basic.dep
index 4d5670be1a..aab5f656fd 100644
--- a/modules/aaa/mod_auth_basic.dep
+++ b/modules/aaa/mod_auth_basic.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_auth_basic.c : \
@@ -27,39 +20,16 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_auth_basic.mak b/modules/aaa/mod_auth_basic.mak
index 161663e09e..fb4224df79 100644
--- a/modules/aaa/mod_auth_basic.mak
+++ b/modules/aaa/mod_auth_basic.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_auth_basic.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_auth_basic - Win32 Debug"
"$(INTDIR)\mod_auth_basic.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_basic.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_auth_basic.so" /d LONG_NAME="auth_basic_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_auth_digest.dep b/modules/aaa/mod_auth_digest.dep
index 45a7a6ce2c..b10c17455f 100644
--- a/modules/aaa/mod_auth_digest.dep
+++ b/modules/aaa/mod_auth_digest.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_auth_digest.c : \
@@ -27,9 +20,7 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_md5.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
@@ -37,34 +28,12 @@
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_sha1.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_auth_digest.mak b/modules/aaa/mod_auth_digest.mak
index e031eb9792..db5a390e7b 100644
--- a/modules/aaa/mod_auth_digest.mak
+++ b/modules/aaa/mod_auth_digest.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_auth_digest.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug"
"$(INTDIR)\mod_auth_digest.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_auth_digest.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_auth_digest.so" /d LONG_NAME="auth_digest_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authn_alias.dep b/modules/aaa/mod_authn_alias.dep
index 6b6a81c01b..8dcf9084a7 100644
--- a/modules/aaa/mod_authn_alias.dep
+++ b/modules/aaa/mod_authn_alias.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authn_alias.c : \
@@ -24,30 +17,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authn_alias.mak b/modules/aaa/mod_authn_alias.mak
index cd8e887c72..f9a544074b 100644
--- a/modules/aaa/mod_authn_alias.mak
+++ b/modules/aaa/mod_authn_alias.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authn_alias.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_alias.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_alias.so" /d LONG_NAME="authn_alias_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_alias.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_alias.so" /d LONG_NAME="authn_alias_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authn_alias - Win32 Debug"
"$(INTDIR)\mod_authn_alias.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_alias.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_alias.so" /d LONG_NAME="authn_alias_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_alias.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_alias.so" /d LONG_NAME="authn_alias_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authn_anon.dep b/modules/aaa/mod_authn_anon.dep
index 53ed0c729b..8b90313f01 100644
--- a/modules/aaa/mod_authn_anon.dep
+++ b/modules/aaa/mod_authn_anon.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authn_anon.c : \
@@ -26,36 +19,14 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authn_anon.mak b/modules/aaa/mod_authn_anon.mak
index ecc886962c..54737c5af5 100644
--- a/modules/aaa/mod_authn_anon.mak
+++ b/modules/aaa/mod_authn_anon.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authn_anon.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_anon.so" /d LONG_NAME="authn_anon_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_anon.so" /d LONG_NAME="authn_anon_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authn_anon - Win32 Debug"
"$(INTDIR)\mod_authn_anon.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_anon.so" /d LONG_NAME="authn_anon_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_anon.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_anon.so" /d LONG_NAME="authn_anon_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authn_dbd.dep b/modules/aaa/mod_authn_dbd.dep
index f2de2c9855..19e5e95891 100644
--- a/modules/aaa/mod_authn_dbd.dep
+++ b/modules/aaa/mod_authn_dbd.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authn_dbd.c : \
@@ -22,36 +15,17 @@
"..\..\include\httpd.h"\
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_dbd.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
"..\..\srclib\apr-util\include\apu_version.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authn_dbd.mak b/modules/aaa/mod_authn_dbd.mak
index 1e65ab2dc4..0d287e3dbe 100644
--- a/modules/aaa/mod_authn_dbd.mak
+++ b/modules/aaa/mod_authn_dbd.mak
@@ -387,14 +387,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authn_dbd.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_dbd.so" /d LONG_NAME="authn_dbd_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_dbd.so" /d LONG_NAME="authn_dbd_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authn_dbd - Win32 Debug"
"$(INTDIR)\mod_authn_dbd.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_dbd.so" /d LONG_NAME="authn_dbd_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_dbd.so" /d LONG_NAME="authn_dbd_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authn_dbm.dep b/modules/aaa/mod_authn_dbm.dep
index 57f39470db..9a283fcce6 100644
--- a/modules/aaa/mod_authn_dbm.dep
+++ b/modules/aaa/mod_authn_dbm.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authn_dbm.c : \
@@ -26,39 +19,16 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authn_dbm.mak b/modules/aaa/mod_authn_dbm.mak
index 45bdb1a69c..9e61ed457b 100644
--- a/modules/aaa/mod_authn_dbm.mak
+++ b/modules/aaa/mod_authn_dbm.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authn_dbm.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_dbm.so" /d LONG_NAME="authn_dbm_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_dbm.so" /d LONG_NAME="authn_dbm_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authn_dbm - Win32 Debug"
"$(INTDIR)\mod_authn_dbm.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_dbm.so" /d LONG_NAME="authn_dbm_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_dbm.so" /d LONG_NAME="authn_dbm_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authn_default.dep b/modules/aaa/mod_authn_default.dep
index b39964e41c..ef61c579d0 100644
--- a/modules/aaa/mod_authn_default.dep
+++ b/modules/aaa/mod_authn_default.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authn_default.c : \
@@ -25,35 +18,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/aaa/mod_authn_default.mak b/modules/aaa/mod_authn_default.mak
index b42efb4670..c7d457fd3b 100644
--- a/modules/aaa/mod_authn_default.mak
+++ b/modules/aaa/mod_authn_default.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authn_default.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_default.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_default.so" /d LONG_NAME="authn_default_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_default.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_default.so" /d LONG_NAME="authn_default_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authn_default - Win32 Debug"
"$(INTDIR)\mod_authn_default.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_default.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_default.so" /d LONG_NAME="authn_default_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_default.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_default.so" /d LONG_NAME="authn_default_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authn_file.dep b/modules/aaa/mod_authn_file.dep
index 8069bee0af..963946b678 100644
--- a/modules/aaa/mod_authn_file.dep
+++ b/modules/aaa/mod_authn_file.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authn_file.c : \
@@ -26,38 +19,15 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authn_file.mak b/modules/aaa/mod_authn_file.mak
index 8b84c79849..f8a6c855bc 100644
--- a/modules/aaa/mod_authn_file.mak
+++ b/modules/aaa/mod_authn_file.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authn_file.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_file.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_file.so" /d LONG_NAME="authn_file_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_file.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authn_file.so" /d LONG_NAME="authn_file_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authn_file - Win32 Debug"
"$(INTDIR)\mod_authn_file.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_file.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_file.so" /d LONG_NAME="authn_file_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authn_file.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authn_file.so" /d LONG_NAME="authn_file_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authnz_ldap.dep b/modules/aaa/mod_authnz_ldap.dep
index f41887d765..d1405477bc 100644
--- a/modules/aaa/mod_authnz_ldap.dep
+++ b/modules/aaa/mod_authnz_ldap.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authnz_ldap.c : \
@@ -27,46 +20,17 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_ldap.h"\
- "..\..\srclib\apr-util\include\apr_anylock.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
- "..\..\srclib\apr-util\include\apr_ldap.h"\
- "..\..\srclib\apr-util\include\apr_ldap_init.h"\
- "..\..\srclib\apr-util\include\apr_ldap_option.h"\
- "..\..\srclib\apr-util\include\apr_ldap_rebind.h"\
- "..\..\srclib\apr-util\include\apr_ldap_url.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authnz_ldap.mak b/modules/aaa/mod_authnz_ldap.mak
index 4ce13b916a..facd97a322 100644
--- a/modules/aaa/mod_authnz_ldap.mak
+++ b/modules/aaa/mod_authnz_ldap.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authnz_ldap.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authnz_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authnz_ldap.so" /d LONG_NAME="authnz_ldap_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authnz_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authnz_ldap.so" /d LONG_NAME="authnz_ldap_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authnz_ldap - Win32 Debug"
"$(INTDIR)\mod_authnz_ldap.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authnz_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authnz_ldap.so" /d LONG_NAME="authnz_ldap_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authnz_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authnz_ldap.so" /d LONG_NAME="authnz_ldap_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authz_dbm.dep b/modules/aaa/mod_authz_dbm.dep
index 70fa96b57e..e925b1ce13 100644
--- a/modules/aaa/mod_authz_dbm.dep
+++ b/modules/aaa/mod_authz_dbm.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authz_dbm.c : \
@@ -25,39 +18,16 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authz_dbm.mak b/modules/aaa/mod_authz_dbm.mak
index 46a3055b08..3aa689af96 100644
--- a/modules/aaa/mod_authz_dbm.mak
+++ b/modules/aaa/mod_authz_dbm.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authz_dbm.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_dbm.so" /d LONG_NAME="authz_dbm_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_dbm.so" /d LONG_NAME="authz_dbm_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authz_dbm - Win32 Debug"
"$(INTDIR)\mod_authz_dbm.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_dbm.so" /d LONG_NAME="authz_dbm_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_dbm.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_dbm.so" /d LONG_NAME="authz_dbm_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authz_default.dep b/modules/aaa/mod_authz_default.dep
index 11dce9c2a6..4f225eabac 100644
--- a/modules/aaa/mod_authz_default.dep
+++ b/modules/aaa/mod_authz_default.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authz_default.c : \
@@ -25,37 +18,14 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/aaa/mod_authz_default.mak b/modules/aaa/mod_authz_default.mak
index 73512b460a..ed43511484 100644
--- a/modules/aaa/mod_authz_default.mak
+++ b/modules/aaa/mod_authz_default.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authz_default.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_default.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_default.so" /d LONG_NAME="authz_default_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_default.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_default.so" /d LONG_NAME="authz_default_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authz_default - Win32 Debug"
"$(INTDIR)\mod_authz_default.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_default.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_default.so" /d LONG_NAME="authz_default_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_default.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_default.so" /d LONG_NAME="authz_default_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authz_groupfile.dep b/modules/aaa/mod_authz_groupfile.dep
index 7213917d88..2778e35b81 100644
--- a/modules/aaa/mod_authz_groupfile.dep
+++ b/modules/aaa/mod_authz_groupfile.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authz_groupfile.c : \
@@ -25,37 +18,15 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authz_groupfile.mak b/modules/aaa/mod_authz_groupfile.mak
index d80a91e2bd..f249131bd6 100644
--- a/modules/aaa/mod_authz_groupfile.mak
+++ b/modules/aaa/mod_authz_groupfile.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authz_groupfile.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_groupfile.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_groupfile.so" /d LONG_NAME="authz_groupfile_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_groupfile.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_groupfile.so" /d LONG_NAME="authz_groupfile_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authz_groupfile - Win32 Debug"
"$(INTDIR)\mod_authz_groupfile.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_groupfile.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_groupfile.so" /d LONG_NAME="authz_groupfile_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_groupfile.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_groupfile.so" /d LONG_NAME="authz_groupfile_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authz_host.dep b/modules/aaa/mod_authz_host.dep
index 2f5765c6cd..899f3d9217 100644
--- a/modules/aaa/mod_authz_host.dep
+++ b/modules/aaa/mod_authz_host.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authz_host.c : \
@@ -24,32 +17,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/aaa/mod_authz_host.mak b/modules/aaa/mod_authz_host.mak
index ac80f82736..a439aa2e5a 100644
--- a/modules/aaa/mod_authz_host.mak
+++ b/modules/aaa/mod_authz_host.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authz_host.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_host.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_host.so" /d LONG_NAME="authz_host_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_host.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_host.so" /d LONG_NAME="authz_host_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authz_host - Win32 Debug"
"$(INTDIR)\mod_authz_host.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_host.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_host.so" /d LONG_NAME="authz_host_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_host.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_host.so" /d LONG_NAME="authz_host_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authz_owner.dep b/modules/aaa/mod_authz_owner.dep
index a82048bbe5..8059d07fcd 100644
--- a/modules/aaa/mod_authz_owner.dep
+++ b/modules/aaa/mod_authz_owner.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authz_owner.c : \
@@ -25,36 +18,14 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_auth.h"\
diff --git a/modules/aaa/mod_authz_owner.mak b/modules/aaa/mod_authz_owner.mak
index 8b33b2760b..a38c80ffa7 100644
--- a/modules/aaa/mod_authz_owner.mak
+++ b/modules/aaa/mod_authz_owner.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authz_owner.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_owner.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_owner.so" /d LONG_NAME="authz_owner_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_owner.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_owner.so" /d LONG_NAME="authz_owner_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authz_owner - Win32 Debug"
"$(INTDIR)\mod_authz_owner.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_owner.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_owner.so" /d LONG_NAME="authz_owner_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_owner.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_owner.so" /d LONG_NAME="authz_owner_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/aaa/mod_authz_user.dep b/modules/aaa/mod_authz_user.dep
index 5cfa7fd35f..a025ed26f8 100644
--- a/modules/aaa/mod_authz_user.dep
+++ b/modules/aaa/mod_authz_user.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_authz_user.c : \
@@ -25,35 +18,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/aaa/mod_authz_user.mak b/modules/aaa/mod_authz_user.mak
index 5a1fb94932..ff15687485 100644
--- a/modules/aaa/mod_authz_user.mak
+++ b/modules/aaa/mod_authz_user.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_authz_user.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_user.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_user.so" /d LONG_NAME="authz_user_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_user.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_authz_user.so" /d LONG_NAME="authz_user_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_authz_user - Win32 Debug"
"$(INTDIR)\mod_authz_user.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_user.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_user.so" /d LONG_NAME="authz_user_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_authz_user.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_authz_user.so" /d LONG_NAME="authz_user_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/arch/win32/mod_isapi.dep b/modules/arch/win32/mod_isapi.dep
index 9fa4f8d28a..0e41488b8f 100644
--- a/modules/arch/win32/mod_isapi.dep
+++ b/modules/arch/win32/mod_isapi.dep
@@ -2,13 +2,6 @@
..\..\..\build\win32\httpd.rc : \
"..\..\..\include\ap_release.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\..\srclib\apr\include\apr_errno.h"\
- "..\..\..\srclib\apr\include\apr_general.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
.\mod_isapi.c : \
@@ -27,38 +20,16 @@
"..\..\..\include\util_cfgtree.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_script.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\..\srclib\apr\include\apr_hash.h"\
- "..\..\..\srclib\apr\include\apr_inherit.h"\
"..\..\..\srclib\apr\include\apr_lib.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
"..\..\..\srclib\apr\include\apr_portable.h"\
- "..\..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
- "..\..\..\srclib\apr\include\apr_shm.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\mod_isapi.h"\
diff --git a/modules/arch/win32/mod_isapi.mak b/modules/arch/win32/mod_isapi.mak
index 4ba12b9897..7edb7cba87 100644
--- a/modules/arch/win32/mod_isapi.mak
+++ b/modules/arch/win32/mod_isapi.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\..\build\win32\httpd.rc
"$(INTDIR)\mod_isapi.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_isapi.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_isapi.so" /d LONG_NAME="isapi_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_isapi.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_isapi.so" /d LONG_NAME="isapi_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_isapi - Win32 Debug"
"$(INTDIR)\mod_isapi.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_isapi.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_isapi.so" /d LONG_NAME="isapi_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_isapi.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_isapi.so" /d LONG_NAME="isapi_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/cache/mod_cache.dep b/modules/cache/mod_cache.dep
index 74662fbc5a..901bd4b033 100644
--- a/modules/cache/mod_cache.dep
+++ b/modules/cache/mod_cache.dep
@@ -17,42 +17,19 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_cache.h"\
@@ -74,42 +51,19 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_cache.h"\
@@ -130,52 +84,22 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_cache.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/cache/mod_cache.mak b/modules/cache/mod_cache.mak
index c539907a97..8eb0112079 100644
--- a/modules/cache/mod_cache.mak
+++ b/modules/cache/mod_cache.mak
@@ -353,14 +353,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_cache.so" /d LONG_NAME="cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_cache.so" /d LONG_NAME="cache_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_cache - Win32 Debug"
"$(INTDIR)\mod_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_cache.so" /d LONG_NAME="cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_cache.so" /d LONG_NAME="cache_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/cache/mod_disk_cache.dep b/modules/cache/mod_disk_cache.dep
index 403af417d0..2d058f7abf 100644
--- a/modules/cache/mod_disk_cache.dep
+++ b/modules/cache/mod_disk_cache.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_disk_cache.c : \
@@ -31,42 +24,19 @@
"..\..\include\util_charset.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_cache.h"\
".\mod_disk_cache.h"\
diff --git a/modules/cache/mod_disk_cache.mak b/modules/cache/mod_disk_cache.mak
index 3c9b871c46..7e5bec53f6 100644
--- a/modules/cache/mod_disk_cache.mak
+++ b/modules/cache/mod_disk_cache.mak
@@ -359,14 +359,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_disk_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_disk_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_disk_cache.so" /d LONG_NAME="disk_cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_disk_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_disk_cache.so" /d LONG_NAME="disk_cache_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_disk_cache - Win32 Debug"
"$(INTDIR)\mod_disk_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_disk_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_disk_cache.so" /d LONG_NAME="disk_cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_disk_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_disk_cache.so" /d LONG_NAME="disk_cache_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/cache/mod_file_cache.dep b/modules/cache/mod_file_cache.dep
index e1feccd7f6..2d8bc202f1 100644
--- a/modules/cache/mod_file_cache.dep
+++ b/modules/cache/mod_file_cache.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_file_cache.c : \
@@ -25,35 +18,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/cache/mod_file_cache.mak b/modules/cache/mod_file_cache.mak
index d5b2803e9e..656f1b98b7 100644
--- a/modules/cache/mod_file_cache.mak
+++ b/modules/cache/mod_file_cache.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_file_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_file_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_file_cache.so" /d LONG_NAME="file_cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_file_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_file_cache.so" /d LONG_NAME="file_cache_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_file_cache - Win32 Debug"
"$(INTDIR)\mod_file_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_file_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_file_cache.so" /d LONG_NAME="file_cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_file_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_file_cache.so" /d LONG_NAME="file_cache_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/cache/mod_mem_cache.dep b/modules/cache/mod_mem_cache.dep
index 2a68f3a8d9..2cbefb3fd1 100644
--- a/modules/cache/mod_mem_cache.dep
+++ b/modules/cache/mod_mem_cache.dep
@@ -17,42 +17,19 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\cache_cache.h"\
".\cache_hash.h"\
".\cache_pqueue.h"\
@@ -76,54 +53,24 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\cache_hash.h"\
".\mod_cache.h"\
.\cache_pqueue.c : \
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\cache_pqueue.h"\
@@ -146,42 +93,19 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\cache_cache.h"\
".\cache_pqueue.h"\
".\mod_cache.h"\
@@ -189,11 +113,4 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/cache/mod_mem_cache.mak b/modules/cache/mod_mem_cache.mak
index c5f25987d9..ece8e6f95a 100644
--- a/modules/cache/mod_mem_cache.mak
+++ b/modules/cache/mod_mem_cache.mak
@@ -390,14 +390,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_mem_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mem_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_mem_cache.so" /d LONG_NAME="mem_cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mem_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_mem_cache.so" /d LONG_NAME="mem_cache_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_mem_cache - Win32 Debug"
"$(INTDIR)\mod_mem_cache.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mem_cache.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_mem_cache.so" /d LONG_NAME="mem_cache_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mem_cache.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_mem_cache.so" /d LONG_NAME="mem_cache_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/database/mod_dbd.dep b/modules/database/mod_dbd.dep
index 98d790daf8..4869e6d9e9 100644
--- a/modules/database/mod_dbd.dep
+++ b/modules/database/mod_dbd.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_dbd.c : \
@@ -24,39 +17,16 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_dbd.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_dbd.h"\
diff --git a/modules/database/mod_dbd.mak b/modules/database/mod_dbd.mak
index 80f0b2d4f5..6d96ff2e05 100644
--- a/modules/database/mod_dbd.mak
+++ b/modules/database/mod_dbd.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_dbd.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dbd.so" /d LONG_NAME="dbd_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dbd.so" /d LONG_NAME="dbd_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_dbd - Win32 Debug"
"$(INTDIR)\mod_dbd.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dbd.so" /d LONG_NAME="dbd_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dbd.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dbd.so" /d LONG_NAME="dbd_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/dav/fs/mod_dav_fs.dep b/modules/dav/fs/mod_dav_fs.dep
index ae6e5e8fcc..44317880e7 100644
--- a/modules/dav/fs/mod_dav_fs.dep
+++ b/modules/dav/fs/mod_dav_fs.dep
@@ -10,33 +10,15 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\repos.h"\
@@ -51,35 +33,16 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
"..\..\..\srclib\apr-util\include\apr_uuid.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\repos.h"\
@@ -95,33 +58,15 @@
"..\..\..\include\util_cfgtree.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\repos.h"\
@@ -138,49 +83,19 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\..\srclib\apr\include\apr_hash.h"\
- "..\..\..\srclib\apr\include\apr_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
"..\..\..\srclib\apr\include\apr_portable.h"\
- "..\..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
- "..\..\..\srclib\apr\include\apr_shm.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\repos.h"\
..\..\..\build\win32\httpd.rc : \
"..\..\..\include\ap_release.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\..\srclib\apr\include\apr_errno.h"\
- "..\..\..\srclib\apr\include\apr_general.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/dav/fs/mod_dav_fs.mak b/modules/dav/fs/mod_dav_fs.mak
index 8de5b25b74..92f44574ec 100644
--- a/modules/dav/fs/mod_dav_fs.mak
+++ b/modules/dav/fs/mod_dav_fs.mak
@@ -390,14 +390,14 @@ SOURCE=..\..\..\build\win32\httpd.rc
"$(INTDIR)\mod_dav_fs.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_fs.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dav_fs.so" /d LONG_NAME="dav_fs_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_fs.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dav_fs.so" /d LONG_NAME="dav_fs_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_dav_fs - Win32 Debug"
"$(INTDIR)\mod_dav_fs.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_fs.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dav_fs.so" /d LONG_NAME="dav_fs_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_fs.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dav_fs.so" /d LONG_NAME="dav_fs_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/dav/lock/mod_dav_lock.dep b/modules/dav/lock/mod_dav_lock.dep
index 8b342c5422..f7085de28b 100644
--- a/modules/dav/lock/mod_dav_lock.dep
+++ b/modules/dav/lock/mod_dav_lock.dep
@@ -11,35 +11,16 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
"..\..\..\srclib\apr-util\include\apr_uuid.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\locks.h"\
@@ -56,43 +37,18 @@
"..\..\..\include\util_cfgtree.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\locks.h"\
..\..\..\build\win32\httpd.rc : \
"..\..\..\include\ap_release.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\..\srclib\apr\include\apr_errno.h"\
- "..\..\..\srclib\apr\include\apr_general.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/dav/lock/mod_dav_lock.mak b/modules/dav/lock/mod_dav_lock.mak
index 794335c44d..2bd5751194 100644
--- a/modules/dav/lock/mod_dav_lock.mak
+++ b/modules/dav/lock/mod_dav_lock.mak
@@ -372,14 +372,14 @@ SOURCE=..\..\..\build\win32\httpd.rc
"$(INTDIR)\mod_dav_lock.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_lock.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dav_lock.so" /d LONG_NAME="dav_lock_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_lock.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dav_lock.so" /d LONG_NAME="dav_lock_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_dav_lock - Win32 Debug"
"$(INTDIR)\mod_dav_lock.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_lock.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dav_lock.so" /d LONG_NAME="dav_lock_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav_lock.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dav_lock.so" /d LONG_NAME="dav_lock_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/dav/main/mod_dav.dep b/modules/dav/main/mod_dav.dep
index 38a22aff38..b47a3df29c 100644
--- a/modules/dav/main/mod_dav.dep
+++ b/modules/dav/main/mod_dav.dep
@@ -9,33 +9,15 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\mod_dav.h"\
@@ -56,41 +38,18 @@
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_script.h"\
"..\..\..\include\util_xml.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_optional.h"\
"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\..\srclib\apr\include\apr_hash.h"\
- "..\..\..\srclib\apr\include\apr_inherit.h"\
"..\..\..\srclib\apr\include\apr_lib.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
"..\..\..\srclib\apr\include\apr_portable.h"\
- "..\..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
- "..\..\..\srclib\apr\include\apr_shm.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_dav.h"\
@@ -105,34 +64,15 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_dav.h"\
@@ -146,32 +86,14 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\mod_dav.h"\
@@ -184,33 +106,15 @@
"..\..\..\include\os.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_time.h"\
- "..\..\..\srclib\apr\include\apr_user.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
".\mod_dav.h"\
@@ -229,40 +133,17 @@
"..\..\..\include\util_cfgtree.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\..\srclib\apr\include\apr_hash.h"\
- "..\..\..\srclib\apr\include\apr_inherit.h"\
"..\..\..\srclib\apr\include\apr_lib.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
"..\..\..\srclib\apr\include\apr_portable.h"\
- "..\..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
- "..\..\..\srclib\apr\include\apr_shm.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_dav.h"\
@@ -280,50 +161,20 @@
"..\..\..\include\util_cfgtree.h"\
"..\..\..\include\util_filter.h"\
"..\..\..\include\util_xml.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_optional.h"\
"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\..\srclib\apr-util\include\apr_xlate.h"\
"..\..\..\srclib\apr-util\include\apr_xml.h"\
- "..\..\..\srclib\apr-util\include\apu.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\..\srclib\apr\include\apr_hash.h"\
- "..\..\..\srclib\apr\include\apr_inherit.h"\
"..\..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\..\srclib\apr\include\apr_network_io.h"\
"..\..\..\srclib\apr\include\apr_poll.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
"..\..\..\srclib\apr\include\apr_portable.h"\
- "..\..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\..\srclib\apr\include\apr_ring.h"\
- "..\..\..\srclib\apr\include\apr_shm.h"\
"..\..\..\srclib\apr\include\apr_strings.h"\
- "..\..\..\srclib\apr\include\apr_tables.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_dav.h"\
..\..\..\build\win32\httpd.rc : \
"..\..\..\include\ap_release.h"\
- "..\..\..\srclib\apr\include\apr.h"\
- "..\..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\..\srclib\apr\include\apr_errno.h"\
- "..\..\..\srclib\apr\include\apr_general.h"\
- "..\..\..\srclib\apr\include\apr_pools.h"\
- "..\..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/dav/main/mod_dav.mak b/modules/dav/main/mod_dav.mak
index 0fd3acc3e7..a2e397d5f7 100644
--- a/modules/dav/main/mod_dav.mak
+++ b/modules/dav/main/mod_dav.mak
@@ -389,14 +389,14 @@ SOURCE=..\..\..\build\win32\httpd.rc
"$(INTDIR)\mod_dav.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dav.so" /d LONG_NAME="dav_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dav.so" /d LONG_NAME="dav_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_dav - Win32 Debug"
"$(INTDIR)\mod_dav.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav.res" /i "../../../include" /i "../../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dav.so" /d LONG_NAME="dav_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dav.res" /i "../../../include" /i "../../../srclib/apr/include" /i ".\..\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dav.so" /d LONG_NAME="dav_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/debug/mod_bucketeer.dep b/modules/debug/mod_bucketeer.dep
index 0a14ca70a3..d4f04674eb 100644
--- a/modules/debug/mod_bucketeer.dep
+++ b/modules/debug/mod_bucketeer.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_bucketeer.c : \
@@ -24,33 +17,11 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/debug/mod_bucketeer.mak b/modules/debug/mod_bucketeer.mak
index 0f402eb92b..dbeedd96bf 100644
--- a/modules/debug/mod_bucketeer.mak
+++ b/modules/debug/mod_bucketeer.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_bucketeer.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_bucketeer.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_bucketeer.so" /d LONG_NAME="bucketeer_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_bucketeer.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_bucketeer.so" /d LONG_NAME="bucketeer_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_bucketeer - Win32 Debug"
"$(INTDIR)\mod_bucketeer.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_bucketeer.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_bucketeer.so" /d LONG_NAME="bucketeer_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_bucketeer.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_bucketeer.so" /d LONG_NAME="bucketeer_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/debug/mod_dumpio.dep b/modules/debug/mod_dumpio.dep
index b4dd2d398a..df79222efc 100644
--- a/modules/debug/mod_dumpio.dep
+++ b/modules/debug/mod_dumpio.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_dumpio.c : \
@@ -24,29 +17,11 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/debug/mod_dumpio.mak b/modules/debug/mod_dumpio.mak
index 1b2ebdb6d9..f30299eb66 100644
--- a/modules/debug/mod_dumpio.mak
+++ b/modules/debug/mod_dumpio.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_dumpio.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dumpio.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dumpio.so" /d LONG_NAME="dumpio_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dumpio.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dumpio.so" /d LONG_NAME="dumpio_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_dumpio - Win32 Debug"
"$(INTDIR)\mod_dumpio.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dumpio.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dumpio.so" /d LONG_NAME="dumpio_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dumpio.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dumpio.so" /d LONG_NAME="dumpio_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/echo/mod_echo.dep b/modules/echo/mod_echo.dep
index bf87508965..f669814447 100644
--- a/modules/echo/mod_echo.dep
+++ b/modules/echo/mod_echo.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_echo.c : \
@@ -22,26 +15,9 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/echo/mod_echo.mak b/modules/echo/mod_echo.mak
index 0547dbfaa4..94b614a2ae 100644
--- a/modules/echo/mod_echo.mak
+++ b/modules/echo/mod_echo.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_echo.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_echo.so" /d LONG_NAME="echo_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_echo.so" /d LONG_NAME="echo_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_echo - Win32 Debug"
"$(INTDIR)\mod_echo.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_echo.so" /d LONG_NAME="echo_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_echo.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_echo.so" /d LONG_NAME="echo_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/experimental/mod_case_filter.dep b/modules/experimental/mod_case_filter.dep
index 6196ced845..cc97f8fd40 100644
--- a/modules/experimental/mod_case_filter.dep
+++ b/modules/experimental/mod_case_filter.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_case_filter.c : \
@@ -22,27 +15,10 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/experimental/mod_case_filter.mak b/modules/experimental/mod_case_filter.mak
index b2f1c4c703..7c36129d6f 100644
--- a/modules/experimental/mod_case_filter.mak
+++ b/modules/experimental/mod_case_filter.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_case_filter.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_case_filter.so" /d LONG_NAME="case_filter_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_case_filter.so" /d LONG_NAME="case_filter_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_case_filter - Win32 Debug"
"$(INTDIR)\mod_case_filter.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_case_filter.so" /d LONG_NAME="case_filter_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_case_filter.so" /d LONG_NAME="case_filter_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/experimental/mod_case_filter_in.dep b/modules/experimental/mod_case_filter_in.dep
index 983883ff56..ad7731510e 100644
--- a/modules/experimental/mod_case_filter_in.dep
+++ b/modules/experimental/mod_case_filter_in.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_case_filter_in.c : \
@@ -22,27 +15,10 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/experimental/mod_case_filter_in.mak b/modules/experimental/mod_case_filter_in.mak
index dd3324026b..74af05ad62 100644
--- a/modules/experimental/mod_case_filter_in.mak
+++ b/modules/experimental/mod_case_filter_in.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_case_filter_in.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter_in.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_case_filter_in.so" /d LONG_NAME="case_filter_in_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter_in.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_case_filter_in.so" /d LONG_NAME="case_filter_in_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_case_filter_in - Win32 Debug"
"$(INTDIR)\mod_case_filter_in.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter_in.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_case_filter_in.so" /d LONG_NAME="case_filter_in_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_case_filter_in.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_case_filter_in.so" /d LONG_NAME="case_filter_in_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/experimental/mod_example.dep b/modules/experimental/mod_example.dep
index 4cce5c230d..88d4bff4aa 100644
--- a/modules/experimental/mod_example.dep
+++ b/modules/experimental/mod_example.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_example.c : \
@@ -28,35 +21,13 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/experimental/mod_example.mak b/modules/experimental/mod_example.mak
index 775e8964f9..2d8f60c33a 100644
--- a/modules/experimental/mod_example.mak
+++ b/modules/experimental/mod_example.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_example.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_example.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_example.so" /d LONG_NAME="example_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_example.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_example.so" /d LONG_NAME="example_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_example - Win32 Debug"
"$(INTDIR)\mod_example.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_example.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_example.so" /d LONG_NAME="example_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_example.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_example.so" /d LONG_NAME="example_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_charset_lite.dep b/modules/filters/mod_charset_lite.dep
index 70a3bfe040..e6f20e7ddb 100644
--- a/modules/filters/mod_charset_lite.dep
+++ b/modules/filters/mod_charset_lite.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_charset_lite.c : \
@@ -27,37 +20,14 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_charset.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/filters/mod_charset_lite.mak b/modules/filters/mod_charset_lite.mak
index f342595366..8870f9add3 100644
--- a/modules/filters/mod_charset_lite.mak
+++ b/modules/filters/mod_charset_lite.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_charset_lite.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_charset_lite - Win32 Debug"
"$(INTDIR)\mod_charset_lite.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_charset_lite.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_charset_lite.so" /d LONG_NAME="charset_lite_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_deflate.dep b/modules/filters/mod_deflate.dep
index 0524b18b8f..75fc104ee1 100644
--- a/modules/filters/mod_deflate.dep
+++ b/modules/filters/mod_deflate.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_deflate.c : \
@@ -23,29 +16,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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\zlib\zconf.h"\
+ "..\..\srclib\zlib\zlib.h"\
diff --git a/modules/filters/mod_deflate.mak b/modules/filters/mod_deflate.mak
index 070282c4b9..4549eabb48 100644
--- a/modules/filters/mod_deflate.mak
+++ b/modules/filters/mod_deflate.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_deflate.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_deflate - Win32 Debug"
"$(INTDIR)\mod_deflate.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_deflate.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_deflate.so" /d LONG_NAME="deflate_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_ext_filter.dep b/modules/filters/mod_ext_filter.dep
index 9428e2172e..29ef590c24 100644
--- a/modules/filters/mod_ext_filter.dep
+++ b/modules/filters/mod_ext_filter.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_ext_filter.c : \
@@ -26,36 +19,14 @@
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
"..\..\include\util_time.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/filters/mod_ext_filter.mak b/modules/filters/mod_ext_filter.mak
index 09dcd20c83..08faf1d2c8 100644
--- a/modules/filters/mod_ext_filter.mak
+++ b/modules/filters/mod_ext_filter.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_ext_filter.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_ext_filter - Win32 Debug"
"$(INTDIR)\mod_ext_filter.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ext_filter.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ext_filter.so" /d LONG_NAME="ext_filter_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_filter.dep b/modules/filters/mod_filter.dep
index a61a3603ae..dda01b4e50 100644
--- a/modules/filters/mod_filter.dep
+++ b/modules/filters/mod_filter.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_filter.c : \
@@ -23,30 +16,12 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/filters/mod_filter.mak b/modules/filters/mod_filter.mak
index b079c85e92..c1728072f8 100644
--- a/modules/filters/mod_filter.mak
+++ b/modules/filters/mod_filter.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_filter.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_filter - Win32 Debug"
"$(INTDIR)\mod_filter.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_filter.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_filter.so" /d LONG_NAME="filter_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_include.dep b/modules/filters/mod_include.dep
index e5039efff1..168b2b5eb2 100644
--- a/modules/filters/mod_include.dep
+++ b/modules/filters/mod_include.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_include.c : \
@@ -29,38 +22,15 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_include.h"\
diff --git a/modules/filters/mod_include.mak b/modules/filters/mod_include.mak
index dac29c76d0..3ec3878911 100644
--- a/modules/filters/mod_include.mak
+++ b/modules/filters/mod_include.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_include.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_include - Win32 Debug"
"$(INTDIR)\mod_include.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_include.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_include.so" /d LONG_NAME="include_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_reqtimeout.dep b/modules/filters/mod_reqtimeout.dep
index 769d2ab613..7a96e6578a 100644
--- a/modules/filters/mod_reqtimeout.dep
+++ b/modules/filters/mod_reqtimeout.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_reqtimeout.c : \
@@ -26,36 +19,14 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/filters/mod_reqtimeout.mak b/modules/filters/mod_reqtimeout.mak
index 7006c83bca..3839f8343b 100644
--- a/modules/filters/mod_reqtimeout.mak
+++ b/modules/filters/mod_reqtimeout.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_reqtimeout.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_reqtimeout - Win32 Debug"
"$(INTDIR)\mod_reqtimeout.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_reqtimeout.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_reqtimeout.so" /d LONG_NAME="reqtimeout_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/filters/mod_substitute.dep b/modules/filters/mod_substitute.dep
index 9b7051bd84..4ae89e5bab 100644
--- a/modules/filters/mod_substitute.dep
+++ b/modules/filters/mod_substitute.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_substitute.c : \
@@ -23,31 +16,14 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/filters/mod_substitute.mak b/modules/filters/mod_substitute.mak
index ad6ab464dc..520cdff184 100644
--- a/modules/filters/mod_substitute.mak
+++ b/modules/filters/mod_substitute.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_substitute.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_substitute - Win32 Debug"
"$(INTDIR)\mod_substitute.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/generators/mod_asis.dep b/modules/generators/mod_asis.dep
index 21a1281b4f..3f151ba028 100644
--- a/modules/generators/mod_asis.dep
+++ b/modules/generators/mod_asis.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_asis.c : \
@@ -27,34 +20,12 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/generators/mod_asis.mak b/modules/generators/mod_asis.mak
index fabb2560df..79bf9f5596 100644
--- a/modules/generators/mod_asis.mak
+++ b/modules/generators/mod_asis.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_asis.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_asis.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_asis.so" /d LONG_NAME="asis_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_asis.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_asis.so" /d LONG_NAME="asis_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_asis - Win32 Debug"
"$(INTDIR)\mod_asis.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_asis.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_asis.so" /d LONG_NAME="asis_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_asis.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_asis.so" /d LONG_NAME="asis_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/generators/mod_autoindex.dep b/modules/generators/mod_autoindex.dep
index 19f1d86ffe..0f46508515 100644
--- a/modules/generators/mod_autoindex.dep
+++ b/modules/generators/mod_autoindex.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_autoindex.c : \
@@ -28,37 +21,15 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/generators/mod_autoindex.mak b/modules/generators/mod_autoindex.mak
index e0d30f71a5..baf714b8ee 100644
--- a/modules/generators/mod_autoindex.mak
+++ b/modules/generators/mod_autoindex.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_autoindex.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_autoindex.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_autoindex.so" /d LONG_NAME="autoindex_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_autoindex.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_autoindex.so" /d LONG_NAME="autoindex_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_autoindex - Win32 Debug"
"$(INTDIR)\mod_autoindex.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_autoindex.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_autoindex.so" /d LONG_NAME="autoindex_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_autoindex.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_autoindex.so" /d LONG_NAME="autoindex_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/generators/mod_cgi.dep b/modules/generators/mod_cgi.dep
index 5f1524681a..69df8afa47 100644
--- a/modules/generators/mod_cgi.dep
+++ b/modules/generators/mod_cgi.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_cgi.c : \
@@ -30,37 +23,15 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_cgi.h"\
diff --git a/modules/generators/mod_cgi.mak b/modules/generators/mod_cgi.mak
index 75470f7263..0fe345b93e 100644
--- a/modules/generators/mod_cgi.mak
+++ b/modules/generators/mod_cgi.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_cgi.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cgi.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_cgi.so" /d LONG_NAME="cgi_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cgi.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_cgi.so" /d LONG_NAME="cgi_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_cgi - Win32 Debug"
"$(INTDIR)\mod_cgi.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cgi.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_cgi.so" /d LONG_NAME="cgi_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cgi.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_cgi.so" /d LONG_NAME="cgi_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/generators/mod_info.dep b/modules/generators/mod_info.dep
index 5f5b44fc91..00fa95c6fb 100644
--- a/modules/generators/mod_info.dep
+++ b/modules/generators/mod_info.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_info.c : \
@@ -29,38 +22,16 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
"..\..\srclib\apr-util\include\apu_version.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/generators/mod_info.mak b/modules/generators/mod_info.mak
index d185cb1136..92d30fa94f 100644
--- a/modules/generators/mod_info.mak
+++ b/modules/generators/mod_info.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_info.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_info.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_info.so" /d LONG_NAME="info_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_info.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_info.so" /d LONG_NAME="info_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_info - Win32 Debug"
"$(INTDIR)\mod_info.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_info.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_info.so" /d LONG_NAME="info_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_info.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_info.so" /d LONG_NAME="info_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/generators/mod_status.dep b/modules/generators/mod_status.dep
index 5f773c99c4..6f85de2993 100644
--- a/modules/generators/mod_status.dep
+++ b/modules/generators/mod_status.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_status.c : \
@@ -28,36 +21,14 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_status.h"\
diff --git a/modules/generators/mod_status.mak b/modules/generators/mod_status.mak
index 1ad7e2fa2e..5c5b41905f 100644
--- a/modules/generators/mod_status.mak
+++ b/modules/generators/mod_status.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_status.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_status.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_status.so" /d LONG_NAME="status_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_status.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_status.so" /d LONG_NAME="status_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_status - Win32 Debug"
"$(INTDIR)\mod_status.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_status.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_status.so" /d LONG_NAME="status_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_status.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_status.so" /d LONG_NAME="status_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/http/mod_mime.dep b/modules/http/mod_mime.dep
index f92611fcb1..9f977b420f 100644
--- a/modules/http/mod_mime.dep
+++ b/modules/http/mod_mime.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_mime.c : \
@@ -24,35 +17,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/http/mod_mime.mak b/modules/http/mod_mime.mak
index 2d25ac00d0..e2e945bf85 100644
--- a/modules/http/mod_mime.mak
+++ b/modules/http/mod_mime.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_mime.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_mime.so" /d LONG_NAME="mime_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_mime.so" /d LONG_NAME="mime_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_mime - Win32 Debug"
"$(INTDIR)\mod_mime.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_mime.so" /d LONG_NAME="mime_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_mime.so" /d LONG_NAME="mime_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/ldap/mod_ldap.dep b/modules/ldap/mod_ldap.dep
index c9b9a5cfcf..62ea880da6 100644
--- a/modules/ldap/mod_ldap.dep
+++ b/modules/ldap/mod_ldap.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\util_ldap.c : \
@@ -26,45 +19,17 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_ldap.h"\
- "..\..\srclib\apr-util\include\apr_anylock.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
- "..\..\srclib\apr-util\include\apr_ldap.h"\
- "..\..\srclib\apr-util\include\apr_ldap_init.h"\
- "..\..\srclib\apr-util\include\apr_ldap_option.h"\
- "..\..\srclib\apr-util\include\apr_ldap_rebind.h"\
- "..\..\srclib\apr-util\include\apr_ldap_url.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\util_ldap_cache.h"\
@@ -83,45 +48,17 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_ldap.h"\
- "..\..\srclib\apr-util\include\apr_anylock.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
- "..\..\srclib\apr-util\include\apr_ldap.h"\
- "..\..\srclib\apr-util\include\apr_ldap_init.h"\
- "..\..\srclib\apr-util\include\apr_ldap_option.h"\
- "..\..\srclib\apr-util\include\apr_ldap_rebind.h"\
- "..\..\srclib\apr-util\include\apr_ldap_url.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\util_ldap_cache.h"\
@@ -140,44 +77,16 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_ldap.h"\
- "..\..\srclib\apr-util\include\apr_anylock.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
- "..\..\srclib\apr-util\include\apr_ldap.h"\
- "..\..\srclib\apr-util\include\apr_ldap_init.h"\
- "..\..\srclib\apr-util\include\apr_ldap_option.h"\
- "..\..\srclib\apr-util\include\apr_ldap_rebind.h"\
- "..\..\srclib\apr-util\include\apr_ldap_url.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\util_ldap_cache.h"\
diff --git a/modules/ldap/mod_ldap.mak b/modules/ldap/mod_ldap.mak
index ca3b6c1d0b..36bb0f632f 100644
--- a/modules/ldap/mod_ldap.mak
+++ b/modules/ldap/mod_ldap.mak
@@ -339,14 +339,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_ldap.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ldap.so" /d LONG_NAME="ldap_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ldap.so" /d LONG_NAME="ldap_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_ldap - Win32 Debug"
"$(INTDIR)\mod_ldap.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ldap.so" /d LONG_NAME="ldap_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ldap.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ldap.so" /d LONG_NAME="ldap_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/loggers/mod_log_config.dep b/modules/loggers/mod_log_config.dep
index 7a0f057ef4..4e4755fc38 100644
--- a/modules/loggers/mod_log_config.dep
+++ b/modules/loggers/mod_log_config.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_log_config.c : \
@@ -27,39 +20,16 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_time.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_log_config.h"\
diff --git a/modules/loggers/mod_log_config.mak b/modules/loggers/mod_log_config.mak
index 6834c4bab1..ab98209278 100644
--- a/modules/loggers/mod_log_config.mak
+++ b/modules/loggers/mod_log_config.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_log_config.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_config.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_log_config.so" /d LONG_NAME="log_config_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_config.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_log_config.so" /d LONG_NAME="log_config_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_log_config - Win32 Debug"
"$(INTDIR)\mod_log_config.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_config.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_log_config.so" /d LONG_NAME="log_config_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_config.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_log_config.so" /d LONG_NAME="log_config_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/loggers/mod_log_forensic.dep b/modules/loggers/mod_log_forensic.dep
index 535a7d06ba..bbc6716b2f 100644
--- a/modules/loggers/mod_log_forensic.dep
+++ b/modules/loggers/mod_log_forensic.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_log_forensic.c : \
@@ -24,34 +17,12 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\server\test_char.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
"..\..\srclib\apr\include\apr_atomic.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_global_mutex.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/loggers/mod_log_forensic.mak b/modules/loggers/mod_log_forensic.mak
index 353082ef6f..f508bfbf9c 100644
--- a/modules/loggers/mod_log_forensic.mak
+++ b/modules/loggers/mod_log_forensic.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_log_forensic.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_forensic.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_log_forensic.so" /d LONG_NAME="log_forensic_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_forensic.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_log_forensic.so" /d LONG_NAME="log_forensic_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_log_forensic - Win32 Debug"
"$(INTDIR)\mod_log_forensic.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_forensic.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_log_forensic.so" /d LONG_NAME="log_forensic_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_log_forensic.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_log_forensic.so" /d LONG_NAME="log_forensic_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/loggers/mod_logio.dep b/modules/loggers/mod_logio.dep
index e1175cb788..a832572e50 100644
--- a/modules/loggers/mod_logio.dep
+++ b/modules/loggers/mod_logio.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_logio.c : \
@@ -25,37 +18,15 @@
"..\..\include\scoreboard.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_log_config.h"\
diff --git a/modules/loggers/mod_logio.mak b/modules/loggers/mod_logio.mak
index 20f63f84cb..a3b704704c 100644
--- a/modules/loggers/mod_logio.mak
+++ b/modules/loggers/mod_logio.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_logio.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_logio.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_logio.so" /d LONG_NAME="logio_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_logio.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_logio.so" /d LONG_NAME="logio_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_logio - Win32 Debug"
"$(INTDIR)\mod_logio.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_logio.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_logio.so" /d LONG_NAME="logio_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_logio.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_logio.so" /d LONG_NAME="logio_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_actions.dep b/modules/mappers/mod_actions.dep
index 923623b0d2..05827cd8aa 100644
--- a/modules/mappers/mod_actions.dep
+++ b/modules/mappers/mod_actions.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_actions.c : \
@@ -27,35 +20,13 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/mappers/mod_actions.mak b/modules/mappers/mod_actions.mak
index a7fb7b468a..d3bb2d003f 100644
--- a/modules/mappers/mod_actions.mak
+++ b/modules/mappers/mod_actions.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_actions.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_actions.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_actions.so" /d LONG_NAME="actions_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_actions.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_actions.so" /d LONG_NAME="actions_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_actions - Win32 Debug"
"$(INTDIR)\mod_actions.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_actions.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_actions.so" /d LONG_NAME="actions_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_actions.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_actions.so" /d LONG_NAME="actions_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_alias.dep b/modules/mappers/mod_alias.dep
index 3f2adaf220..b16f384d1f 100644
--- a/modules/mappers/mod_alias.dep
+++ b/modules/mappers/mod_alias.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_alias.c : \
@@ -24,31 +17,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/mappers/mod_alias.mak b/modules/mappers/mod_alias.mak
index 6e8e42eecf..97274889ba 100644
--- a/modules/mappers/mod_alias.mak
+++ b/modules/mappers/mod_alias.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_alias.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_alias.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_alias.so" /d LONG_NAME="alias_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_alias.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_alias.so" /d LONG_NAME="alias_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_alias - Win32 Debug"
"$(INTDIR)\mod_alias.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_alias.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_alias.so" /d LONG_NAME="alias_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_alias.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_alias.so" /d LONG_NAME="alias_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_dir.dep b/modules/mappers/mod_dir.dep
index 104ad4f172..143fc653c3 100644
--- a/modules/mappers/mod_dir.dep
+++ b/modules/mappers/mod_dir.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_dir.c : \
@@ -27,35 +20,13 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/mappers/mod_dir.mak b/modules/mappers/mod_dir.mak
index 40f963053e..48d66261f9 100644
--- a/modules/mappers/mod_dir.mak
+++ b/modules/mappers/mod_dir.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_dir.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dir.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dir.so" /d LONG_NAME="dir_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dir.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_dir.so" /d LONG_NAME="dir_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_dir - Win32 Debug"
"$(INTDIR)\mod_dir.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dir.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dir.so" /d LONG_NAME="dir_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_dir.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_dir.so" /d LONG_NAME="dir_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_imagemap.dep b/modules/mappers/mod_imagemap.dep
index 4e0b2ba4ba..6f62d786a3 100644
--- a/modules/mappers/mod_imagemap.dep
+++ b/modules/mappers/mod_imagemap.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_imagemap.c : \
@@ -28,36 +21,14 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/mappers/mod_imagemap.mak b/modules/mappers/mod_imagemap.mak
index 3a597fe8b1..0191366d0d 100644
--- a/modules/mappers/mod_imagemap.mak
+++ b/modules/mappers/mod_imagemap.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_imagemap.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_imagemap.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_imagemap.so" /d LONG_NAME="imagemap_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_imagemap.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_imagemap.so" /d LONG_NAME="imagemap_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_imagemap - Win32 Debug"
"$(INTDIR)\mod_imagemap.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_imagemap.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_imagemap.so" /d LONG_NAME="imagemap_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_imagemap.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_imagemap.so" /d LONG_NAME="imagemap_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_negotiation.dep b/modules/mappers/mod_negotiation.dep
index ba088f7991..1fdfa39c8c 100644
--- a/modules/mappers/mod_negotiation.dep
+++ b/modules/mappers/mod_negotiation.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_negotiation.c : \
@@ -26,36 +19,14 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/mappers/mod_negotiation.mak b/modules/mappers/mod_negotiation.mak
index d2309866e1..1b43046ff4 100644
--- a/modules/mappers/mod_negotiation.mak
+++ b/modules/mappers/mod_negotiation.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_negotiation.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_negotiation.so" /d LONG_NAME="negotiation_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_negotiation.so" /d LONG_NAME="negotiation_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_negotiation - Win32 Debug"
"$(INTDIR)\mod_negotiation.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_negotiation.so" /d LONG_NAME="negotiation_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_negotiation.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_negotiation.so" /d LONG_NAME="negotiation_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_rewrite.dep b/modules/mappers/mod_rewrite.dep
index 499ed03a5d..40471964c2 100644
--- a/modules/mappers/mod_rewrite.dep
+++ b/modules/mappers/mod_rewrite.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_rewrite.c : \
@@ -26,40 +19,18 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_signal.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
"..\ssl\mod_ssl.h"\
".\mod_rewrite.h"\
diff --git a/modules/mappers/mod_rewrite.mak b/modules/mappers/mod_rewrite.mak
index 05b6a84669..6cdee779c0 100644
--- a/modules/mappers/mod_rewrite.mak
+++ b/modules/mappers/mod_rewrite.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_rewrite.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_rewrite.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_rewrite.so" /d LONG_NAME="rewrite_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_rewrite.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_rewrite.so" /d LONG_NAME="rewrite_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug"
"$(INTDIR)\mod_rewrite.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_rewrite.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_rewrite.so" /d LONG_NAME="rewrite_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_rewrite.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_rewrite.so" /d LONG_NAME="rewrite_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_speling.dep b/modules/mappers/mod_speling.dep
index 5afca5d9a1..8ad959d032 100644
--- a/modules/mappers/mod_speling.dep
+++ b/modules/mappers/mod_speling.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_speling.c : \
@@ -24,31 +17,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/mappers/mod_speling.mak b/modules/mappers/mod_speling.mak
index 8482bb1621..19f8ee8c32 100644
--- a/modules/mappers/mod_speling.mak
+++ b/modules/mappers/mod_speling.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_speling.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_speling.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_speling.so" /d LONG_NAME="speling_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_speling.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_speling.so" /d LONG_NAME="speling_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_speling - Win32 Debug"
"$(INTDIR)\mod_speling.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_speling.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_speling.so" /d LONG_NAME="speling_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_speling.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_speling.so" /d LONG_NAME="speling_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_userdir.dep b/modules/mappers/mod_userdir.dep
index 859516b852..babf5d62a4 100644
--- a/modules/mappers/mod_userdir.dep
+++ b/modules/mappers/mod_userdir.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_userdir.c : \
@@ -22,27 +15,10 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/mappers/mod_userdir.mak b/modules/mappers/mod_userdir.mak
index 1f7f08ec92..e9fc2308b1 100644
--- a/modules/mappers/mod_userdir.mak
+++ b/modules/mappers/mod_userdir.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_userdir.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_userdir.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_userdir.so" /d LONG_NAME="userdir_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_userdir.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_userdir.so" /d LONG_NAME="userdir_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_userdir - Win32 Debug"
"$(INTDIR)\mod_userdir.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_userdir.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_userdir.so" /d LONG_NAME="userdir_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_userdir.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_userdir.so" /d LONG_NAME="userdir_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/mappers/mod_vhost_alias.dep b/modules/mappers/mod_vhost_alias.dep
index bebd7a7f21..f2ddbe01b3 100644
--- a/modules/mappers/mod_vhost_alias.dep
+++ b/modules/mappers/mod_vhost_alias.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_vhost_alias.c : \
@@ -23,30 +16,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/mappers/mod_vhost_alias.mak b/modules/mappers/mod_vhost_alias.mak
index 1e272981e9..ba0942d4cb 100644
--- a/modules/mappers/mod_vhost_alias.mak
+++ b/modules/mappers/mod_vhost_alias.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_vhost_alias.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_vhost_alias.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_vhost_alias.so" /d LONG_NAME="vhost_alias_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_vhost_alias.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_vhost_alias.so" /d LONG_NAME="vhost_alias_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_vhost_alias - Win32 Debug"
"$(INTDIR)\mod_vhost_alias.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_vhost_alias.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_vhost_alias.so" /d LONG_NAME="vhost_alias_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_vhost_alias.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_vhost_alias.so" /d LONG_NAME="vhost_alias_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_cern_meta.dep b/modules/metadata/mod_cern_meta.dep
index e9201653e2..b5b0f97495 100644
--- a/modules/metadata/mod_cern_meta.dep
+++ b/modules/metadata/mod_cern_meta.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_cern_meta.c : \
@@ -25,34 +18,12 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_cern_meta.mak b/modules/metadata/mod_cern_meta.mak
index 55762df77b..81aa942b1d 100644
--- a/modules/metadata/mod_cern_meta.mak
+++ b/modules/metadata/mod_cern_meta.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_cern_meta.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cern_meta.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_cern_meta.so" /d LONG_NAME="cern_meta_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cern_meta.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_cern_meta.so" /d LONG_NAME="cern_meta_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug"
"$(INTDIR)\mod_cern_meta.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cern_meta.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_cern_meta.so" /d LONG_NAME="cern_meta_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_cern_meta.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_cern_meta.so" /d LONG_NAME="cern_meta_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_env.dep b/modules/metadata/mod_env.dep
index 521faf5c57..389284d580 100644
--- a/modules/metadata/mod_env.dep
+++ b/modules/metadata/mod_env.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_env.c : \
@@ -23,28 +16,10 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_env.mak b/modules/metadata/mod_env.mak
index 180b162902..f5b114a5e7 100644
--- a/modules/metadata/mod_env.mak
+++ b/modules/metadata/mod_env.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_env.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_env.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_env.so" /d LONG_NAME="env_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_env.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_env.so" /d LONG_NAME="env_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_env - Win32 Debug"
"$(INTDIR)\mod_env.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_env.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_env.so" /d LONG_NAME="env_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_env.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_env.so" /d LONG_NAME="env_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_expires.dep b/modules/metadata/mod_expires.dep
index d4a4564ea2..3f21bb04cd 100644
--- a/modules/metadata/mod_expires.dep
+++ b/modules/metadata/mod_expires.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_expires.c : \
@@ -24,34 +17,12 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_expires.mak b/modules/metadata/mod_expires.mak
index c93b9696c4..ad4bd252c7 100644
--- a/modules/metadata/mod_expires.mak
+++ b/modules/metadata/mod_expires.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_expires.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_expires.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_expires.so" /d LONG_NAME="expires_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_expires.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_expires.so" /d LONG_NAME="expires_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_expires - Win32 Debug"
"$(INTDIR)\mod_expires.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_expires.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_expires.so" /d LONG_NAME="expires_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_expires.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_expires.so" /d LONG_NAME="expires_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_headers.dep b/modules/metadata/mod_headers.dep
index 08afca7c2e..8f6df404b0 100644
--- a/modules/metadata/mod_headers.dep
+++ b/modules/metadata/mod_headers.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_headers.c : \
@@ -24,37 +17,15 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
"..\ssl\mod_ssl.h"\
diff --git a/modules/metadata/mod_headers.mak b/modules/metadata/mod_headers.mak
index 68fc5a654f..25c0ce7db2 100644
--- a/modules/metadata/mod_headers.mak
+++ b/modules/metadata/mod_headers.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_headers.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_headers.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_headers.so" /d LONG_NAME="headers_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_headers.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_headers.so" /d LONG_NAME="headers_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_headers - Win32 Debug"
"$(INTDIR)\mod_headers.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_headers.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_headers.so" /d LONG_NAME="headers_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_headers.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_headers.so" /d LONG_NAME="headers_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_ident.dep b/modules/metadata/mod_ident.dep
index 1b933b7f1f..eeddfa4dd8 100644
--- a/modules/metadata/mod_ident.dep
+++ b/modules/metadata/mod_ident.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_ident.c : \
@@ -25,31 +18,12 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_ident.mak b/modules/metadata/mod_ident.mak
index c53634a872..5951a35569 100644
--- a/modules/metadata/mod_ident.mak
+++ b/modules/metadata/mod_ident.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_ident.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ident.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ident.so" /d LONG_NAME="ident_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ident.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ident.so" /d LONG_NAME="ident_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_ident - Win32 Debug"
"$(INTDIR)\mod_ident.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ident.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ident.so" /d LONG_NAME="ident_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ident.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ident.so" /d LONG_NAME="ident_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_mime_magic.dep b/modules/metadata/mod_mime_magic.dep
index 53e8fa63b0..dc338ae8af 100644
--- a/modules/metadata/mod_mime_magic.dep
+++ b/modules/metadata/mod_mime_magic.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_mime_magic.c : \
@@ -26,36 +19,14 @@
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_mime_magic.mak b/modules/metadata/mod_mime_magic.mak
index be58d1fb4a..01d1849371 100644
--- a/modules/metadata/mod_mime_magic.mak
+++ b/modules/metadata/mod_mime_magic.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_mime_magic.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime_magic.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_mime_magic.so" /d LONG_NAME="mime_magic_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime_magic.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_mime_magic.so" /d LONG_NAME="mime_magic_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_mime_magic - Win32 Debug"
"$(INTDIR)\mod_mime_magic.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime_magic.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_mime_magic.so" /d LONG_NAME="mime_magic_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_mime_magic.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_mime_magic.so" /d LONG_NAME="mime_magic_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_setenvif.dep b/modules/metadata/mod_setenvif.dep
index 0f47fe2b69..542ea405b2 100644
--- a/modules/metadata/mod_setenvif.dep
+++ b/modules/metadata/mod_setenvif.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_setenvif.c : \
@@ -24,36 +17,14 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_setenvif.mak b/modules/metadata/mod_setenvif.mak
index 61076fb026..1fcfab046b 100644
--- a/modules/metadata/mod_setenvif.mak
+++ b/modules/metadata/mod_setenvif.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_setenvif.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_setenvif.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_setenvif.so" /d LONG_NAME="setenvif_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_setenvif.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_setenvif.so" /d LONG_NAME="setenvif_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_setenvif - Win32 Debug"
"$(INTDIR)\mod_setenvif.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_setenvif.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_setenvif.so" /d LONG_NAME="setenvif_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_setenvif.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_setenvif.so" /d LONG_NAME="setenvif_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_unique_id.dep b/modules/metadata/mod_unique_id.dep
index e31b9aa95e..c10670255d 100644
--- a/modules/metadata/mod_unique_id.dep
+++ b/modules/metadata/mod_unique_id.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_unique_id.c : \
@@ -23,32 +16,10 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_unique_id.mak b/modules/metadata/mod_unique_id.mak
index 690a291eba..37567d9677 100644
--- a/modules/metadata/mod_unique_id.mak
+++ b/modules/metadata/mod_unique_id.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_unique_id.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_unique_id.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_unique_id.so" /d LONG_NAME="unique_id_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_unique_id.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_unique_id.so" /d LONG_NAME="unique_id_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_unique_id - Win32 Debug"
"$(INTDIR)\mod_unique_id.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_unique_id.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_unique_id.so" /d LONG_NAME="unique_id_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_unique_id.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_unique_id.so" /d LONG_NAME="unique_id_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_usertrack.dep b/modules/metadata/mod_usertrack.dep
index a9d51887d9..c0f04f926a 100644
--- a/modules/metadata/mod_usertrack.dep
+++ b/modules/metadata/mod_usertrack.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_usertrack.c : \
@@ -23,30 +16,13 @@
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
"..\..\include\util_filter.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_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/metadata/mod_usertrack.mak b/modules/metadata/mod_usertrack.mak
index 49c9aebbab..7c49135365 100644
--- a/modules/metadata/mod_usertrack.mak
+++ b/modules/metadata/mod_usertrack.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_usertrack.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug"
"$(INTDIR)\mod_usertrack.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/metadata/mod_version.dep b/modules/metadata/mod_version.dep
index c67599f93a..999fb77c19 100644
--- a/modules/metadata/mod_version.dep
+++ b/modules/metadata/mod_version.dep
@@ -2,13 +2,6 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
.\mod_version.c : \
@@ -21,29 +14,11 @@
"..\..\include\httpd.h"\
"..\..\include\os.h"\
"..\..\include\util_cfgtree.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
diff --git a/modules/metadata/mod_version.mak b/modules/metadata/mod_version.mak
index 6d619fc3b0..8e40489f49 100644
--- a/modules/metadata/mod_version.mak
+++ b/modules/metadata/mod_version.mak
@@ -331,14 +331,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_version.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_version.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_version.so" /d LONG_NAME="version_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_version.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_version.so" /d LONG_NAME="version_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_version - Win32 Debug"
"$(INTDIR)\mod_version.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_version.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_version.so" /d LONG_NAME="version_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_version.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_version.so" /d LONG_NAME="version_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy.dep b/modules/proxy/mod_proxy.dep
index ccfe30a46a..62e3a89fd9 100644
--- a/modules/proxy/mod_proxy.dep
+++ b/modules/proxy/mod_proxy.dep
@@ -22,44 +22,20 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
"..\generators\mod_status.h"\
"..\ssl\mod_ssl.h"\
".\mod_proxy.h"\
@@ -87,55 +63,24 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy.mak b/modules/proxy/mod_proxy.mak
index be163120c5..395d24304f 100644
--- a/modules/proxy/mod_proxy.mak
+++ b/modules/proxy/mod_proxy.mak
@@ -344,14 +344,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy.so" /d LONG_NAME="proxy_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy.so" /d LONG_NAME="proxy_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug"
"$(INTDIR)\mod_proxy.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy.so" /d LONG_NAME="proxy_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy.so" /d LONG_NAME="proxy_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy_ajp.dep b/modules/proxy/mod_proxy_ajp.dep
index 28953158a2..769e84b37c 100644
--- a/modules/proxy/mod_proxy_ajp.dep
+++ b/modules/proxy/mod_proxy_ajp.dep
@@ -20,45 +20,21 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\ajp.h"\
".\mod_proxy.h"\
@@ -83,45 +59,21 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\ajp.h"\
".\ajp_header.h"\
".\mod_proxy.h"\
@@ -147,45 +99,21 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\ajp.h"\
".\mod_proxy.h"\
@@ -210,45 +138,21 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\ajp.h"\
".\mod_proxy.h"\
@@ -273,56 +177,25 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\ajp.h"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy_ajp.mak b/modules/proxy/mod_proxy_ajp.mak
index 52c23a3df6..399152c912 100644
--- a/modules/proxy/mod_proxy_ajp.mak
+++ b/modules/proxy/mod_proxy_ajp.mak
@@ -399,14 +399,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy_ajp.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ajp.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_ajp.so" /d LONG_NAME="proxy_ajp_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ajp.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_ajp.so" /d LONG_NAME="proxy_ajp_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy_ajp - Win32 Debug"
"$(INTDIR)\mod_proxy_ajp.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ajp.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_ajp.so" /d LONG_NAME="proxy_ajp_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ajp.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_ajp.so" /d LONG_NAME="proxy_ajp_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy_balancer.dep b/modules/proxy/mod_proxy_balancer.dep
index c1779e423c..8e16ed6a63 100644
--- a/modules/proxy/mod_proxy_balancer.dep
+++ b/modules/proxy/mod_proxy_balancer.dep
@@ -22,56 +22,25 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
"..\..\srclib\apr-util\include\apr_uuid.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy_balancer.mak b/modules/proxy/mod_proxy_balancer.mak
index b2e28d1baa..9dc5cf84a8 100644
--- a/modules/proxy/mod_proxy_balancer.mak
+++ b/modules/proxy/mod_proxy_balancer.mak
@@ -363,14 +363,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy_balancer.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_balancer.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_balancer.so" /d LONG_NAME="proxy_balancer_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_balancer.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_balancer.so" /d LONG_NAME="proxy_balancer_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy_balancer - Win32 Debug"
"$(INTDIR)\mod_proxy_balancer.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_balancer.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_balancer.so" /d LONG_NAME="proxy_balancer_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_balancer.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_balancer.so" /d LONG_NAME="proxy_balancer_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy_connect.dep b/modules/proxy/mod_proxy_connect.dep
index 4dc3e12200..1f24cd81fd 100644
--- a/modules/proxy/mod_proxy_connect.dep
+++ b/modules/proxy/mod_proxy_connect.dep
@@ -20,54 +20,23 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy_connect.mak b/modules/proxy/mod_proxy_connect.mak
index b8071d24a1..700bee63ec 100644
--- a/modules/proxy/mod_proxy_connect.mak
+++ b/modules/proxy/mod_proxy_connect.mak
@@ -363,14 +363,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy_connect.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_connect.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_connect.so" /d LONG_NAME="proxy_connect_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_connect.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_connect.so" /d LONG_NAME="proxy_connect_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy_connect - Win32 Debug"
"$(INTDIR)\mod_proxy_connect.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_connect.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_connect.so" /d LONG_NAME="proxy_connect_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_connect.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_connect.so" /d LONG_NAME="proxy_connect_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy_ftp.dep b/modules/proxy/mod_proxy_ftp.dep
index 5f4a9fbce7..9044bb0006 100644
--- a/modules/proxy/mod_proxy_ftp.dep
+++ b/modules/proxy/mod_proxy_ftp.dep
@@ -20,55 +20,24 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
"..\..\srclib\apr\include\apr_version.h"\
- "..\..\srclib\apr\include\apr_want.h"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy_ftp.mak b/modules/proxy/mod_proxy_ftp.mak
index 8145c5bae6..9ec3e33e09 100644
--- a/modules/proxy/mod_proxy_ftp.mak
+++ b/modules/proxy/mod_proxy_ftp.mak
@@ -363,14 +363,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy_ftp.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ftp.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_ftp.so" /d LONG_NAME="proxy_ftp_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ftp.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_ftp.so" /d LONG_NAME="proxy_ftp_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy_ftp - Win32 Debug"
"$(INTDIR)\mod_proxy_ftp.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ftp.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_ftp.so" /d LONG_NAME="proxy_ftp_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_ftp.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_ftp.so" /d LONG_NAME="proxy_ftp_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy_http.dep b/modules/proxy/mod_proxy_http.dep
index 5e9992aca0..8485044c6e 100644
--- a/modules/proxy/mod_proxy_http.dep
+++ b/modules/proxy/mod_proxy_http.dep
@@ -20,54 +20,23 @@
"..\..\include\util_charset.h"\
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy_http.mak b/modules/proxy/mod_proxy_http.mak
index 321bca839a..97697fdc6f 100644
--- a/modules/proxy/mod_proxy_http.mak
+++ b/modules/proxy/mod_proxy_http.mak
@@ -363,14 +363,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy_http.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_http.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_http.so" /d LONG_NAME="proxy_http_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_http.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_http.so" /d LONG_NAME="proxy_http_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy_http - Win32 Debug"
"$(INTDIR)\mod_proxy_http.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_http.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_http.so" /d LONG_NAME="proxy_http_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_http.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_http.so" /d LONG_NAME="proxy_http_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/proxy/mod_proxy_scgi.dep b/modules/proxy/mod_proxy_scgi.dep
index 6253d4cc22..b42fc887f2 100644
--- a/modules/proxy/mod_proxy_scgi.dep
+++ b/modules/proxy/mod_proxy_scgi.dep
@@ -21,54 +21,23 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
"..\..\srclib\apr-util\include\apr_md5.h"\
"..\..\srclib\apr-util\include\apr_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
- "..\..\srclib\apr-util\include\apr_reslist.h"\
"..\..\srclib\apr-util\include\apr_strmatch.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.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"\
".\mod_proxy.h"\
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/proxy/mod_proxy_scgi.mak b/modules/proxy/mod_proxy_scgi.mak
index 95a6413a28..7544f2d04e 100644
--- a/modules/proxy/mod_proxy_scgi.mak
+++ b/modules/proxy/mod_proxy_scgi.mak
@@ -363,14 +363,14 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_proxy_scgi.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_scgi.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_scgi.so" /d LONG_NAME="proxy_scgi_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_scgi.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_proxy_scgi.so" /d LONG_NAME="proxy_scgi_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_proxy_scgi - Win32 Debug"
"$(INTDIR)\mod_proxy_scgi.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_scgi.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_scgi.so" /d LONG_NAME="proxy_scgi_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_proxy_scgi.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_proxy_scgi.so" /d LONG_NAME="proxy_scgi_module for Apache" $(SOURCE)
!ENDIF
diff --git a/modules/ssl/mod_ssl.dep b/modules/ssl/mod_ssl.dep
index 7e95857b9f..9256241a1f 100644
--- a/modules/ssl/mod_ssl.dep
+++ b/modules/ssl/mod_ssl.dep
@@ -23,8 +23,6 @@
"..\..\include\util_filter.h"\
"..\..\include\util_md5.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_md5.h"\
@@ -32,36 +30,19 @@
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\mod_ssl.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
@@ -91,44 +72,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -157,44 +119,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -223,44 +166,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -289,8 +213,6 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.h"\
- "..\..\srclib\apr-util\include\apr_buckets.h"\
"..\..\srclib\apr-util\include\apr_date.h"\
"..\..\srclib\apr-util\include\apr_dbm.h"\
"..\..\srclib\apr-util\include\apr_hooks.h"\
@@ -298,36 +220,19 @@
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -356,44 +261,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -422,44 +308,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -488,44 +355,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -554,44 +402,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -620,44 +449,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -686,44 +496,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
"..\loggers\mod_log_config.h"\
".\mod_ssl.h"\
".\ssl_expr.h"\
@@ -754,44 +545,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -820,44 +592,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -886,44 +639,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -952,44 +686,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_expr_parse.h"\
".\ssl_private.h"\
@@ -1019,44 +734,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
"..\generators\mod_status.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
@@ -1086,44 +782,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -1152,44 +829,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -1218,44 +876,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -1285,44 +924,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -1351,44 +971,25 @@
"..\..\include\util_ebcdic.h"\
"..\..\include\util_filter.h"\
"..\..\include\util_script.h"\
- "..\..\srclib\apr-util\include\apr_anylock.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_optional.h"\
"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
"..\..\srclib\apr-util\include\apr_rmm.h"\
"..\..\srclib\apr-util\include\apr_uri.h"\
- "..\..\srclib\apr-util\include\apr_xlate.h"\
- "..\..\srclib\apr-util\include\apu.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.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_global_mutex.h"\
"..\..\srclib\apr\include\apr_hash.h"\
- "..\..\srclib\apr\include\apr_inherit.h"\
"..\..\srclib\apr\include\apr_lib.h"\
"..\..\srclib\apr\include\apr_mmap.h"\
- "..\..\srclib\apr\include\apr_network_io.h"\
"..\..\srclib\apr\include\apr_poll.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
"..\..\srclib\apr\include\apr_portable.h"\
- "..\..\srclib\apr\include\apr_proc_mutex.h"\
- "..\..\srclib\apr\include\apr_ring.h"\
- "..\..\srclib\apr\include\apr_shm.h"\
"..\..\srclib\apr\include\apr_strings.h"\
- "..\..\srclib\apr\include\apr_tables.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_thread_proc.h"\
"..\..\srclib\apr\include\apr_thread_rwlock.h"\
- "..\..\srclib\apr\include\apr_time.h"\
- "..\..\srclib\apr\include\apr_user.h"\
- "..\..\srclib\apr\include\apr_want.h"\
+ "..\..\srclib\openssl\inc32\openssl\conf.h"\
+ "..\..\srclib\openssl\inc32\openssl\engine.h"\
+ "..\..\srclib\openssl\inc32\openssl\store.h"\
+ "..\..\srclib\openssl\inc32\openssl\ui.h"\
+ "..\..\srclib\openssl\inc32\openssl\x509v3.h"\
".\ssl_expr.h"\
".\ssl_private.h"\
".\ssl_toolkit_compat.h"\
@@ -1413,11 +1014,4 @@
..\..\build\win32\httpd.rc : \
"..\..\include\ap_release.h"\
- "..\..\srclib\apr\include\apr.h"\
- "..\..\srclib\apr\include\apr_allocator.h"\
- "..\..\srclib\apr\include\apr_errno.h"\
- "..\..\srclib\apr\include\apr_general.h"\
- "..\..\srclib\apr\include\apr_pools.h"\
- "..\..\srclib\apr\include\apr_thread_mutex.h"\
- "..\..\srclib\apr\include\apr_want.h"\
diff --git a/modules/ssl/mod_ssl.mak b/modules/ssl/mod_ssl.mak
index ab0702cf4a..003dad97e8 100644
--- a/modules/ssl/mod_ssl.mak
+++ b/modules/ssl/mod_ssl.mak
@@ -709,21 +709,21 @@ SOURCE=..\..\build\win32\httpd.rc
"$(INTDIR)\mod_ssl.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_ssl - Win32 Debug"
"$(INTDIR)\mod_ssl.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "_DEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE)
!ELSEIF "$(CFG)" == "mod_ssl - Win32 Lexical"
"$(INTDIR)\mod_ssl.res" : $(SOURCE) "$(INTDIR)"
- $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE)
+ $(RSC) /l 0x409 /fo"$(INTDIR)\mod_ssl.res" /i "../../include" /i "../../srclib/apr/include" /i ".\..\..\build\win32" /d "NDEBUG" /d BIN_NAME="mod_ssl.so" /d LONG_NAME="proxy_ssl_module for Apache" $(SOURCE)
!ENDIF