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

diff --git a/modules/aaa/mod_auth_basic.dep b/modules/aaa/mod_auth_basic.dep
index 4d5670be1a4216782fb74de463d4a0dae1a5d00f..aab5f656fd434c327a730d43dc4406665a24d056 100644 (file)
--- 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 161663e09e9f619cecd639325923aa01f7c2982b..fb4224df79ef6af1cf766e81cca3b8f5cf28404f 100644 (file)
--- 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 45a7a6ce2cb12a1f2a3cd006bd433782e1136812..b10c17455f3d602e6e86368f14bf49629ec7bf5b 100644 (file)
--- 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 e031eb9792ae1f7858b0346f72067711e47311b0..db5a390e7b0fcb38efce4586b0416ae387ff3ead 100644 (file)
--- 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 6b6a81c01bf2e36cbebe9daad9bd787ab949f4ce..8dcf9084a7cb9eaf050697d0610e59af7e18a7a1 100644 (file)
--- 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 cd8e887c721eb8f31c4a91a458bafa2ba3c3cc90..f9a544074bf4b6101e2c7f242cd2761b3069c891 100644 (file)
--- 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 53ed0c729b553e5898ba30ad339e732a38198fa6..8b90313f01806e33129286534cc8d187264a526c 100644 (file)
--- 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 ecc886962c435337426298f0b6b09dd627ddabc5..54737c5af5aa5acbccba4a3ba6e5ff055acf7414 100644 (file)
--- 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 f2de2c9855e4baaf77fb70b3eef17d90c99e2243..19e5e958913d7dd6708bf3f6a77e29cdf34ad9b7 100644 (file)
--- 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 1e65ab2dc4fbb3323d807f517b37191a01af04b8..0d287e3dbe28307fe2ba3937814b7f9f81764822 100644 (file)
--- 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 57f39470db9e9051d3560605d62bbcc45417b0da..9a283fcce698eb01c1c1ad4099edb0cfa172f763 100644 (file)
--- 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 45bdb1a69c31b1df616aea39682f0e5606d4e8fb..9e61ed457bdca1683749fc43c68653b1b7a450bd 100644 (file)
--- 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 b39964e41ce7ca8bdc4153fe10130422721af6e9..ef61c579d08e3e63da463149b2795e103b2f74e4 100644 (file)
--- 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 b42efb4670468f39b1be0ad2a51df5c276d54a41..c7d457fd3bc78db477fda6b8e05395b062ac30ce 100644 (file)
--- 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 8069bee0afb18bc80161a66fcdbb2083b409b73b..963946b6781f062b40c15059d7e42cadba0930f4 100644 (file)
--- 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 8b84c798491139f960164be0881485afa3aa6c64..f8a6c855bc24cebd46654ba75f3caabaa1a72a07 100644 (file)
--- 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 f41887d765f1a05dbf1e468da7f437d3c830c372..d1405477bcc5264315b4d4212c81c498a99f607a 100644 (file)
--- 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 4ce13b916a8c77cc8d47bc63a4f7c9ddf397b1bc..facd97a322041e256a8d5ede8738a271a90e3b26 100644 (file)
--- 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 70fa96b57eb90153d7901aa491ec965738c83ae3..e925b1ce13501b12645624b7e1a5c474b4c002c1 100644 (file)
--- 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 46a3055b081eaad66fce559b6da374b6bfded6fa..3aa689af96c8816849b5718b6b0052dd807adbb0 100644 (file)
--- 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 11dce9c2a6b320fc5ce9cab0455945d464856261..4f225eabac17fe4fdc8f1251e51759bf46249180 100644 (file)
--- 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 73512b460a135b76b889c3bca74feefb19885467..ed4351148423a8c6262520c5ec732a3613b859a8 100644 (file)
--- 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 7213917d8831d6596e40ee809e128a449ed48aea..2778e35b81c935dea8fa43d7609d498ba26cd7ec 100644 (file)
--- 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 d80a91e2bddf12c2b2780363728de38cdbd2c372..f249131bd60e50e55294f43ce36edb81daff6bb2 100644 (file)
--- 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 2f5765c6cd0eff455a16452a60be2a87e2291503..899f3d921793d9c4b7ea3c0ffc90b4ad9676cde1 100644 (file)
--- 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 ac80f8273684d37a785bdecc12624d62e3ff49d4..a439aa2e5ac27a2903353b3d93944ade823c6c5e 100644 (file)
--- 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 a82048bbe5f6a4cc998f971ed25939d801a8e045..8059d07fcd5838a8bb396d82151f2e6154854b2d 100644 (file)
--- 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 8b33b2760b536115bafff07991267dd4caa9bf7c..a38c80ffa7ebeda07c8d685c137817cf0055c25c 100644 (file)
--- 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 5cfa7fd35f8c13bbdeb1647cf82fb9c96b987c0d..a025ed26f8495aad130fe2053457aab79275082d 100644 (file)
--- 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 5a1fb94932d5b2a5dbd7fa04fb5e83a8daadc691..ff15687485a268d92e730b373bb83f0c8b7fb6ef 100644 (file)
--- 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 9fa4f8d28a246f6b7b794d12ffcaeb9f26af3c36..0e41488b8f7224e86dc83205f053aad0583d0c14 100644 (file)
--- 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 4ba12b989782a28fe19880cd76a4f3528f569315..7edb7cba875f903858de224466bcb6f330b53524 100644 (file)
--- 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 74662fbc5a919c878c58fac59ee04bf707abd91a..901bd4b03380885deaf3783549ad0606534c304c 100644 (file)
--- 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 c539907a97709a4fd0aff26618f66476588020d6..8eb0112079cb4d420e704ef7814a283463cc8e30 100644 (file)
--- 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 403af417d0cfdcf0b3d87848770918a8186e88b5..2d058f7abf842f481b326b0b9c8ea39b8f671d94 100644 (file)
--- 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 3c9b871c4622a9c4b8cd0ed793b4dc2a06d4f759..7e5bec53f636d7b80694cdb9c02d6a0e49ad584e 100644 (file)
--- 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 e1feccd7f622b3fbd16bb19ecfc42f5795a09ce3..2d8bc202f10e000897ea75bae5a949f3d05214e6 100644 (file)
--- 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 d5b2803e9e3f6c5a4c15173260eb651f4e9c8886..656f1b98b72f56d92e2e16a31ad9fb6e4fadd433 100644 (file)
--- 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 2a68f3a8d9e557caf89ebe5585a22e315f8b991e..2cbefb3fd118ef22ec144631b7a801b95198d0f4 100644 (file)
--- 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 c5f25987d9e28ce1bd197698158833a8f3aa366a..ece8e6f95ac02ef0f5c7ddef8f04579f8966e9d4 100644 (file)
--- 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 98d790daf85fbdc2c879ebd99c9ebb1fb100c237..4869e6d9e9a4c66720a7ee784bd89eae3ca63fdb 100644 (file)
--- 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 80f0b2d4f5de58ffec228ed1c2c446df84d92311..6d96ff2e0557a04f90c633a204307c9d4ec676e9 100644 (file)
--- 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 ae6e5e8fcc2aa8262cfce0ccdc99a401ffbac1ea..44317880e71fc6a47cbc7a9e4480b7e333fa604c 100644 (file)
--- 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 8de5b25b74d58e66811bad4f6a08f703c27f2d3d..92f44574ec72b7058bc91f3cc48905c455a35964 100644 (file)
--- 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 8b342c5422451009312423d7660ff232c2c61196..f7085de28bceae5a5f46e7fc131d984a89d4026e 100644 (file)
--- 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 794335c44d78fa744dd7f7c4f312ee2d86c0b3c9..2bd5751194b9d7ed18d292e7024346468e5c18a5 100644 (file)
--- 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 38a22aff38962912e77f174eab7a74d54aad98de..b47a3df29c558e9a40e60244f8f2427d463502e5 100644 (file)
--- 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 0fd3acc3e78ef566a0daa3f4c7b379261d48cdac..a2e397d5f7f8e583bfb55249677098c4f9b2a552 100644 (file)
--- 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 0a14ca70a339793bf062b29ac4d3fa719991a05e..d4f04674eb0b46200eb05d8e745ae51b1a532fd3 100644 (file)
--- 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 0f402eb92b430c26525fcb7690e652fc5e3ac18f..dbeedd96bfef7231e2685e6c23817d79456cb4aa 100644 (file)
--- 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 b4dd2d398a112630477828143dd83fa979ec051c..df79222efc109479fb33a2dad430fbf32a4ae2ba 100644 (file)
--- 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 1b2ebdb6d9857fbef1d7ae73515d0bcd7316bce3..f30299eb66749812943ecef3bfe67d15d0413f76 100644 (file)
--- 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 bf8750896504e12c59ad7787179b265cd446f4a1..f669814447297196099cbee5fe45c1cd69d6e54f 100644 (file)
--- 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 0547dbfaa47d711ebb97e6668bb68b160b17fc1b..94b614a2ae4a7d6eb838eabf344ac36b61f26de4 100644 (file)
--- 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 6196ced84504c99cf12ece10ea14f8322c357340..cc97f8fd40c724b4b50d96dceac59ce9087bc753 100644 (file)
--- 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 b2f1c4c70376e9e51489eed7300259471b0742ee..7c36129d6f4e1146936cf34b8cdbed6f72cb6ff6 100644 (file)
--- 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 983883ff5694ed20b73abf945abadcd3f9b1178e..ad7731510e38fc5ff09c0c3a667c86e216c003c0 100644 (file)
--- 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 dd3324026b56c0e8ae55a67692fcb3ef2f2a7ed5..74af05ad6232d4e593faa063063db7c24fa3087e 100644 (file)
--- 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 4cce5c230df5bd9434ef33c6c038baca757024bb..88d4bff4aa514275d731f8fcc8662e5a1d7b6018 100644 (file)
--- 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 775e8964f9871a9c839d5a8f0c0b5e771a8eb1d3..2d8f60c33a64e8e0f8db24102d62751b7342b596 100644 (file)
--- 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 70a3bfe0401224b634ba0e42df817ab1d6d5dc0f..e6f20e7ddbb437d69ac1f18eec3c171fe2b6d5d4 100644 (file)
--- 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 f342595366ff92980109f08d873071eee9e5a94d..8870f9add36fce4e65256113001b26cd86c56745 100644 (file)
--- 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 0524b18b8f11e9356c1a423fd609ac725cd1e428..75fc104ee16072226bac359ac70628da4325f477 100644 (file)
--- 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 070282c4b9dd017c8ca629078eea85ba64eb352c..4549eabb482ace36bc52960ef0f044c811be3912 100644 (file)
--- 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 9428e2172e49731d44a5aea1197662a5d86929c4..29ef590c244725673cb45c6585d131940c97214c 100644 (file)
--- 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 09dcd20c83d201d802c22f4235e76e4874851765..08faf1d2c866512ebd033c79ac43aef97bb1d693 100644 (file)
--- 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 a61a3603ae304e6ee7fcbd4a06818687969b2d51..dda01b4e50c3b060b01efc26e8fcbbc11ab818e6 100644 (file)
--- 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 b079c85e92597b0a36e61e33acc145e3f6f52951..c1728072f8a86f4a4b78aa5f5183bc596d219a54 100644 (file)
--- 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 e5039efff14879b1981990ccec40c33154fa1887..168b2b5eb2d15559c3fb20ecda7105ece24d50cc 100644 (file)
--- 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 dac29c76d01dc9e9f5b5078f7b070ae56f5f3bfb..3ec387891199ec990417bf5f044ad5750a0a554b 100644 (file)
--- 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 769d2ab6137e05cb96e36ed8fe1c0ff7f78a4d02..7a96e6578afd45e5e1102018ff5c8172f0adf8a2 100644 (file)
--- 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 7006c83bca8a3bf6da106d1965c5b6c6d7dc248d..3839f8343b6f21b0933fa0aaa048119912f4ebc1 100644 (file)
--- 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 9b7051bd84b349ae91d668f7c046e4fe260ac8fa..4ae89e5babf73f82438c298b172cd9cf76ffa8ac 100644 (file)
--- 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 ad6ab464dc315d804528449b156e5f38dd43d15a..520cdff184664e0feb0cab7416ede8d6bc2d215f 100644 (file)
--- 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 21a1281b4fb70e03af64065010e58819927d25c6..3f151ba028e5a58f71ff92552f33270532e4359d 100644 (file)
--- 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 fabb2560df3f8ac6d11369fce15b1edf6f577a92..79bf9f55968a7b86eab9fcd7c5d11dfbe4295a0d 100644 (file)
--- 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 19f1d86ffe8f303938092cfcab92a0323df25205..0f46508515188f18f2671a58400dfef0900bd125 100644 (file)
--- 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 e0d30f71a53d1036c55178cbaadb762384187e57..baf714b8ee272e0636e665b7a9752599d5d175a0 100644 (file)
--- 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 5f1524681a75a08b567e2db331c030baaa5f61d4..69df8afa47225f5bd03cfbaa65eff4f1a44fa4f4 100644 (file)
--- 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 75470f7263d1f7ce99c6ecf02662a15b84469203..0fe345b93e3839cac8342c998100947ac0b4aed1 100644 (file)
--- 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 5f5b44fc91a25d312f5115b682407740364f6852..00fa95c6fba6108eb23710bd29a7e6e9816d7329 100644 (file)
--- 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 d185cb1136a17664c889ea2f230ad56a4b1b9035..92d30fa94fe5400887066996b9c6d720b085af27 100644 (file)
--- 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 5f773c99c4e2bb8682b07f65ce9194e82548bb03..6f85de29933a68686a71d7f7f2c4c1e36cde7b36 100644 (file)
--- 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 1ad7e2fa2e4a53c749ec07179fd48f059e04b4b5..5c5b41905ff2584dc2d7624d554770d4028deedc 100644 (file)
--- 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 f92611fcb1abb520619a053dd15c464caf6575b3..9f977b420ff867d9809d3e53655f518c93567bb3 100644 (file)
--- 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 2d25ac00d08bdb1ea316aa17020d3d86bb1e52f8..e2e945bf85ccc041f8b2b18085d661464b40fdd0 100644 (file)
--- 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 c9b9a5cfcf2f635906980bd0d5ba277d882e7e63..62ea880da65b5c85124b5828370f98d3713fe20e 100644 (file)
--- 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 ca3b6c1d0b99fc44a42c19bcfb771769553dcdb6..36bb0f632f81f37ee8ac989d78854eec4871630c 100644 (file)
--- 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 7a0f057ef4c19c8d16bee021bc7e9e4af3b9615e..4e4755fc382bd6ee06d037a6c79ae5fdf54d48f8 100644 (file)
--- 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 6834c4bab1fef2fe29c5740ca4de04f098e8a87b..ab982092781b2333cc35a32b38e67be237bbbab7 100644 (file)
--- 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 535a7d06ba6d06ce994146eaf9cf43fbc0532e4e..bbc6716b2f00363d9a15ec25f3f336aba8ac4203 100644 (file)
--- 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 353082ef6f35091e1921f7f3dbbb94110beefd30..f508bfbf9cc58702782fcaa44f86380f1671495b 100644 (file)
--- 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 e1175cb788636fa0da2c4ff18f64b9d1cd928a32..a832572e5035b5bdb2efcb8b2feef5fa0a316f7a 100644 (file)
--- 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 20f63f84cb50f728aaafe6021a97113a23f2d847..a3b704704cb278804abc9a03451a1c531feef963 100644 (file)
--- 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 923623b0d2aee966c4f7beddb6b9dececc9088af..05827cd8aaaa6684c3edb15f45efc0fe60deb741 100644 (file)
--- 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 a7fb7b468a4916edffac1d9f42ddfc94a1562ab6..d3bb2d003fe425b0848c4b9497cd3f6fb20ad652 100644 (file)
--- 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 3f2adaf220666700629a3e56392c23361abd3273..b16f384d1f24446858e83703c5c3bb16267df280 100644 (file)
--- 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 6e8e42eecf8c83841d6ce89c53433b4dc0f1cba2..97274889ba4acfc4ea707fcb514d4c4c62640bc0 100644 (file)
--- 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 104ad4f172d68cbc72aa369f7cc8dd60d20a4535..143fc653c305227bdd0e03472386cf2b4e5fc598 100644 (file)
--- 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 40f963053e4a49ba12f17c4d71d63d772b4894f9..48d66261f9b70d24d05e814fbf8d089a492ac49c 100644 (file)
--- 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 4e0b2ba4bab9f65d0c2ebe683e9c54fbe51537e2..6f62d786a3bca26d69c0d6d988958c5b2f62a921 100644 (file)
--- 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 3a597fe8b18986b76038a2156f30c575ef992141..0191366d0de18ec16407d632328a8657fca8acb3 100644 (file)
--- 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 ba088f79916536ad690158b6206cc7a484d185be..1fdfa39c8c50a6b8a0e60ec3b116b31f37b146dd 100644 (file)
--- 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 d2309866e1fc28c2f51fac338ccadb55934b5a22..1b43046ff47db798eb810892d60c9fb22984f056 100644 (file)
--- 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 499ed03a5d39bc703be6347689613f5ac0e79f7b..40471964c2c3a9a4b4531e0fc6b9fc7bab1e88b6 100644 (file)
--- 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 05b6a8466941edf5735d3b3d39aaa11f7863530c..6cdee779c0349d2904c58b12fb36cf6e5c9ba295 100644 (file)
--- 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 5afca5d9a187728935da5b8329b6ab1b5600ce15..8ad959d032a74b8a584ee3b893e0ff9c9a8c6e5c 100644 (file)
--- 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 8482bb1621a8d58b1534cdccb483627414a37ada..19f8ee8c32c37a6f2d88a68cc1a04ebcbaa98dd5 100644 (file)
--- 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 859516b85275d09face6d4a1e5a6de086e70d22c..babf5d62a42660601fcf8b2de0bbc0d3a66acb33 100644 (file)
--- 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 1f7f08ec925482db8bc9b88085522e548723c8b1..e9fc2308b11ed757dbb14da10fb0937c418b950a 100644 (file)
--- 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 bebd7a7f21b864315f25c915034c7bc7c922fdd1..f2ddbe01b370ee742c9db09a2c977e3956a76133 100644 (file)
--- 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 1e272981e9cdd1d1dcb262e30b0af5e14e4d2930..ba0942d4cbc07c409acaf10208464e422d5aac6c 100644 (file)
--- 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 e9201653e2371a9c8bf861b4324f379d5d530ce3..b5b0f9749533dc7d7c5e040f124a00be684cfd58 100644 (file)
--- 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 55762df77b8bef3dde221138a802a7caa84a12b8..81aa942b1d5b39bc70769d17bea67f478c9e3d0e 100644 (file)
--- 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 521faf5c57536263f968ccc431c31f270d4c6b60..389284d58008e0c6e6540567df54a411302e84b9 100644 (file)
--- 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 180b1629025e2e16d63a45c608be9c6a8a69180b..f5b114a5e7b8abfa5cbf6b32358f155b497f265d 100644 (file)
--- 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 d4a4564ea2e972ead22f49fb3d86c5a3bdd6c628..3f21bb04cdaa0ae4665c44785b9b8c6f7e9c304f 100644 (file)
--- 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 c93b9696c4ecedaf3bbb3be1bcab96499bd1b74f..ad4bd252c77bfecd0aa11be7ccf5e56348de3723 100644 (file)
--- 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 08afca7c2e3f28de5e4416a8cb23dd82d5a29f3c..8f6df404b0a81e61b71d658d779a62f8126279e8 100644 (file)
--- 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 68fc5a654f11eb39b04aefe60e9678f85b573881..25c0ce7db25a0bcc58577611326e6703d05f31c8 100644 (file)
--- 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 1b933b7f1fec4064bd33c730163ba4242b6bbc5f..eeddfa4dd8ef6e0fab4e19a4d5ce13a33273ee26 100644 (file)
--- 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 c53634a872eae23c47fc38d996fcc5e6a30127c2..5951a3556954cc13eb381b67591b386ca5cebbf8 100644 (file)
--- 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 53e8fa63b068b89bca828a1ec41045b25ad92de7..dc338ae8af98f360de527d89201493c49a6d8983 100644 (file)
--- 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 be58d1fb4a1300094914841470433a3a7de9f2f1..01d184937116c19d8513267ad678c3c5ba9172df 100644 (file)
--- 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 0f47fe2b69f35fe48b4de1de82d0e1bfcd70eca4..542ea405b25ea3542b7d7b0a92ce12eee299ff7a 100644 (file)
--- 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 61076fb026865e3f0d36f2a0ad5942bfb546ed34..1fcfab046bacb5c5fb9f16fa540e33d1fc0ae72e 100644 (file)
--- 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 e31b9aa95e390223f68b7ca6ebd3e6023e199a51..c10670255d2eddd467dd6877ab99ea69df6a562d 100644 (file)
--- 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 690a291ebab49f5e68fb20ef6d9697e052b079ac..37567d96774572fbb5b52e54242ccef9b0e91f06 100644 (file)
--- 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 a9d51887d97db27270de4ec4a7db08d297a6fe29..c0f04f926a17e26cd764b3730284185398759eb5 100644 (file)
--- 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 49c9aebbab3c32821224ceeb945a28084fb535a9..7c491353650a009f234af4ed81c4fa7ced843703 100644 (file)
--- 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 c67599f93a8d84c5d38e8cc0a7fcbb04e1b8b96c..999fb77c199819c737b7e0c8dbff9b4d8ea39254 100644 (file)
--- 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 6d619fc3b01bcca9a6dcf9decdc09f504e9036b6..8e40489f49da1a7840c54be0bac647ebaa682490 100644 (file)
--- 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 ccfe30a46a2355ad54aef00e77980e097bb14b24..62e3a89fd9e9bb00738d722afe934eecdee0bef6 100644 (file)
--- 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 be163120c596eed8f5807c35c925266c9588e9d1..395d24304f728901f7261dba15f68f0c1a09b683 100644 (file)
--- 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 28953158a2ad3a103cac1e7dbaacf098ea7b98af..769e84b37c9c299d0da4fc13ffb5398bb6dafd0a 100644 (file)
--- 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 52c23a3df6e5ebd398c91032e68c85b8af5db1f9..399152c912ae154511764a24341d75b8671228f4 100644 (file)
--- 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 c1779e423c9375af74c85df4031477445e88d2b0..8e16ed6a632d9c06e40381b40801bc51b8ae0b4a 100644 (file)
--- 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 b2e28d1baaca6bac5aea257f0e6808cf44dee8c8..9dc5cf84a8a110e57aa54a8f41a170e86ef21045 100644 (file)
--- 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 4dc3e12200f86a9dcab0e81f54a53e14ae132995..1f24cd81fd9171f8f3e5fcbba5b68474a7d84528 100644 (file)
--- 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 b8071d24a1ea6a7caf4d287b508040e37859ca7c..700bee63ecf7f19733cda865349dfe400aca5fa5 100644 (file)
--- 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 5f4a9fbce75175939bff00767001c33ad39fd732..9044bb00062f307072cd23857949c2b00eff41ba 100644 (file)
--- 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 8145c5bae62d73312ddb90a5bc0ef947ddb98987..9ec3e33e09d57ce43fcfa28d0cefb07bf0ca160d 100644 (file)
--- 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 5e9992aca0e32b86e4c02ea922e845a635af542c..8485044c6e8537c3be8c3ce8314c6ee971a37e15 100644 (file)
--- 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 321bca839a0f6611cb10cb773dcaa998443b0ee2..97697fdc6f5793b7c1a49a7c819c85ce89f5f13c 100644 (file)
--- 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 6253d4cc22567ebac602456e9b01eecf7e65c236..b42fc887f23340370bd7accd590f3fa913b7d20b 100644 (file)
--- 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 95a6413a28b772eec6d0943c37c317230fb92672..7544f2d04ec07850650f8a323666e03ba0e99b3d 100644 (file)
--- 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 7e95857b9f628967f85999e282de827979871388..9256241a1f2f914f285917669233916647a8590d 100644 (file)
--- 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 ab0702cf4a69dbb32e736083f125833f5f2385ba..003dad97e8812f535637dd439ae9e9294d8cd71d 100644 (file)
--- 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