Commit a779ecb4 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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@1100446 13f79535-47bb-0310-9956-ffa450edef68
parent 6695fec0
Loading
Loading
Loading
Loading
+0 −29
Original line number Diff line number Diff line
@@ -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"\
	

.\server\main.c : \
@@ -37,35 +30,13 @@
	".\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-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_getopt.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"\
	
+1 −802

File changed.

Preview size limit exceeded, changes collapsed.

+0 −28
Original line number Diff line number Diff line
@@ -3,42 +3,14 @@
.\ab.c : \
	"..\include\ap_release.h"\
	"..\srclib\apr-util\include\apr_base64.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_getopt.h"\
	"..\srclib\apr\include\apr_global_mutex.h"\
	"..\srclib\apr\include\apr_inherit.h"\
	"..\srclib\apr\include\apr_lib.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_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"\
	

..\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"\
	
+2 −2
Original line number Diff line number Diff line
@@ -300,14 +300,14 @@ SOURCE=..\build\win32\httpd.rc


"$(INTDIR)\ab.res" : $(SOURCE) "$(INTDIR)"
	$(RSC) /l 0x409 /fo"$(INTDIR)\ab.res" /i "../include" /i "../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="ab.exe" /d LONG_NAME="ApacheBench command line utility" $(SOURCE)
	$(RSC) /l 0x409 /fo"$(INTDIR)\ab.res" /i "../include" /i "../srclib/apr/include" /i ".\..\build\win32" /d "NDEBUG" /d "APP_FILE" /d BIN_NAME="ab.exe" /d LONG_NAME="ApacheBench command line utility" $(SOURCE)


!ELSEIF  "$(CFG)" == "ab - Win32 Debug"


"$(INTDIR)\ab.res" : $(SOURCE) "$(INTDIR)"
	$(RSC) /l 0x409 /fo"$(INTDIR)\ab.res" /i "../include" /i "../srclib/apr/include" /i "\local0\asf\release\build-2.2.17\build\win32" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="ab.exe" /d LONG_NAME="ApacheBench command line utility" $(SOURCE)
	$(RSC) /l 0x409 /fo"$(INTDIR)\ab.res" /i "../include" /i "../srclib/apr/include" /i ".\..\build\win32" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="ab.exe" /d LONG_NAME="ApacheBench command line utility" $(SOURCE)


!ENDIF 
+0 −28
Original line number Diff line number Diff line
@@ -3,42 +3,14 @@
.\ab.c : \
	"..\include\ap_release.h"\
	"..\srclib\apr-util\include\apr_base64.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_getopt.h"\
	"..\srclib\apr\include\apr_global_mutex.h"\
	"..\srclib\apr\include\apr_inherit.h"\
	"..\srclib\apr\include\apr_lib.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_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"\
	

..\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"\
	
Loading