rbb 99/12/16 07:46:18
Modified: src ApacheCore.dsp ApacheCore.mak src/os/win32 modules.c Log: Include mod_include and mod_so in the Windows build. Submitted by: Allan Edwards Reviewed by: Ryan Bloom Revision Changes Path 1.9 +8 -0 apache-2.0/src/ApacheCore.dsp Index: ApacheCore.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ApacheCore.dsp 1999/12/15 19:32:23 1.8 +++ ApacheCore.dsp 1999/12/16 15:46:14 1.9 @@ -190,6 +190,10 @@ # End Source File # Begin Source File +SOURCE=.\modules\standard\mod_include.c +# End Source File +# Begin Source File + SOURCE=.\modules\standard\mod_log_config.c # End Source File # Begin Source File @@ -203,6 +207,10 @@ # Begin Source File SOURCE=.\modules\standard\mod_setenvif.c +# End Source File +# Begin Source File + +SOURCE=.\modules\standard\mod_so.c # End Source File # Begin Source File 1.10 +190 -821 apache-2.0/src/ApacheCore.mak Index: ApacheCore.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.mak,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ApacheCore.mak 1999/12/15 19:32:24 1.9 +++ ApacheCore.mak 1999/12/16 15:46:14 1.10 @@ -74,10 +74,12 @@ [EMAIL PROTECTED] "$(INTDIR)\mod_dir.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_env.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_imap.obj" + [EMAIL PROTECTED] "$(INTDIR)\mod_include.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_log_config.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_mime.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_negotiation.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_setenvif.obj" + [EMAIL PROTECTED] "$(INTDIR)\mod_so.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj" [EMAIL PROTECTED] "$(INTDIR)\modules.obj" [EMAIL PROTECTED] "$(INTDIR)\rfc1413.obj" @@ -139,10 +141,12 @@ "$(INTDIR)\mod_dir.obj" \ "$(INTDIR)\mod_env.obj" \ "$(INTDIR)\mod_imap.obj" \ + "$(INTDIR)\mod_include.obj" \ "$(INTDIR)\mod_log_config.obj" \ "$(INTDIR)\mod_mime.obj" \ "$(INTDIR)\mod_negotiation.obj" \ "$(INTDIR)\mod_setenvif.obj" \ + "$(INTDIR)\mod_so.obj" \ "$(INTDIR)\mod_userdir.obj" \ "$(INTDIR)\modules.obj" \ "$(INTDIR)\rfc1413.obj" \ @@ -224,6 +228,8 @@ [EMAIL PROTECTED] "$(INTDIR)\mod_env.sbr" [EMAIL PROTECTED] "$(INTDIR)\mod_imap.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_imap.sbr" + [EMAIL PROTECTED] "$(INTDIR)\mod_include.obj" + [EMAIL PROTECTED] "$(INTDIR)\mod_include.sbr" [EMAIL PROTECTED] "$(INTDIR)\mod_log_config.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_log_config.sbr" [EMAIL PROTECTED] "$(INTDIR)\mod_mime.obj" @@ -232,6 +238,8 @@ [EMAIL PROTECTED] "$(INTDIR)\mod_negotiation.sbr" [EMAIL PROTECTED] "$(INTDIR)\mod_setenvif.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_setenvif.sbr" + [EMAIL PROTECTED] "$(INTDIR)\mod_so.obj" + [EMAIL PROTECTED] "$(INTDIR)\mod_so.sbr" [EMAIL PROTECTED] "$(INTDIR)\mod_userdir.obj" [EMAIL PROTECTED] "$(INTDIR)\mod_userdir.sbr" [EMAIL PROTECTED] "$(INTDIR)\modules.obj" @@ -296,10 +304,12 @@ "$(INTDIR)\mod_dir.sbr" \ "$(INTDIR)\mod_env.sbr" \ "$(INTDIR)\mod_imap.sbr" \ + "$(INTDIR)\mod_include.sbr" \ "$(INTDIR)\mod_log_config.sbr" \ "$(INTDIR)\mod_mime.sbr" \ "$(INTDIR)\mod_negotiation.sbr" \ "$(INTDIR)\mod_setenvif.sbr" \ + "$(INTDIR)\mod_so.sbr" \ "$(INTDIR)\mod_userdir.sbr" \ "$(INTDIR)\modules.sbr" \ "$(INTDIR)\rfc1413.sbr" \ @@ -349,10 +359,12 @@ "$(INTDIR)\mod_dir.obj" \ "$(INTDIR)\mod_env.obj" \ "$(INTDIR)\mod_imap.obj" \ + "$(INTDIR)\mod_include.obj" \ "$(INTDIR)\mod_log_config.obj" \ "$(INTDIR)\mod_mime.obj" \ "$(INTDIR)\mod_negotiation.obj" \ "$(INTDIR)\mod_setenvif.obj" \ + "$(INTDIR)\mod_so.obj" \ "$(INTDIR)\mod_userdir.obj" \ "$(INTDIR)\modules.obj" \ "$(INTDIR)\rfc1413.obj" \ @@ -405,9 +417,6 @@ !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\ "ApacheCore - Win32 Debug" SOURCE=.\main\buff.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_BUFF_=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -441,33 +450,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_BUFF_=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\iol_socket.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\buff.obj" "$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_)\ "$(INTDIR)" @@ -523,9 +514,6 @@ !ENDIF SOURCE=.\main\http_config.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -568,42 +556,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\explain.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_) "$(INTDIR)" @@ -613,9 +574,6 @@ !ENDIF SOURCE=.\main\http_connection.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_C=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -659,43 +617,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_connection.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_C=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\ap_mpm.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_connection.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\mpm_status.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_connection.obj" "$(INTDIR)\http_connection.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_C) "$(INTDIR)" @@ -705,9 +635,6 @@ !ENDIF SOURCE=.\main\http_core.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_CO=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -756,48 +683,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_CO=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_md5.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_connection.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\rfc1413.h"\ - ".\include\util_md5.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_fnmatch.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_CO) "$(INTDIR)" @@ -807,9 +701,6 @@ !ENDIF SOURCE=.\main\http_log.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_L=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -849,39 +740,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_L=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L)\ "$(INTDIR)" @@ -891,9 +758,6 @@ !ENDIF SOURCE=.\main\http_main.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_M=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -931,36 +795,15 @@ ".\main\xmlparse.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_M=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\ap_mpm.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_getopt.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_M) "$(INTDIR)" @@ -970,9 +813,6 @@ !ENDIF SOURCE=.\main\http_protocol.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_P=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1018,45 +858,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_P=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\mpm_status.h"\ - ".\include\util_date.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_P) "$(INTDIR)" @@ -1066,9 +876,6 @@ !ENDIF SOURCE=.\main\http_request.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_R=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1113,43 +920,15 @@ ".\main\scoreboard.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_R=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_fnmatch.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_R) "$(INTDIR)" @@ -1159,9 +938,6 @@ !ENDIF SOURCE=.\main\http_vhost.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_HTTP_V=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1203,41 +979,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_HTTP_V=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\http_vhost.obj" "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_V) "$(INTDIR)" @@ -1247,9 +997,6 @@ !ENDIF SOURCE=.\main\iol_file.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_IOL_F=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1280,30 +1027,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\iol_file.obj" : $(SOURCE) $(DEP_CPP_IOL_F) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_IOL_F=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\iol_file.obj" "$(INTDIR)\iol_file.sbr" : $(SOURCE) $(DEP_CPP_IOL_F)\ "$(INTDIR)" @@ -1313,9 +1045,6 @@ !ENDIF SOURCE=.\os\win32\iol_socket.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_IOL_S=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1350,35 +1079,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\iol_socket.obj" : $(SOURCE) $(DEP_CPP_IOL_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_IOL_S=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\iol_socket.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\iol_socket.obj" "$(INTDIR)\iol_socket.sbr" : $(SOURCE)\ $(DEP_CPP_IOL_S) "$(INTDIR)" @@ -1388,9 +1097,6 @@ !ENDIF SOURCE=.\main\listen.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_LISTE=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1426,35 +1132,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\listen.obj" : $(SOURCE) $(DEP_CPP_LISTE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_LISTE=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_listen.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\listen.obj" "$(INTDIR)\listen.sbr" : $(SOURCE) $(DEP_CPP_LISTE)\ "$(INTDIR)" @@ -1464,9 +1150,6 @@ !ENDIF SOURCE=.\modules\standard\mod_access.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_A=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1502,35 +1185,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_A=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_A) "$(INTDIR)" @@ -1540,9 +1203,6 @@ !ENDIF SOURCE=.\modules\standard\mod_actions.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_AC=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1586,43 +1246,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_AC=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_AC) "$(INTDIR)" @@ -1632,9 +1264,6 @@ !ENDIF SOURCE=.\modules\standard\mod_alias.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_AL=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1668,33 +1297,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_AL=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_AL) "$(INTDIR)" @@ -1704,9 +1315,6 @@ !ENDIF SOURCE=.\modules\standard\mod_asis.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_AS=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1749,42 +1357,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_AS=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE) $(DEP_CPP_MOD_AS)\ "$(INTDIR)" @@ -1794,9 +1375,6 @@ !ENDIF SOURCE=.\modules\standard\mod_auth.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_AU=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1839,42 +1417,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_AU=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_md5.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE) $(DEP_CPP_MOD_AU)\ "$(INTDIR)" @@ -1884,9 +1435,6 @@ !ENDIF SOURCE=.\modules\standard\mod_autoindex.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_AUT=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -1931,44 +1479,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_AUT=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_fnmatch.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_AUT) "$(INTDIR)" @@ -1978,9 +1497,6 @@ !ENDIF SOURCE=.\modules\standard\mod_cgi.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_C=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2025,44 +1541,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_C=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) $(DEP_CPP_MOD_C)\ "$(INTDIR)" @@ -2072,9 +1559,6 @@ !ENDIF SOURCE=.\modules\standard\mod_dir.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_D=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2118,43 +1602,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_D=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\ "$(INTDIR)" @@ -2164,50 +1620,9 @@ !ENDIF SOURCE=.\modules\standard\mod_env.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - -DEP_CPP_MOD_E=\ - ".\include\ap.h"\ - ".\include\ap_ac_config.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_E=\ - ".\include\ap_config_auto.h"\ - ".\include\ap_config_win32.h"\ - ".\include\apr.h"\ - ".\include\ebcdic.h"\ - ".\include\os.h"\ - ".\lib\apr\include\apr.h"\ - - -"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - DEP_CPP_MOD_E=\ ".\include\ap.h"\ + ".\include\ap_ac_config.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ @@ -2226,6 +1641,26 @@ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_E=\ + ".\include\ap_config_auto.h"\ + ".\include\ap_config_win32.h"\ + ".\include\apr.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr.h"\ + + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\ @@ -2236,9 +1671,6 @@ !ENDIF SOURCE=.\modules\standard\mod_imap.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_I=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2282,14 +1714,27 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_I=\ + +"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_include.c +DEP_CPP_MOD_IN=\ ".\include\ap.h"\ + ".\include\ap_ac_config.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ @@ -2318,19 +1763,38 @@ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_IN=\ + ".\include\ap_config_auto.h"\ + ".\include\ap_config_win32.h"\ + ".\include\apr.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr.h"\ + ".\modules\standard\config.h"\ + ".\modules\standard\modules\perl\mod_perl.h"\ -"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\ - "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_log_config.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_include.obj" "$(INTDIR)\mod_include.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_IN) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + +!ENDIF + +SOURCE=.\modules\standard\mod_log_config.c DEP_CPP_MOD_L=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2371,40 +1835,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_L=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_L) "$(INTDIR)" @@ -2414,9 +1853,6 @@ !ENDIF SOURCE=.\modules\standard\mod_mime.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_M=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2451,34 +1887,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_M=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\ "$(INTDIR)" @@ -2488,9 +1905,6 @@ !ENDIF SOURCE=.\modules\standard\mod_negotiation.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_N=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2533,42 +1947,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_N=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_N) "$(INTDIR)" @@ -2578,9 +1965,6 @@ !ENDIF SOURCE=.\modules\standard\mod_setenvif.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MOD_S=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2621,14 +2005,27 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_S=\ + +"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\ + $(DEP_CPP_MOD_S) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF + +SOURCE=.\modules\standard\mod_so.c +DEP_CPP_MOD_SO=\ ".\include\ap.h"\ + ".\include\ap_ac_config.h"\ ".\include\ap_config.h"\ ".\include\ap_ctype.h"\ ".\include\ap_hooks.h"\ @@ -2637,36 +2034,46 @@ ".\include\buff.h"\ ".\include\hsregex.h"\ ".\include\http_config.h"\ - ".\include\http_core.h"\ ".\include\http_log.h"\ - ".\include\http_protocol.h"\ ".\include\httpd.h"\ ".\include\util_uri.h"\ ".\lib\apr\include\apr_errno.h"\ ".\lib\apr\include\apr_file_io.h"\ ".\lib\apr\include\apr_general.h"\ ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_lock.h"\ - ".\lib\apr\include\apr_mmap.h"\ - ".\lib\apr\include\apr_network_io.h"\ - ".\lib\apr\include\apr_portable.h"\ ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ ".\os\win32\os.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_SO=\ + ".\include\ap_config_auto.h"\ + ".\include\ap_config_win32.h"\ + ".\include\apr.h"\ + ".\include\ebcdic.h"\ + ".\include\os.h"\ + ".\lib\apr\include\apr.h"\ -"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\ - $(DEP_CPP_MOD_S) "$(INTDIR)" +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + +"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ENDIF +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -SOURCE=.\modules\standard\mod_userdir.c -!IF "$(CFG)" == "ApacheCore - Win32 Release" +"$(INTDIR)\mod_so.obj" "$(INTDIR)\mod_so.sbr" : $(SOURCE) $(DEP_CPP_MOD_SO)\ + "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF +SOURCE=.\modules\standard\mod_userdir.c DEP_CPP_MOD_U=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2700,33 +2107,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MOD_U=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_request.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_U) "$(INTDIR)" @@ -2736,9 +2125,6 @@ !ENDIF SOURCE=.\os\win32\modules.c - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - DEP_CPP_MODUL=\ ".\include\ap.h"\ ".\include\ap_ac_config.h"\ @@ -2770,32 +2156,15 @@ ".\lib\apr\include\apr.h"\ +!IF "$(CFG)" == "ApacheCore - Win32 Release" + + "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" -DEP_CPP_MODUL=\ - ".\include\ap.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_hooks.h"\ - ".\include\ap_iol.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\lib\apr\include\apr_errno.h"\ - ".\lib\apr\include\apr_file_io.h"\ - ".\lib\apr\include\apr_general.h"\ - ".\lib\apr\include\apr_lib.h"\ - ".\lib\apr\include\apr_thread_proc.h"\ - ".\lib\apr\include\apr_win.h"\ - ".\os\win32\os.h"\ - "$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE) $(DEP_CPP_MODUL)\ "$(INTDIR)" @@ -2883,7 +2252,6 @@ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_time.h"\ ".\lib\apr\include\apr_win.h"\ - ".\main\test_char.h"\ ".\os\win32\os.h"\ {$(INCLUDE)}"sys\stat.h"\ {$(INCLUDE)}"sys\types.h"\ @@ -2895,6 +2263,7 @@ ".\include\ebcdic.h"\ ".\include\os.h"\ ".\lib\apr\include\apr.h"\ + ".\main\test_char.h"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" @@ -3086,7 +2455,6 @@ ".\lib\apr\include\apr_lib.h"\ ".\lib\apr\include\apr_thread_proc.h"\ ".\lib\apr\include\apr_win.h"\ - ".\main\uri_delims.h"\ ".\os\win32\os.h"\ {$(INCLUDE)}"sys\stat.h"\ {$(INCLUDE)}"sys\types.h"\ @@ -3098,6 +2466,7 @@ ".\include\ebcdic.h"\ ".\include\os.h"\ ".\lib\apr\include\apr.h"\ + ".\main\uri_delims.h"\ !IF "$(CFG)" == "ApacheCore - Win32 Release" 1.5 +6 -6 apache-2.0/src/os/win32/modules.c Index: modules.c =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/modules.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- modules.c 1999/10/14 14:01:16 1.4 +++ modules.c 1999/12/16 15:46:17 1.5 @@ -8,12 +8,12 @@ extern module core_module; extern module mpm_winnt_module; -//extern module so_module; +extern module so_module; extern module mime_module; extern module access_module; extern module auth_module; extern module negotiation_module; -//extern module includes_module; +extern module includes_module; extern module autoindex_module; extern module dir_module; extern module cgi_module; @@ -30,12 +30,12 @@ module *ap_prelinked_modules[] = { &core_module, &mpm_winnt_module, -// &so_module, + &so_module, &mime_module, &access_module, &auth_module, &negotiation_module, -// &includes_module, + &includes_module, &autoindex_module, &dir_module, &cgi_module, @@ -53,12 +53,12 @@ module *ap_preloaded_modules[] = { &core_module, &mpm_winnt_module, -// &so_module, + &so_module, &mime_module, &access_module, &auth_module, &negotiation_module, -// &includes_module, + &includes_module, &autoindex_module, &dir_module, &cgi_module,