From: William A. Rowe Jr Date: Fri, 23 May 2003 03:39:03 +0000 (+0000) Subject: Ok, I no longer have VC5.0 installed, anywhere. With the .dep files, X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3e2a74f04e7af740384209ed0006e8deb478075;p=thirdparty%2Fapache%2Fhttpd.git Ok, I no longer have VC5.0 installed, anywhere. With the .dep files, these remain buildable under VC5, but were generated under VC6. VC6 introduces .dep companions to .mak, so it was either add the .dep's to CVS, or remove the .mak's. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@100015 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/Apache.dep b/src/Apache.dep new file mode 100644 index 00000000000..dd07fec1a4d --- /dev/null +++ b/src/Apache.dep @@ -0,0 +1,5 @@ +# Microsoft Developer Studio Generated Dependency File, included by Apache.mak + +.\os\win32\apache.rc : \ + ".\os\win32\apache.ico"\ + diff --git a/src/Apache.mak b/src/Apache.mak index 0324c5f60b3..6a93eabcdd6 100644 --- a/src/Apache.mak +++ b/src/Apache.mak @@ -48,47 +48,45 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\Apache.idb" -@erase "$(INTDIR)\apache.res" + -@erase "$(INTDIR)\Apache_src.idb" + -@erase "$(INTDIR)\Apache_src.pdb" -@erase "$(INTDIR)\main_win32.obj" -@erase "$(OUTDIR)\Apache.exe" - -@erase "$(OUTDIR)\Apache.map" + -@erase "$(OUTDIR)\Apache.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -100,12 +98,10 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /machine:I386\ - /out:"$(OUTDIR)\Apache.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Apache.exe" /opt:ref LINK32_OBJS= \ - "$(INTDIR)\apache.res" \ "$(INTDIR)\main_win32.obj" \ + "$(INTDIR)\apache.res" \ "$(OUTDIR)\ApacheCore.lib" "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -136,48 +132,45 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\Apache.idb" -@erase "$(INTDIR)\apache.res" + -@erase "$(INTDIR)\Apache_src.idb" + -@erase "$(INTDIR)\Apache_src.pdb" -@erase "$(INTDIR)\main_win32.obj" -@erase "$(OUTDIR)\Apache.exe" - -@erase "$(OUTDIR)\Apache.map" -@erase "$(OUTDIR)\Apache.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -189,12 +182,10 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Apache.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /debug /machine:I386\ - /out:"$(OUTDIR)\Apache.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Apache.exe" LINK32_OBJS= \ - "$(INTDIR)\apache.res" \ "$(INTDIR)\main_win32.obj" \ + "$(INTDIR)\apache.res" \ "$(OUTDIR)\ApacheCore.lib" "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -205,23 +196,29 @@ LINK32_OBJS= \ !ENDIF +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("Apache.dep") +!INCLUDE "Apache.dep" +!ELSE +!MESSAGE Warning: cannot find "Apache.dep" +!ENDIF +!ENDIF + + !IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32 Debug" SOURCE=.\os\win32\apache.rc -DEP_RSC_APACH=\ - ".\os\win32\apache.ico"\ - !IF "$(CFG)" == "Apache - Win32 Release" -"$(INTDIR)\apache.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)" +"$(INTDIR)\apache.res" : $(SOURCE) "$(INTDIR)" $(RSC) /l 0x809 /fo"$(INTDIR)\apache.res" /i "os\win32" /d "NDEBUG" $(SOURCE) !ELSEIF "$(CFG)" == "Apache - Win32 Debug" -"$(INTDIR)\apache.res" : $(SOURCE) $(DEP_RSC_APACH) "$(INTDIR)" +"$(INTDIR)\apache.res" : $(SOURCE) "$(INTDIR)" $(RSC) /l 0x809 /fo"$(INTDIR)\apache.res" /i "os\win32" /d "_DEBUG" $(SOURCE) @@ -231,14 +228,12 @@ DEP_RSC_APACH=\ "ApacheCore - Win32 Release" : cd "." - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd "." "ApacheCore - Win32 ReleaseCLEAN" : cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd "." !ELSEIF "$(CFG)" == "Apache - Win32 Debug" @@ -250,8 +245,7 @@ DEP_RSC_APACH=\ "ApacheCore - Win32 DebugCLEAN" : cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd "." !ENDIF diff --git a/src/ApacheCore.dep b/src/ApacheCore.dep new file mode 100644 index 00000000000..4931609ea0e --- /dev/null +++ b/src/ApacheCore.dep @@ -0,0 +1,747 @@ +# Microsoft Developer Studio Generated Dependency File, included by ApacheCore.mak + +.\main\alloc.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\multithread.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\buff.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_config.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\explain.h"\ + ".\include\fnmatch.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\http_request.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_core.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_md5.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\fnmatch.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\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\rfc1413.h"\ + ".\include\scoreboard.h"\ + ".\include\util_md5.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_log.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_main.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\explain.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\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\multithread.h"\ + ".\include\scoreboard.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\getopt.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\registry.h"\ + ".\os\win32\service.h"\ + + +.\main\http_protocol.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\util_date.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_request.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\fnmatch.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\scoreboard.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\http_vhost.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_config.h"\ + ".\include\http_log.h"\ + ".\include\http_protocol.h"\ + ".\include\http_vhost.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_access.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_actions.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_alias.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_asis.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_auth.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_autoindex.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\fnmatch.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_cgi.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_dir.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_env.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_imap.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_include.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\mod_isapi.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_log_config.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_mime.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_negotiation.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_setenvif.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\http_core.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_so.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\modules\standard\mod_userdir.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\modules.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_config.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\multithread.c : \ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_mmn.h"\ + ".\include\hsregex.h"\ + ".\include\multithread.h"\ + ".\os\win32\os.h"\ + + +.\os\win32\readdir.c : \ + ".\os\win32\readdir.h"\ + + +.\os\win32\registry.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\service.h"\ + + +.\main\rfc1413.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\rfc1413.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\service.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\http_main.h"\ + ".\include\httpd.h"\ + ".\include\multithread.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\registry.h"\ + ".\os\win32\service.h"\ + ".\os\win32\Win9xConHook.h"\ + + +.\main\util.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\main\test_char.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\util_date.c : \ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_mmn.h"\ + ".\include\hsregex.h"\ + ".\include\util_date.h"\ + ".\os\win32\os.h"\ + + +.\main\util_md5.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_md5.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\httpd.h"\ + ".\include\util_md5.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\util_script.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.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_date.h"\ + ".\include\util_script.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\main\util_uri.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_conf_globals.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\main\uri_delims.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + + +.\os\win32\util_win32.c : \ + ".\include\ap.h"\ + ".\include\ap_alloc.h"\ + ".\include\ap_config.h"\ + ".\include\ap_ctype.h"\ + ".\include\ap_ebcdic.h"\ + ".\include\ap_mmn.h"\ + ".\include\buff.h"\ + ".\include\hsregex.h"\ + ".\include\http_log.h"\ + ".\include\httpd.h"\ + ".\include\util_uri.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + diff --git a/src/ApacheCore.mak b/src/ApacheCore.mak index 6cfc7b24ac2..ffe0091c07e 100644 --- a/src/ApacheCore.mak +++ b/src/ApacheCore.mak @@ -4,8 +4,7 @@ CFG=ApacheCore - Win32 Release !MESSAGE No configuration specified. Defaulting to ApacheCore - Win32 Release. !ENDIF -!IF "$(CFG)" != "ApacheCore - Win32 Release" && "$(CFG)" !=\ - "ApacheCore - Win32 Debug" +!IF "$(CFG)" != "ApacheCore - Win32 Release" && "$(CFG)" != "ApacheCore - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=ApacheCore - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ApacheCore - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ApacheCore - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ApacheCore - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "ApacheCore - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -42,23 +39,19 @@ ALL : "$(OUTDIR)\ApacheCore.dll" !ELSE -ALL : "Win9xConHook - Win32 Release" "regex - Win32 Release"\ - "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release"\ - "ApacheOS - Win32 Release" "ap - Win32 Release" "$(OUTDIR)\ApacheCore.dll" +ALL : "Win9xConHook - Win32 Release" "regex - Win32 Release" "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release" "ApacheOS - Win32 Release" "ap - Win32 Release" "$(OUTDIR)\ApacheCore.dll" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"ap - Win32 ReleaseCLEAN" "ApacheOS - Win32 ReleaseCLEAN"\ - "gen_test_char - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN"\ - "regex - Win32 ReleaseCLEAN" "Win9xConHook - Win32 ReleaseCLEAN" +CLEAN :"ap - Win32 ReleaseCLEAN" "ApacheOS - Win32 ReleaseCLEAN" "gen_test_char - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN" "regex - Win32 ReleaseCLEAN" "Win9xConHook - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF -@erase "$(INTDIR)\alloc.obj" - -@erase "$(INTDIR)\ApacheCore.idb" + -@erase "$(INTDIR)\ApacheCore_src.idb" + -@erase "$(INTDIR)\ApacheCore_src.pdb" -@erase "$(INTDIR)\buff.obj" - -@erase "$(INTDIR)\buildmark.obj" -@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\http_config.obj" -@erase "$(INTDIR)\http_core.obj" @@ -100,44 +93,40 @@ CLEAN : -@erase "$(OUTDIR)\ApacheCore.dll" -@erase "$(OUTDIR)\ApacheCore.exp" -@erase "$(OUTDIR)\ApacheCore.lib" - -@erase "$(OUTDIR)\ApacheCore.map" + -@erase "$(OUTDIR)\ApacheCore.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I ".\include" /I ".\os\win32" /I\ - ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -150,17 +139,12 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb"\ - /map:"$(INTDIR)\ApacheCore.map" /machine:I386 /def:".\ApacheCore.def"\ - /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"\ - /base:@"os\win32\BaseAddr.ref",ApacheCore +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib" /base:@"os\win32\BaseAddr.ref",ApacheCore /opt:ref DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ "$(INTDIR)\buff.obj" \ - "$(INTDIR)\buildmark.obj" \ "$(INTDIR)\getopt.obj" \ "$(INTDIR)\http_config.obj" \ "$(INTDIR)\http_core.obj" \ @@ -201,14 +185,17 @@ LINK32_OBJS= \ "$(INTDIR)\util_win32.obj" \ ".\ap\LibR\ap.lib" \ ".\os\win32\LibR\ApacheOS.lib" \ - ".\os\win32\Release\Win9xConHook.lib" \ - ".\regex\LibR\regex.lib" + ".\regex\LibR\regex.lib" \ + ".\os\win32\Release\Win9xConHook.lib" "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< + cl.exe /nologo /MD /W3 /O2 /Zi /I "./include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fd"Release\ApacheCore_src" /FD /c .\buildmark.c /Fo"Release\buildmark.obj" + $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << +SOURCE="$(InputPath)" + !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" OUTDIR=.\Debug @@ -223,23 +210,19 @@ ALL : "$(OUTDIR)\ApacheCore.dll" !ELSE -ALL : "Win9xConHook - Win32 Debug" "regex - Win32 Debug"\ - "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug"\ - "ApacheOS - Win32 Debug" "ap - Win32 Debug" "$(OUTDIR)\ApacheCore.dll" +ALL : "Win9xConHook - Win32 Debug" "regex - Win32 Debug" "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug" "ApacheOS - Win32 Debug" "ap - Win32 Debug" "$(OUTDIR)\ApacheCore.dll" !ENDIF !IF "$(RECURSE)" == "1" -CLEAN :"ap - Win32 DebugCLEAN" "ApacheOS - Win32 DebugCLEAN"\ - "gen_test_char - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN"\ - "regex - Win32 DebugCLEAN" "Win9xConHook - Win32 DebugCLEAN" +CLEAN :"ap - Win32 DebugCLEAN" "ApacheOS - Win32 DebugCLEAN" "gen_test_char - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN" "regex - Win32 DebugCLEAN" "Win9xConHook - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF -@erase "$(INTDIR)\alloc.obj" - -@erase "$(INTDIR)\ApacheCore.idb" + -@erase "$(INTDIR)\ApacheCore_src.idb" + -@erase "$(INTDIR)\ApacheCore_src.pdb" -@erase "$(INTDIR)\buff.obj" - -@erase "$(INTDIR)\buildmark.obj" -@erase "$(INTDIR)\getopt.obj" -@erase "$(INTDIR)\http_config.obj" -@erase "$(INTDIR)\http_core.obj" @@ -281,45 +264,40 @@ CLEAN : -@erase "$(OUTDIR)\ApacheCore.dll" -@erase "$(OUTDIR)\ApacheCore.exp" -@erase "$(OUTDIR)\ApacheCore.lib" - -@erase "$(OUTDIR)\ApacheCore.map" -@erase "$(OUTDIR)\ApacheCore.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\os\win32" /I\ - ".\os\win32\win9xconhook" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -332,17 +310,12 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb"\ - /map:"$(INTDIR)\ApacheCore.map" /debug /machine:I386 /def:".\ApacheCore.def"\ - /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"\ - /base:@"os\win32\BaseAddr.ref",ApacheCore +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib "Debug\buildmark.obj" /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib" /base:@"os\win32\BaseAddr.ref",ApacheCore DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ "$(INTDIR)\buff.obj" \ - "$(INTDIR)\buildmark.obj" \ "$(INTDIR)\getopt.obj" \ "$(INTDIR)\http_config.obj" \ "$(INTDIR)\http_core.obj" \ @@ -382,95 +355,43 @@ LINK32_OBJS= \ "$(INTDIR)\util_uri.obj" \ "$(INTDIR)\util_win32.obj" \ ".\ap\LibD\ap.lib" \ - ".\os\win32\Debug\Win9xConHook.lib" \ ".\os\win32\LibD\ApacheOS.lib" \ - ".\regex\LibD\regex.lib" + ".\regex\LibD\regex.lib" \ + ".\os\win32\Debug\Win9xConHook.lib" "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< + cl.exe /nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\os\win32" /I ".\os\win32\win9xconhook" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\ApacheCore_src" /FD /c .\buildmark.c /Fo"Debug\buildmark.obj" + $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << +SOURCE="$(InputPath)" + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("ApacheCore.dep") +!INCLUDE "ApacheCore.dep" +!ELSE +!MESSAGE Warning: cannot find "ApacheCore.dep" +!ENDIF !ENDIF -!IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\ - "ApacheCore - Win32 Debug" +!IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" == "ApacheCore - Win32 Debug" SOURCE=.\main\alloc.c -DEP_CPP_ALLOC=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\multithread.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_ALLOC=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)" +"$(INTDIR)\alloc.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\buff.c -DEP_CPP_BUFF_=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_BUFF_=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" +"$(INTDIR)\buff.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=.\buildmark.c -DEP_CPP_BUILD=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_BUILD=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - - -"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)" - - SOURCE=.\os\win32\getopt.c "$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" @@ -478,1043 +399,224 @@ SOURCE=.\os\win32\getopt.c SOURCE=.\main\http_config.c -DEP_CPP_HTTP_=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\explain.h"\ - ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\http_request.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_HTTP_=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" +"$(INTDIR)\http_config.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\http_core.c -DEP_CPP_HTTP_C=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_md5.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\fnmatch.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\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\rfc1413.h"\ - ".\include\scoreboard.h"\ - ".\include\util_md5.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_HTTP_C=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" +"$(INTDIR)\http_core.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\http_log.c -DEP_CPP_HTTP_L=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_HTTP_L=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" +"$(INTDIR)\http_log.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\http_main.c -DEP_CPP_HTTP_M=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\explain.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\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\multithread.h"\ - ".\include\scoreboard.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\os\win32\getopt.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - ".\os\win32\registry.h"\ - ".\os\win32\service.h"\ - -NODEP_CPP_HTTP_M=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - ".\main\xmlparse.h"\ - -"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" +"$(INTDIR)\http_main.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\http_protocol.c -DEP_CPP_HTTP_P=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_date.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_HTTP_P=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" +"$(INTDIR)\http_protocol.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\http_request.c -DEP_CPP_HTTP_R=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\fnmatch.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\scoreboard.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_HTTP_R=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" +"$(INTDIR)\http_request.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\http_vhost.c -DEP_CPP_HTTP_V=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_config.h"\ - ".\include\http_log.h"\ - ".\include\http_protocol.h"\ - ".\include\http_vhost.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_HTTP_V=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)" +"$(INTDIR)\http_vhost.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_access.c -DEP_CPP_MOD_A=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_A=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_access.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_actions.c -DEP_CPP_MOD_AC=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_AC=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" +"$(INTDIR)\mod_actions.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_alias.c -DEP_CPP_MOD_AL=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_AL=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" +"$(INTDIR)\mod_alias.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_asis.c -DEP_CPP_MOD_AS=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_AS=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" +"$(INTDIR)\mod_asis.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_auth.c -DEP_CPP_MOD_AU=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_AU=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" +"$(INTDIR)\mod_auth.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_autoindex.c -DEP_CPP_MOD_AUT=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\fnmatch.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_AUT=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" +"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_cgi.c -DEP_CPP_MOD_C=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_C=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" +"$(INTDIR)\mod_cgi.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_dir.c -DEP_CPP_MOD_D=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_D=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" +"$(INTDIR)\mod_dir.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_env.c -DEP_CPP_MOD_E=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_E=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" +"$(INTDIR)\mod_env.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_imap.c -DEP_CPP_MOD_I=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_I=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" +"$(INTDIR)\mod_imap.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_include.c -DEP_CPP_MOD_IN=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_IN=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - ".\modules\standard\config.h"\ - ".\modules\standard\modules\perl\mod_perl.h"\ - -"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" +"$(INTDIR)\mod_include.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\mod_isapi.c -DEP_CPP_MOD_IS=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_IS=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)" +"$(INTDIR)\mod_isapi.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_log_config.c -DEP_CPP_MOD_L=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_L=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" +"$(INTDIR)\mod_log_config.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_mime.c -DEP_CPP_MOD_M=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_M=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" +"$(INTDIR)\mod_mime.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_negotiation.c -DEP_CPP_MOD_N=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_N=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" +"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_setenvif.c -DEP_CPP_MOD_S=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\http_core.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_S=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_so.c -DEP_CPP_MOD_SO=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_SO=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)" +"$(INTDIR)\mod_so.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\modules\standard\mod_userdir.c -DEP_CPP_MOD_U=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MOD_U=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\modules.c -DEP_CPP_MODUL=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_config.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_MODUL=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" +"$(INTDIR)\modules.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\multithread.c -DEP_CPP_MULTI=\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_mmn.h"\ - ".\include\hsregex.h"\ - ".\include\multithread.h"\ - ".\os\win32\os.h"\ - -NODEP_CPP_MULTI=\ - ".\include\ap_config_auto.h"\ - -"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)" +"$(INTDIR)\multithread.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\readdir.c -DEP_CPP_READD=\ - ".\os\win32\readdir.h"\ - -"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" +"$(INTDIR)\readdir.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\registry.c -DEP_CPP_REGIS=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - ".\os\win32\service.h"\ - -NODEP_CPP_REGIS=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)" +"$(INTDIR)\registry.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\rfc1413.c -DEP_CPP_RFC14=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\rfc1413.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_RFC14=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" +"$(INTDIR)\rfc1413.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\service.c -DEP_CPP_SERVI=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_log.h"\ - ".\include\http_main.h"\ - ".\include\httpd.h"\ - ".\include\multithread.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - ".\os\win32\registry.h"\ - ".\os\win32\service.h"\ - ".\os\win32\Win9xConHook.h"\ - -NODEP_CPP_SERVI=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" +"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\util.c -DEP_CPP_UTIL_=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\main\test_char.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_UTIL_=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" +"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\util_date.c -DEP_CPP_UTIL_D=\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_mmn.h"\ - ".\include\hsregex.h"\ - ".\include\util_date.h"\ - ".\os\win32\os.h"\ - -NODEP_CPP_UTIL_D=\ - ".\include\ap_config_auto.h"\ - -"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" +"$(INTDIR)\util_date.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\util_md5.c -DEP_CPP_UTIL_M=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_md5.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\httpd.h"\ - ".\include\util_md5.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_UTIL_M=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" +"$(INTDIR)\util_md5.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\util_script.c -DEP_CPP_UTIL_S=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.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_date.h"\ - ".\include\util_script.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_UTIL_S=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" +"$(INTDIR)\util_script.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\main\util_uri.c -DEP_CPP_UTIL_U=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_conf_globals.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\main\uri_delims.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_UTIL_U=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)" +"$(INTDIR)\util_uri.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\os\win32\util_win32.c -DEP_CPP_UTIL_W=\ - ".\include\ap.h"\ - ".\include\ap_alloc.h"\ - ".\include\ap_config.h"\ - ".\include\ap_ctype.h"\ - ".\include\ap_ebcdic.h"\ - ".\include\ap_mmn.h"\ - ".\include\buff.h"\ - ".\include\hsregex.h"\ - ".\include\http_log.h"\ - ".\include\httpd.h"\ - ".\include\util_uri.h"\ - ".\os\win32\os.h"\ - ".\os\win32\readdir.h"\ - -NODEP_CPP_UTIL_W=\ - ".\include\ap_config_auto.h"\ - ".\include\sfio.h"\ - -"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)" +"$(INTDIR)\util_win32.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -1527,8 +629,7 @@ NODEP_CPP_UTIL_W=\ "ap - Win32 ReleaseCLEAN" : cd ".\ap" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ap.mak" CFG="ap - Win32 Release" RECURSE=1\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ap.mak" CFG="ap - Win32 Release" RECURSE=1 CLEAN cd ".." !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -1540,7 +641,7 @@ NODEP_CPP_UTIL_W=\ "ap - Win32 DebugCLEAN" : cd ".\ap" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ap.mak" CFG="ap - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ap.mak" CFG="ap - Win32 Debug" RECURSE=1 CLEAN cd ".." !ENDIF @@ -1554,8 +655,7 @@ NODEP_CPP_UTIL_W=\ "ApacheOS - Win32 ReleaseCLEAN" : cd ".\os\win32" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheOS.mak"\ - CFG="ApacheOS - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheOS.mak" CFG="ApacheOS - Win32 Release" RECURSE=1 CLEAN cd "..\.." !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -1567,8 +667,7 @@ NODEP_CPP_UTIL_W=\ "ApacheOS - Win32 DebugCLEAN" : cd ".\os\win32" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheOS.mak" CFG="ApacheOS - Win32 Debug"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheOS.mak" CFG="ApacheOS - Win32 Debug" RECURSE=1 CLEAN cd "..\.." !ENDIF @@ -1577,28 +676,24 @@ NODEP_CPP_UTIL_W=\ "gen_test_char - Win32 Release" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak"\ - CFG="gen_test_char - Win32 Release" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Release" cd ".." "gen_test_char - Win32 ReleaseCLEAN" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_test_char.mak"\ - CFG="gen_test_char - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Release" RECURSE=1 CLEAN cd ".." !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "gen_test_char - Win32 Debug" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak"\ - CFG="gen_test_char - Win32 Debug" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Debug" cd ".." "gen_test_char - Win32 DebugCLEAN" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_test_char.mak"\ - CFG="gen_test_char - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak" CFG="gen_test_char - Win32 Debug" RECURSE=1 CLEAN cd ".." !ENDIF @@ -1607,28 +702,24 @@ NODEP_CPP_UTIL_W=\ "gen_uri_delims - Win32 Release" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\ - CFG="gen_uri_delims - Win32 Release" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak" CFG="gen_uri_delims - Win32 Release" cd ".." "gen_uri_delims - Win32 ReleaseCLEAN" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\ - CFG="gen_uri_delims - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak" CFG="gen_uri_delims - Win32 Release" RECURSE=1 CLEAN cd ".." !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "gen_uri_delims - Win32 Debug" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\ - CFG="gen_uri_delims - Win32 Debug" + $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak" CFG="gen_uri_delims - Win32 Debug" cd ".." "gen_uri_delims - Win32 DebugCLEAN" : cd ".\main" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\ - CFG="gen_uri_delims - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak" CFG="gen_uri_delims - Win32 Debug" RECURSE=1 CLEAN cd ".." !ENDIF @@ -1642,8 +733,7 @@ NODEP_CPP_UTIL_W=\ "regex - Win32 ReleaseCLEAN" : cd ".\regex" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\regex.mak" CFG="regex - Win32 Release"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\regex.mak" CFG="regex - Win32 Release" RECURSE=1 CLEAN cd ".." !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -1655,8 +745,7 @@ NODEP_CPP_UTIL_W=\ "regex - Win32 DebugCLEAN" : cd ".\regex" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\regex.mak" CFG="regex - Win32 Debug"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\regex.mak" CFG="regex - Win32 Debug" RECURSE=1 CLEAN cd ".." !ENDIF @@ -1665,28 +754,24 @@ NODEP_CPP_UTIL_W=\ "Win9xConHook - Win32 Release" : cd ".\os\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\Win9xConHook.mak"\ - CFG="Win9xConHook - Win32 Release" + $(MAKE) /$(MAKEFLAGS) /F ".\Win9xConHook.mak" CFG="Win9xConHook - Win32 Release" cd "..\.." "Win9xConHook - Win32 ReleaseCLEAN" : cd ".\os\win32" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\Win9xConHook.mak"\ - CFG="Win9xConHook - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\Win9xConHook.mak" CFG="Win9xConHook - Win32 Release" RECURSE=1 CLEAN cd "..\.." !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" "Win9xConHook - Win32 Debug" : cd ".\os\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\Win9xConHook.mak"\ - CFG="Win9xConHook - Win32 Debug" + $(MAKE) /$(MAKEFLAGS) /F ".\Win9xConHook.mak" CFG="Win9xConHook - Win32 Debug" cd "..\.." "Win9xConHook - Win32 DebugCLEAN" : cd ".\os\win32" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\Win9xConHook.mak"\ - CFG="Win9xConHook - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\Win9xConHook.mak" CFG="Win9xConHook - Win32 Debug" RECURSE=1 CLEAN cd "..\.." !ENDIF diff --git a/src/ap/ap.dep b/src/ap/ap.dep new file mode 100644 index 00000000000..2819d46100d --- /dev/null +++ b/src/ap/ap.dep @@ -0,0 +1,114 @@ +# Microsoft Developer Studio Generated Dependency File, included by ap.mak + +.\ap_base64.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_checkpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\ap_fnmatch.c : \ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\fnmatch.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_md5c.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_sha1.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\ap_signal.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\ap_slack.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\http_log.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\ap_snprintf.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + diff --git a/src/ap/ap.mak b/src/ap/ap.mak index 593f3e18186..900c741e06e 100644 --- a/src/ap/ap.mak +++ b/src/ap/ap.mak @@ -33,18 +33,12 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\ap.lib" - -!ELSE - ALL : "$(OUTDIR)\ap.lib" -!ENDIF CLEAN : -@erase "$(INTDIR)\ap.idb" + -@erase "$(INTDIR)\ap.pdb" -@erase "$(INTDIR)\ap_base64.obj" -@erase "$(INTDIR)\ap_checkpass.obj" -@erase "$(INTDIR)\ap_cpystrn.obj" @@ -59,43 +53,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c -CPP_OBJS=.\LibR/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" BSC32_SBRS= \ @@ -126,15 +117,8 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\ap.lib" -!ELSE - -ALL : "$(OUTDIR)\ap.lib" - -!ENDIF CLEAN : -@erase "$(INTDIR)\ap.idb" @@ -153,43 +137,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c -CPP_OBJS=.\LibD/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" BSC32_SBRS= \ @@ -215,185 +196,59 @@ LIB32_OBJS= \ !ENDIF +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("ap.dep") +!INCLUDE "ap.dep" +!ELSE +!MESSAGE Warning: cannot find "ap.dep" +!ENDIF +!ENDIF + + !IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug" SOURCE=.\ap_base64.c -DEP_CPP_AP_BA=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_BA=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)" +"$(INTDIR)\ap_base64.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_checkpass.c -DEP_CPP_AP_CH=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\ap_sha1.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_CH=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)" +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_cpystrn.c -DEP_CPP_AP_CP=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_CP=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)" +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_fnmatch.c -DEP_CPP_AP_FN=\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_mmn.h"\ - "..\include\fnmatch.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_FN=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)" +"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_md5c.c -DEP_CPP_AP_MD=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_MD=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)" +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_sha1.c -DEP_CPP_AP_SH=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\ap_sha1.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_SH=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_signal.c -DEP_CPP_AP_SI=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_SI=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)" +"$(INTDIR)\ap_signal.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_slack.c -DEP_CPP_AP_SL=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\http_log.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_SL=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)" +"$(INTDIR)\ap_slack.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\ap_snprintf.c -DEP_CPP_AP_SN=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_SN=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/lib/expat-lite/xmlparse.dep b/src/lib/expat-lite/xmlparse.dep new file mode 100644 index 00000000000..e7437154c75 --- /dev/null +++ b/src/lib/expat-lite/xmlparse.dep @@ -0,0 +1,14 @@ +# Microsoft Developer Studio Generated Dependency File, included by xmlparse.mak + +.\hashtable.c : \ + ".\hashtable.h"\ + ".\xmldef.h"\ + + +.\xmlparse.c : \ + ".\hashtable.h"\ + ".\xmldef.h"\ + ".\xmlparse.h"\ + ".\xmlrole.h"\ + ".\xmltok.h"\ + diff --git a/src/lib/expat-lite/xmlparse.mak b/src/lib/expat-lite/xmlparse.mak index 5c38ea4b245..4e629046e81 100644 --- a/src/lib/expat-lite/xmlparse.mak +++ b/src/lib/expat-lite/xmlparse.mak @@ -4,8 +4,7 @@ CFG=xmlparse - Win32 Release !MESSAGE No configuration specified. Defaulting to xmlparse - Win32 Release. !ENDIF -!IF "$(CFG)" != "xmlparse - Win32 Release" && "$(CFG)" !=\ - "xmlparse - Win32 Debug" +!IF "$(CFG)" != "xmlparse - Win32 Release" && "$(CFG)" != "xmlparse - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,8 +13,7 @@ CFG=xmlparse - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "xmlparse - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xmlparse - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "xmlparse - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. @@ -51,50 +49,46 @@ CLEAN :"xmltok - Win32 ReleaseCLEAN" CLEAN : !ENDIF -@erase "$(INTDIR)\hashtable.obj" - -@erase "$(INTDIR)\xmlparse.idb" -@erase "$(INTDIR)\xmlparse.obj" + -@erase "$(INTDIR)\xmlparse_src.idb" + -@erase "$(INTDIR)\xmlparse_src.pdb" -@erase "$(OUTDIR)\xmlparse.dll" -@erase "$(OUTDIR)\xmlparse.exp" -@erase "$(OUTDIR)\xmlparse.lib" - -@erase "$(OUTDIR)\xmlparse.map" + -@erase "$(OUTDIR)\xmlparse.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\xmltok" /I "..\xmlwf" /D "NDEBUG" /D\ - "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D\ - XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse" /FD\ - /c -CPP_OBJS=.\Release/ -CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\xmltok" /I "..\xmlwf" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse_src" /FD /c + +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +101,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmlparse.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\xmlparse.pdb" /map:"$(INTDIR)\xmlparse.map" /machine:I386\ - /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll"\ - /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xmlparse.pdb" /debug /machine:I386 /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll" /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse /opt:ref DEF_FILE= \ ".\xmlparse.def" LINK32_OBJS= \ @@ -147,51 +138,46 @@ CLEAN :"xmltok - Win32 DebugCLEAN" CLEAN : !ENDIF -@erase "$(INTDIR)\hashtable.obj" - -@erase "$(INTDIR)\xmlparse.idb" -@erase "$(INTDIR)\xmlparse.obj" + -@erase "$(INTDIR)\xmlparse_src.idb" + -@erase "$(INTDIR)\xmlparse_src.pdb" -@erase "$(OUTDIR)\xmlparse.dll" -@erase "$(OUTDIR)\xmlparse.exp" -@erase "$(OUTDIR)\xmlparse.lib" - -@erase "$(OUTDIR)\xmlparse.map" -@erase "$(OUTDIR)\xmlparse.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\xmltok" /I "..\xmlwf" /D "_DEBUG"\ - /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D\ - XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse" /FD\ - /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\xmltok" /I "..\xmlwf" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse_src" /FD /c + +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -204,10 +190,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmlparse.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\xmlparse.pdb" /map:"$(INTDIR)\xmlparse.map" /debug\ - /machine:I386 /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll"\ - /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xmlparse.pdb" /debug /machine:I386 /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll" /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse DEF_FILE= \ ".\xmlparse.def" LINK32_OBJS= \ @@ -223,35 +206,24 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "xmlparse - Win32 Release" || "$(CFG)" ==\ - "xmlparse - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("xmlparse.dep") +!INCLUDE "xmlparse.dep" +!ELSE +!MESSAGE Warning: cannot find "xmlparse.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "xmlparse - Win32 Release" || "$(CFG)" == "xmlparse - Win32 Debug" SOURCE=.\hashtable.c -DEP_CPP_HASHT=\ - ".\hashtable.h"\ - ".\xmldef.h"\ - -NODEP_CPP_HASHT=\ - ".\ap_config.h"\ - ".\nspr.h"\ - -"$(INTDIR)\hashtable.obj" : $(SOURCE) $(DEP_CPP_HASHT) "$(INTDIR)" +"$(INTDIR)\hashtable.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\xmlparse.c -DEP_CPP_XMLPA=\ - ".\hashtable.h"\ - ".\xmldef.h"\ - ".\xmlparse.h"\ - ".\xmlrole.h"\ - ".\xmltok.h"\ - -NODEP_CPP_XMLPA=\ - ".\ap_config.h"\ - ".\nspr.h"\ - -"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)" +"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)" !IF "$(CFG)" == "xmlparse - Win32 Release" @@ -263,8 +235,7 @@ NODEP_CPP_XMLPA=\ "xmltok - Win32 ReleaseCLEAN" : cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xmltok.mak" CFG="xmltok - Win32 Release"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\xmltok.mak" CFG="xmltok - Win32 Release" RECURSE=1 CLEAN cd "." !ELSEIF "$(CFG)" == "xmlparse - Win32 Debug" @@ -276,8 +247,7 @@ NODEP_CPP_XMLPA=\ "xmltok - Win32 DebugCLEAN" : cd "." - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xmltok.mak" CFG="xmltok - Win32 Debug"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\xmltok.mak" CFG="xmltok - Win32 Debug" RECURSE=1 CLEAN cd "." !ENDIF diff --git a/src/lib/expat-lite/xmltok.dep b/src/lib/expat-lite/xmltok.dep new file mode 100644 index 00000000000..f9978fc10f6 --- /dev/null +++ b/src/lib/expat-lite/xmltok.dep @@ -0,0 +1,20 @@ +# Microsoft Developer Studio Generated Dependency File, included by xmltok.mak + +.\xmlrole.c : \ + ".\xmldef.h"\ + ".\xmlrole.h"\ + ".\xmltok.h"\ + + +.\xmltok.c : \ + ".\asciitab.h"\ + ".\iasciitab.h"\ + ".\latin1tab.h"\ + ".\nametab.h"\ + ".\utf8tab.h"\ + ".\xmldef.h"\ + ".\xmltok.h"\ + ".\xmltok_impl.c"\ + ".\xmltok_impl.h"\ + ".\xmltok_ns.c"\ + diff --git a/src/lib/expat-lite/xmltok.mak b/src/lib/expat-lite/xmltok.mak index 608459f6968..7750d315ee3 100644 --- a/src/lib/expat-lite/xmltok.mak +++ b/src/lib/expat-lite/xmltok.mak @@ -33,61 +33,52 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\xmltok.dll" - -!ELSE - ALL : "$(OUTDIR)\xmltok.dll" -!ENDIF CLEAN : -@erase "$(INTDIR)\dllmain.obj" -@erase "$(INTDIR)\xmlrole.obj" - -@erase "$(INTDIR)\xmltok.idb" -@erase "$(INTDIR)\xmltok.obj" + -@erase "$(INTDIR)\xmltok_src.idb" + -@erase "$(INTDIR)\xmltok_src.pdb" -@erase "$(OUTDIR)\xmltok.dll" -@erase "$(OUTDIR)\xmltok.exp" -@erase "$(OUTDIR)\xmltok.lib" - -@erase "$(OUTDIR)\xmltok.map" + -@erase "$(OUTDIR)\xmltok.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ - XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -100,10 +91,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmltok.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\xmltok.pdb" /map:"$(INTDIR)\xmltok.map" /machine:I386\ - /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\ - /base:@"..\..\os\win32\BaseAddr.ref",xmltok +LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xmltok.pdb" /debug /machine:I386 /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmltok /opt:ref DEF_FILE= \ ".\xmltok.def" LINK32_OBJS= \ @@ -124,62 +112,52 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\xmltok.dll" - -!ELSE - ALL : "$(OUTDIR)\xmltok.dll" -!ENDIF CLEAN : -@erase "$(INTDIR)\dllmain.obj" -@erase "$(INTDIR)\xmlrole.obj" - -@erase "$(INTDIR)\xmltok.idb" -@erase "$(INTDIR)\xmltok.obj" + -@erase "$(INTDIR)\xmltok_src.idb" + -@erase "$(INTDIR)\xmltok_src.pdb" -@erase "$(OUTDIR)\xmltok.dll" -@erase "$(OUTDIR)\xmltok.exp" -@erase "$(OUTDIR)\xmltok.lib" - -@erase "$(OUTDIR)\xmltok.map" -@erase "$(OUTDIR)\xmltok.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ - XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -192,10 +170,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\xmltok.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\xmltok.pdb" /map:"$(INTDIR)\xmltok.map" /debug /machine:I386\ - /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\ - /base:@"..\..\os\win32\BaseAddr.ref",xmltok +LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xmltok.pdb" /debug /machine:I386 /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmltok DEF_FILE= \ ".\xmltok.def" LINK32_OBJS= \ @@ -211,6 +186,15 @@ LINK32_OBJS= \ !ENDIF +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("xmltok.dep") +!INCLUDE "xmltok.dep" +!ELSE +!MESSAGE Warning: cannot find "xmltok.dep" +!ENDIF +!ENDIF + + !IF "$(CFG)" == "xmltok - Win32 Release" || "$(CFG)" == "xmltok - Win32 Debug" SOURCE=.\dllmain.c @@ -218,38 +202,13 @@ SOURCE=.\dllmain.c SOURCE=.\xmlrole.c -DEP_CPP_XMLRO=\ - ".\xmldef.h"\ - ".\xmlrole.h"\ - ".\xmltok.h"\ - -NODEP_CPP_XMLRO=\ - ".\ap_config.h"\ - ".\nspr.h"\ - -"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)" +"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\xmltok.c -DEP_CPP_XMLTO=\ - ".\asciitab.h"\ - ".\iasciitab.h"\ - ".\latin1tab.h"\ - ".\nametab.h"\ - ".\utf8tab.h"\ - ".\xmldef.h"\ - ".\xmltok.h"\ - ".\xmltok_impl.c"\ - ".\xmltok_impl.h"\ - ".\xmltok_ns.c"\ - -NODEP_CPP_XMLTO=\ - ".\ap_config.h"\ - ".\nspr.h"\ - -"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" +"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\xmltok_impl.c diff --git a/src/lib/sdbm/sdbm.dep b/src/lib/sdbm/sdbm.dep new file mode 100644 index 00000000000..51b8cb51385 --- /dev/null +++ b/src/lib/sdbm/sdbm.dep @@ -0,0 +1,25 @@ +# Microsoft Developer Studio Generated Dependency File, included by sdbm.mak + +.\sdbm.c : \ + ".\sdbm.h"\ + ".\sdbm_pair.h"\ + ".\sdbm_tune.h"\ + + +.\sdbm_hash.c : \ + ".\sdbm.h"\ + + +.\sdbm_lock.c : \ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\hsregex.h"\ + "..\..\os\win32\os.h"\ + + +.\sdbm_pair.c : \ + ".\sdbm.h"\ + ".\sdbm_pair.h"\ + ".\sdbm_tune.h"\ + diff --git a/src/lib/sdbm/sdbm.mak b/src/lib/sdbm/sdbm.mak index c4037e892c7..918e50171db 100644 --- a/src/lib/sdbm/sdbm.mak +++ b/src/lib/sdbm/sdbm.mak @@ -33,19 +33,13 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\sdbm.lib" -!ELSE - -ALL : "$(OUTDIR)\sdbm.lib" - -!ENDIF CLEAN : -@erase "$(INTDIR)\sdbm.idb" -@erase "$(INTDIR)\sdbm.obj" + -@erase "$(INTDIR)\sdbm.pdb" -@erase "$(INTDIR)\sdbm_hash.obj" -@erase "$(INTDIR)\sdbm_lock.obj" -@erase "$(INTDIR)\sdbm_pair.obj" @@ -54,43 +48,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "WIN32"\ - /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\sdbm" /FD /c -CPP_OBJS=.\LibR/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\sdbm" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdbm.bsc" BSC32_SBRS= \ @@ -116,15 +107,8 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\sdbm.lib" -!ELSE - -ALL : "$(OUTDIR)\sdbm.lib" - -!ENDIF CLEAN : -@erase "$(INTDIR)\sdbm.idb" @@ -138,44 +122,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\sdbm" /FD /c -CPP_OBJS=.\LibD/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\sdbm" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\sdbm.bsc" BSC32_SBRS= \ @@ -196,48 +176,34 @@ LIB32_OBJS= \ !ENDIF +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("sdbm.dep") +!INCLUDE "sdbm.dep" +!ELSE +!MESSAGE Warning: cannot find "sdbm.dep" +!ENDIF +!ENDIF + + !IF "$(CFG)" == "sdbm - Win32 Release" || "$(CFG)" == "sdbm - Win32 Debug" SOURCE=.\sdbm.c -DEP_CPP_SDBM_=\ - ".\sdbm.h"\ - ".\sdbm_pair.h"\ - ".\sdbm_tune.h"\ - -"$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)" +"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\sdbm_hash.c -DEP_CPP_SDBM_H=\ - ".\sdbm.h"\ - -"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)" +"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\sdbm_lock.c -DEP_CPP_SDBM_L=\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\hsregex.h"\ - "..\..\os\win32\os.h"\ - -NODEP_CPP_SDBM_L=\ - "..\..\include\ap_config_auto.h"\ - -"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)" +"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\sdbm_pair.c -DEP_CPP_SDBM_P=\ - ".\sdbm.h"\ - ".\sdbm_pair.h"\ - ".\sdbm_tune.h"\ - -"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)" +"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/main/gen_test_char.dep b/src/main/gen_test_char.dep new file mode 100644 index 00000000000..df4b5e39268 --- /dev/null +++ b/src/main/gen_test_char.dep @@ -0,0 +1,16 @@ +# Microsoft Developer Studio Generated Dependency File, included by gen_test_char.mak + +.\gen_test_char.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + diff --git a/src/main/gen_test_char.mak b/src/main/gen_test_char.mak index 32d8f7761f0..7a1fcd2dfeb 100644 --- a/src/main/gen_test_char.mak +++ b/src/main/gen_test_char.mak @@ -4,8 +4,7 @@ CFG=gen_test_char - Win32 Debug !MESSAGE No configuration specified. Defaulting to gen_test_char - Win32 Debug. !ENDIF -!IF "$(CFG)" != "gen_test_char - Win32 Release" && "$(CFG)" !=\ - "gen_test_char - Win32 Debug" +!IF "$(CFG)" != "gen_test_char - Win32 Release" && "$(CFG)" != "gen_test_char - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=gen_test_char - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "gen_test_char - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "gen_test_char - Win32 Debug" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "gen_test_char - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "gen_test_char - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -36,15 +33,8 @@ INTDIR=.\Release OutDir=. # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\gen_test_char.exe" - -!ELSE - ALL : "$(OUTDIR)\gen_test_char.exe" -!ENDIF CLEAN : -@erase "$(INTDIR)\gen_test_char.idb" @@ -55,38 +45,34 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ - "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char"\ - /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -97,9 +83,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_test_char.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Release\gen_test_char.pdb" /machine:I386\ - /out:"$(OUTDIR)\gen_test_char.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Release\gen_test_char.pdb" /machine:I386 /out:"$(OUTDIR)\gen_test_char.exe" LINK32_OBJS= \ "$(INTDIR)\gen_test_char.obj" @@ -108,7 +92,7 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE=$(InputPath) +SOURCE="$(InputPath)" PostBuild_Desc=Create test_char.h DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep @@ -130,15 +114,8 @@ INTDIR=.\Debug OutDir=. # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\gen_test_char.exe" -!ELSE - -ALL : "$(OUTDIR)\gen_test_char.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\gen_test_char.idb" @@ -150,38 +127,34 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ - "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\gen_test_char" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -192,9 +165,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_test_char.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Debug\gen_test_char.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)\gen_test_char.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Debug\gen_test_char.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gen_test_char.exe" LINK32_OBJS= \ "$(INTDIR)\gen_test_char.obj" @@ -203,7 +174,7 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE=$(InputPath) +SOURCE="$(InputPath)" PostBuild_Desc=Create test_char.h DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep @@ -220,29 +191,19 @@ $(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_test_char.exe" !ENDIF -!IF "$(CFG)" == "gen_test_char - Win32 Release" || "$(CFG)" ==\ - "gen_test_char - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("gen_test_char.dep") +!INCLUDE "gen_test_char.dep" +!ELSE +!MESSAGE Warning: cannot find "gen_test_char.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "gen_test_char - Win32 Release" || "$(CFG)" == "gen_test_char - Win32 Debug" SOURCE=.\gen_test_char.c -DEP_CPP_GEN_T=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_GEN_T=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)" +"$(INTDIR)\gen_test_char.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/main/gen_uri_delims.dep b/src/main/gen_uri_delims.dep new file mode 100644 index 00000000000..5e93c3c2467 --- /dev/null +++ b/src/main/gen_uri_delims.dep @@ -0,0 +1,2 @@ +# Microsoft Developer Studio Generated Dependency File, included by gen_uri_delims.mak + diff --git a/src/main/gen_uri_delims.mak b/src/main/gen_uri_delims.mak index 81db6376098..e0f9f60cea0 100644 --- a/src/main/gen_uri_delims.mak +++ b/src/main/gen_uri_delims.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on gen_uri_delims.dsp !IF "$(CFG)" == "" CFG=gen_uri_delims - Win32 Debug -!MESSAGE No configuration specified. Defaulting to gen_uri_delims - Win32\ - Debug. +!MESSAGE No configuration specified. Defaulting to gen_uri_delims - Win32 Debug. !ENDIF -!IF "$(CFG)" != "gen_uri_delims - Win32 Release" && "$(CFG)" !=\ - "gen_uri_delims - Win32 Debug" +!IF "$(CFG)" != "gen_uri_delims - Win32 Release" && "$(CFG)" != "gen_uri_delims - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=gen_uri_delims - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "gen_uri_delims - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "gen_uri_delims - Win32 Debug" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "gen_uri_delims - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "gen_uri_delims - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -37,15 +33,8 @@ INTDIR=.\Release OutDir=. # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\gen_uri_delims.exe" -!ELSE - -ALL : "$(OUTDIR)\gen_uri_delims.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\gen_uri_delims.idb" @@ -56,37 +45,34 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -97,9 +83,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_uri_delims.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Release\gen_uri_delims.pdb" /machine:I386\ - /out:"$(OUTDIR)\gen_uri_delims.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Release\gen_uri_delims.pdb" /machine:I386 /out:"$(OUTDIR)\gen_uri_delims.exe" LINK32_OBJS= \ "$(INTDIR)\gen_uri_delims.obj" @@ -108,7 +92,7 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE=$(InputPath) +SOURCE="$(InputPath)" PostBuild_Desc=Create uri_delims.h DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep @@ -130,15 +114,8 @@ INTDIR=.\Debug OutDir=. # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\gen_uri_delims.exe" -!ELSE - -ALL : "$(OUTDIR)\gen_uri_delims.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\gen_uri_delims.idb" @@ -150,37 +127,34 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\ - "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -191,9 +165,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\gen_uri_delims.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\Debug\gen_uri_delims.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)\gen_uri_delims.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Debug\gen_uri_delims.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gen_uri_delims.exe" LINK32_OBJS= \ "$(INTDIR)\gen_uri_delims.obj" @@ -202,7 +174,7 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE=$(InputPath) +SOURCE="$(InputPath)" PostBuild_Desc=Create uri_delims.h DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep @@ -219,8 +191,16 @@ $(DS_POSTBUILD_DEP) : "$(OUTDIR)\gen_uri_delims.exe" !ENDIF -!IF "$(CFG)" == "gen_uri_delims - Win32 Release" || "$(CFG)" ==\ - "gen_uri_delims - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("gen_uri_delims.dep") +!INCLUDE "gen_uri_delims.dep" +!ELSE +!MESSAGE Warning: cannot find "gen_uri_delims.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "gen_uri_delims - Win32 Release" || "$(CFG)" == "gen_uri_delims - Win32 Debug" SOURCE=.\gen_uri_delims.c "$(INTDIR)\gen_uri_delims.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/os/win32/ApacheOS.dep b/src/os/win32/ApacheOS.dep new file mode 100644 index 00000000000..fb0b33fb43d --- /dev/null +++ b/src/os/win32/ApacheOS.dep @@ -0,0 +1,5 @@ +# Microsoft Developer Studio Generated Dependency File, included by ApacheOS.mak + +.\os.c : \ + ".\os.h"\ + diff --git a/src/os/win32/ApacheOS.mak b/src/os/win32/ApacheOS.mak index 5118ba61f0e..ca65901e21b 100755 --- a/src/os/win32/ApacheOS.mak +++ b/src/os/win32/ApacheOS.mak @@ -4,8 +4,7 @@ CFG=ApacheOS - Win32 Debug !MESSAGE No configuration specified. Defaulting to ApacheOS - Win32 Debug. !ENDIF -!IF "$(CFG)" != "ApacheOS - Win32 Release" && "$(CFG)" !=\ - "ApacheOS - Win32 Debug" +!IF "$(CFG)" != "ApacheOS - Win32 Release" && "$(CFG)" != "ApacheOS - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -34,61 +33,52 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\ApacheOS.lib" - -!ELSE - ALL : "$(OUTDIR)\ApacheOS.lib" -!ENDIF CLEAN : -@erase "$(INTDIR)\ApacheOS.idb" + -@erase "$(INTDIR)\ApacheOS.pdb" -@erase "$(INTDIR)\os.obj" -@erase "$(OUTDIR)\ApacheOS.lib" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c -CPP_OBJS=.\LibR/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" BSC32_SBRS= \ @@ -111,15 +101,8 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\ApacheOS.lib" -!ELSE - -ALL : "$(OUTDIR)\ApacheOS.lib" - -!ENDIF CLEAN : -@erase "$(INTDIR)\ApacheOS.idb" @@ -130,43 +113,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c -CPP_OBJS=.\LibD/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheOS.bsc" BSC32_SBRS= \ @@ -184,14 +164,19 @@ LIB32_OBJS= \ !ENDIF -!IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" ==\ - "ApacheOS - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("ApacheOS.dep") +!INCLUDE "ApacheOS.dep" +!ELSE +!MESSAGE Warning: cannot find "ApacheOS.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "ApacheOS - Win32 Release" || "$(CFG)" == "ApacheOS - Win32 Debug" SOURCE=.\os.c -DEP_CPP_OS_C0=\ - ".\os.h"\ - -"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C0) "$(INTDIR)" +"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/os/win32/Win9xConHook.dep b/src/os/win32/Win9xConHook.dep new file mode 100644 index 00000000000..bc873684c8d --- /dev/null +++ b/src/os/win32/Win9xConHook.dep @@ -0,0 +1,2 @@ +# Microsoft Developer Studio Generated Dependency File, included by Win9xConHook.mak + diff --git a/src/os/win32/Win9xConHook.mak b/src/os/win32/Win9xConHook.mak index 28f5632522c..9bd6d423ddf 100644 --- a/src/os/win32/Win9xConHook.mak +++ b/src/os/win32/Win9xConHook.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on Win9xConHook.dsp !IF "$(CFG)" == "" CFG=Win9xConHook - Win32 Release -!MESSAGE No configuration specified. Defaulting to Win9xConHook - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to Win9xConHook - Win32 Release. !ENDIF -!IF "$(CFG)" != "Win9xConHook - Win32 Release" && "$(CFG)" !=\ - "Win9xConHook - Win32 Debug" +!IF "$(CFG)" != "Win9xConHook - Win32 Release" && "$(CFG)" != "Win9xConHook - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=Win9xConHook - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Win9xConHook - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Win9xConHook - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Win9xConHook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Win9xConHook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -37,59 +33,50 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\Win9xConHook.dll" -!ELSE - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ENDIF CLEAN : - -@erase "$(INTDIR)\Win9xConHook.idb" -@erase "$(INTDIR)\Win9xConHook.obj" + -@erase "$(INTDIR)\Win9xConHook_src.idb" + -@erase "$(INTDIR)\Win9xConHook_src.pdb" -@erase "$(OUTDIR)\Win9xConHook.dll" -@erase "$(OUTDIR)\Win9xConHook.exp" -@erase "$(OUTDIR)\Win9xConHook.lib" - -@erase "$(OUTDIR)\Win9xConHook.map" + -@erase "$(OUTDIR)\Win9xConHook.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -102,10 +89,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /machine:I386 /def:".\Win9xConHook.def"\ - /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb" /debug /machine:I386 /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" /opt:ref DEF_FILE= \ ".\Win9xConHook.def" LINK32_OBJS= \ @@ -124,60 +108,50 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\Win9xConHook.dll" - -!ELSE - ALL : "$(OUTDIR)\Win9xConHook.dll" -!ENDIF CLEAN : - -@erase "$(INTDIR)\Win9xConHook.idb" -@erase "$(INTDIR)\Win9xConHook.obj" + -@erase "$(INTDIR)\Win9xConHook_src.idb" + -@erase "$(INTDIR)\Win9xConHook_src.pdb" -@erase "$(OUTDIR)\Win9xConHook.dll" -@erase "$(OUTDIR)\Win9xConHook.exp" -@erase "$(OUTDIR)\Win9xConHook.lib" - -@erase "$(OUTDIR)\Win9xConHook.map" -@erase "$(OUTDIR)\Win9xConHook.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -190,11 +164,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\Win9xConHook.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000"\ - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb"\ - /map:"$(INTDIR)\Win9xConHook.map" /debug /machine:I386\ - /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll"\ - /implib:"$(OUTDIR)\Win9xConHook.lib" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib /nologo /base:"0x1c0f0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\Win9xConHook.pdb" /debug /machine:I386 /def:".\Win9xConHook.def" /out:"$(OUTDIR)\Win9xConHook.dll" /implib:"$(OUTDIR)\Win9xConHook.lib" DEF_FILE= \ ".\Win9xConHook.def" LINK32_OBJS= \ @@ -208,8 +178,16 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "Win9xConHook - Win32 Release" || "$(CFG)" ==\ - "Win9xConHook - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("Win9xConHook.dep") +!INCLUDE "Win9xConHook.dep" +!ELSE +!MESSAGE Warning: cannot find "Win9xConHook.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "Win9xConHook - Win32 Release" || "$(CFG)" == "Win9xConHook - Win32 Debug" SOURCE=.\Win9xConHook.c "$(INTDIR)\Win9xConHook.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/os/win32/mod_auth_anon.dep b/src/os/win32/mod_auth_anon.dep new file mode 100644 index 00000000000..4ea4c5622d4 --- /dev/null +++ b/src/os/win32/mod_auth_anon.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_auth_anon.mak + +..\..\modules\standard\mod_auth_anon.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_auth_anon.mak b/src/os/win32/mod_auth_anon.mak index 56d2fda89d9..36a7a1a81bd 100644 --- a/src/os/win32/mod_auth_anon.mak +++ b/src/os/win32/mod_auth_anon.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_anon.dsp !IF "$(CFG)" == "" CFG=mod_auth_anon - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_auth_anon - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_auth_anon - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_auth_anon - Win32 Release" && "$(CFG)" !=\ - "mod_auth_anon - Win32 Debug" +!IF "$(CFG)" != "mod_auth_anon - Win32 Release" && "$(CFG)" != "mod_auth_anon - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_auth_anon - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_auth_anon - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_anon - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_anon - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_anon - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_anon.idb" -@erase "$(INTDIR)\mod_auth_anon.obj" + -@erase "$(INTDIR)\mod_auth_anon_src.idb" + -@erase "$(INTDIR)\mod_auth_anon_src.pdb" -@erase "$(OUTDIR)\mod_auth_anon.exp" -@erase "$(OUTDIR)\mod_auth_anon.lib" - -@erase "$(OUTDIR)\mod_auth_anon.map" + -@erase "$(OUTDIR)\mod_auth_anon.pdb" -@erase "$(OUTDIR)\mod_auth_anon.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_anon" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so" /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_auth_anon.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_anon.idb" -@erase "$(INTDIR)\mod_auth_anon.obj" + -@erase "$(INTDIR)\mod_auth_anon_src.idb" + -@erase "$(INTDIR)\mod_auth_anon_src.pdb" -@erase "$(OUTDIR)\mod_auth_anon.exp" -@erase "$(OUTDIR)\mod_auth_anon.lib" - -@erase "$(OUTDIR)\mod_auth_anon.map" -@erase "$(OUTDIR)\mod_auth_anon.pdb" -@erase "$(OUTDIR)\mod_auth_anon.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_anon" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_anon.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /map:"$(INTDIR)\mod_auth_anon.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so"\ - /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_anon.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_anon.so" /implib:"$(OUTDIR)\mod_auth_anon.lib" /base:@"BaseAddr.ref",mod_auth_anon LINK32_OBJS= \ "$(INTDIR)\mod_auth_anon.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_auth_anon - Win32 Release" || "$(CFG)" ==\ - "mod_auth_anon - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_auth_anon.dep") +!INCLUDE "mod_auth_anon.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_auth_anon.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_auth_anon - Win32 Release" || "$(CFG)" == "mod_auth_anon - Win32 Debug" !IF "$(CFG)" == "mod_auth_anon - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_anon - Win32 Debug" @@ -241,38 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_auth_anon.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_auth_dbm.dep b/src/os/win32/mod_auth_dbm.dep new file mode 100644 index 00000000000..0fdf0f2d6a4 --- /dev/null +++ b/src/os/win32/mod_auth_dbm.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_auth_dbm.mak + +..\..\modules\standard\mod_auth_dbm.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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\sdbm\sdbm.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_auth_dbm.mak b/src/os/win32/mod_auth_dbm.mak index 74c5a963bbd..88fe867716a 100644 --- a/src/os/win32/mod_auth_dbm.mak +++ b/src/os/win32/mod_auth_dbm.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_dbm.dsp !IF "$(CFG)" == "" CFG=mod_auth_dbm - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_auth_dbm - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_auth_dbm - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_auth_dbm - Win32 Release" && "$(CFG)" !=\ - "mod_auth_dbm - Win32 Debug" +!IF "$(CFG)" != "mod_auth_dbm - Win32 Release" && "$(CFG)" != "mod_auth_dbm - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_auth_dbm - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_auth_dbm - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_dbm - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_dbm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_dbm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -43,8 +39,7 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so" !ELSE -ALL : "sdbm - Win32 Release" "ApacheCore - Win32 Release"\ - "$(OUTDIR)\mod_auth_dbm.so" +ALL : "sdbm - Win32 Release" "ApacheCore - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so" !ENDIF @@ -53,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" "sdbm - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_dbm.idb" -@erase "$(INTDIR)\mod_auth_dbm.obj" + -@erase "$(INTDIR)\mod_auth_dbm_src.idb" + -@erase "$(INTDIR)\mod_auth_dbm_src.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.exp" -@erase "$(OUTDIR)\mod_auth_dbm.lib" - -@erase "$(OUTDIR)\mod_auth_dbm.map" + -@erase "$(OUTDIR)\mod_auth_dbm.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -108,14 +100,11 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so" /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_auth_dbm.obj" \ - "..\..\lib\sdbm\LibR\sdbm.lib" \ - "..\..\Release\ApacheCore.lib" + "..\..\Release\ApacheCore.lib" \ + "..\..\lib\sdbm\LibR\sdbm.lib" "$(OUTDIR)\mod_auth_dbm.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -136,8 +125,7 @@ ALL : "$(OUTDIR)\mod_auth_dbm.so" !ELSE -ALL : "sdbm - Win32 Debug" "ApacheCore - Win32 Debug"\ - "$(OUTDIR)\mod_auth_dbm.so" +ALL : "sdbm - Win32 Debug" "ApacheCore - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so" !ENDIF @@ -146,11 +134,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" "sdbm - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_dbm.idb" -@erase "$(INTDIR)\mod_auth_dbm.obj" + -@erase "$(INTDIR)\mod_auth_dbm_src.idb" + -@erase "$(INTDIR)\mod_auth_dbm_src.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.exp" -@erase "$(OUTDIR)\mod_auth_dbm.lib" - -@erase "$(OUTDIR)\mod_auth_dbm.map" -@erase "$(OUTDIR)\mod_auth_dbm.pdb" -@erase "$(OUTDIR)\mod_auth_dbm.so" @@ -158,38 +146,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -202,10 +186,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_dbm.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /map:"$(INTDIR)\mod_auth_dbm.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so"\ - /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_dbm.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_dbm.so" /implib:"$(OUTDIR)\mod_auth_dbm.lib" /base:@"BaseAddr.ref",mod_auth_dbm LINK32_OBJS= \ "$(INTDIR)\mod_auth_dbm.obj" \ "..\..\Debug\ApacheCore.lib" \ @@ -219,21 +200,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" || "$(CFG)" ==\ - "mod_auth_dbm - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_auth_dbm.dep") +!INCLUDE "mod_auth_dbm.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_auth_dbm.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_auth_dbm - Win32 Release" || "$(CFG)" == "mod_auth_dbm - Win32 Debug" !IF "$(CFG)" == "mod_auth_dbm - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" @@ -245,8 +232,7 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF @@ -260,8 +246,7 @@ LINK32_OBJS= \ "sdbm - Win32 ReleaseCLEAN" : cd "..\../..\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Release"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" RECURSE=1 CLEAN cd "..\..\os\win32" !ELSEIF "$(CFG)" == "mod_auth_dbm - Win32 Debug" @@ -273,38 +258,14 @@ LINK32_OBJS= \ "sdbm - Win32 DebugCLEAN" : cd "..\../..\src\lib\sdbm" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Debug"\ - RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" RECURSE=1 CLEAN cd "..\..\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_auth_dbm.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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\sdbm\sdbm.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_auth_digest.dep b/src/os/win32/mod_auth_digest.dep new file mode 100644 index 00000000000..fa5e3fcfcae --- /dev/null +++ b/src/os/win32/mod_auth_digest.dep @@ -0,0 +1,25 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_auth_digest.mak + +..\..\modules\experimental\mod_auth_digest.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\ap_sha1.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_protocol.h"\ + "..\..\include\http_request.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_md5.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_auth_digest.mak b/src/os/win32/mod_auth_digest.mak index 561d63a5309..7918f650053 100644 --- a/src/os/win32/mod_auth_digest.mak +++ b/src/os/win32/mod_auth_digest.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_auth_digest.dsp !IF "$(CFG)" == "" CFG=mod_auth_digest - Win32 Debug -!MESSAGE No configuration specified. Defaulting to mod_auth_digest - Win32\ - Debug. +!MESSAGE No configuration specified. Defaulting to mod_auth_digest - Win32 Debug. !ENDIF -!IF "$(CFG)" != "mod_auth_digest - Win32 Release" && "$(CFG)" !=\ - "mod_auth_digest - Win32 Debug" +!IF "$(CFG)" != "mod_auth_digest - Win32 Release" && "$(CFG)" != "mod_auth_digest - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_auth_digest - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_auth_digest - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_auth_digest - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_digest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_auth_digest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,66 +48,59 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_digest.idb" -@erase "$(INTDIR)\mod_auth_digest.obj" + -@erase "$(INTDIR)\mod_auth_digest_src.idb" + -@erase "$(INTDIR)\mod_auth_digest_src.pdb" -@erase "$(OUTDIR)\mod_auth_digest.exp" -@erase "$(OUTDIR)\mod_auth_digest.lib" - -@erase "$(OUTDIR)\mod_auth_digest.map" + -@erase "$(OUTDIR)\mod_auth_digest.pdb" -@erase "$(OUTDIR)\mod_auth_digest.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_digest" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib" /base:@"BaseAddr.ref",mod_auth_digest /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_auth_digest.obj" \ "..\..\Release\ApacheCore.lib" @@ -144,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_auth_digest.idb" -@erase "$(INTDIR)\mod_auth_digest.obj" + -@erase "$(INTDIR)\mod_auth_digest_src.idb" + -@erase "$(INTDIR)\mod_auth_digest_src.pdb" -@erase "$(OUTDIR)\mod_auth_digest.exp" -@erase "$(OUTDIR)\mod_auth_digest.lib" - -@erase "$(OUTDIR)\mod_auth_digest.map" -@erase "$(OUTDIR)\mod_auth_digest.pdb" -@erase "$(OUTDIR)\mod_auth_digest.so" @@ -156,55 +145,47 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_auth_digest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_auth_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb"\ - /map:"$(INTDIR)\mod_auth_digest.map" /debug /machine:I386\ - /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib"\ - /base:@"BaseAddr.ref",mod_auth_digest +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_auth_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_auth_digest.so" /implib:"$(OUTDIR)\mod_auth_digest.lib" /base:@"BaseAddr.ref",mod_auth_digest LINK32_OBJS= \ "$(INTDIR)\mod_auth_digest.obj" \ "..\..\Debug\ApacheCore.lib" @@ -217,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_auth_digest - Win32 Release" || "$(CFG)" ==\ - "mod_auth_digest - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_auth_digest.dep") +!INCLUDE "mod_auth_digest.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_auth_digest.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_auth_digest - Win32 Release" || "$(CFG)" == "mod_auth_digest - Win32 Debug" !IF "$(CFG)" == "mod_auth_digest - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_auth_digest - Win32 Debug" @@ -243,43 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\experimental\mod_auth_digest.c -DEP_CPP_MOD_A=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\ap_sha1.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_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_md5.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - "..\..\modules\experimental\mm.h"\ - -"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" +"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_cern_meta.dep b/src/os/win32/mod_cern_meta.dep new file mode 100644 index 00000000000..505237605b2 --- /dev/null +++ b/src/os/win32/mod_cern_meta.dep @@ -0,0 +1,20 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_cern_meta.mak + +..\..\modules\standard\mod_cern_meta.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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_script.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_cern_meta.mak b/src/os/win32/mod_cern_meta.mak index 27a29b9fe01..22b49447a51 100644 --- a/src/os/win32/mod_cern_meta.mak +++ b/src/os/win32/mod_cern_meta.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_cern_meta.dsp !IF "$(CFG)" == "" CFG=mod_cern_meta - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_cern_meta - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_cern_meta - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_cern_meta - Win32 Release" && "$(CFG)" !=\ - "mod_cern_meta - Win32 Debug" +!IF "$(CFG)" != "mod_cern_meta - Win32 Release" && "$(CFG)" != "mod_cern_meta - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_cern_meta - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_cern_meta - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_cern_meta - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_cern_meta - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_cern_meta - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_cern_meta.idb" -@erase "$(INTDIR)\mod_cern_meta.obj" + -@erase "$(INTDIR)\mod_cern_meta_src.idb" + -@erase "$(INTDIR)\mod_cern_meta_src.pdb" -@erase "$(OUTDIR)\mod_cern_meta.exp" -@erase "$(OUTDIR)\mod_cern_meta.lib" - -@erase "$(OUTDIR)\mod_cern_meta.map" + -@erase "$(OUTDIR)\mod_cern_meta.pdb" -@erase "$(OUTDIR)\mod_cern_meta.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_cern_meta" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so" /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_cern_meta.idb" -@erase "$(INTDIR)\mod_cern_meta.obj" + -@erase "$(INTDIR)\mod_cern_meta_src.idb" + -@erase "$(INTDIR)\mod_cern_meta_src.pdb" -@erase "$(OUTDIR)\mod_cern_meta.exp" -@erase "$(OUTDIR)\mod_cern_meta.lib" - -@erase "$(OUTDIR)\mod_cern_meta.map" -@erase "$(OUTDIR)\mod_cern_meta.pdb" -@erase "$(OUTDIR)\mod_cern_meta.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_cern_meta" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_cern_meta.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /map:"$(INTDIR)\mod_cern_meta.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so"\ - /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_cern_meta.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_cern_meta.so" /implib:"$(OUTDIR)\mod_cern_meta.lib" /base:@"BaseAddr.ref",mod_cern_meta LINK32_OBJS= \ "$(INTDIR)\mod_cern_meta.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_cern_meta - Win32 Release" || "$(CFG)" ==\ - "mod_cern_meta - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_cern_meta.dep") +!INCLUDE "mod_cern_meta.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_cern_meta.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_cern_meta - Win32 Release" || "$(CFG)" == "mod_cern_meta - Win32 Debug" !IF "$(CFG)" == "mod_cern_meta - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_cern_meta - Win32 Debug" @@ -241,37 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_cern_meta.c -DEP_CPP_MOD_C=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_C=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" +"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_digest.dep b/src/os/win32/mod_digest.dep new file mode 100644 index 00000000000..eb617887610 --- /dev/null +++ b/src/os/win32/mod_digest.dep @@ -0,0 +1,22 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_digest.mak + +..\..\modules\standard\mod_digest.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.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_md5.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_digest.mak b/src/os/win32/mod_digest.mak index fbc4c71fe0d..82b1673804e 100644 --- a/src/os/win32/mod_digest.mak +++ b/src/os/win32/mod_digest.mak @@ -4,8 +4,7 @@ CFG=mod_digest - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_digest - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_digest - Win32 Release" && "$(CFG)" !=\ - "mod_digest - Win32 Debug" +!IF "$(CFG)" != "mod_digest - Win32 Release" && "$(CFG)" != "mod_digest - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_digest - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_digest - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_digest - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_digest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_digest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_digest.idb" -@erase "$(INTDIR)\mod_digest.obj" + -@erase "$(INTDIR)\mod_digest_src.idb" + -@erase "$(INTDIR)\mod_digest_src.pdb" -@erase "$(OUTDIR)\mod_digest.exp" -@erase "$(OUTDIR)\mod_digest.lib" - -@erase "$(OUTDIR)\mod_digest.map" + -@erase "$(OUTDIR)\mod_digest.pdb" -@erase "$(OUTDIR)\mod_digest.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_digest" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /machine:I386\ - /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib" /base:@"BaseAddr.ref",mod_digest /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_digest.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_digest.idb" -@erase "$(INTDIR)\mod_digest.obj" + -@erase "$(INTDIR)\mod_digest_src.idb" + -@erase "$(INTDIR)\mod_digest_src.pdb" -@erase "$(OUTDIR)\mod_digest.exp" -@erase "$(OUTDIR)\mod_digest.lib" - -@erase "$(OUTDIR)\mod_digest.map" -@erase "$(OUTDIR)\mod_digest.pdb" -@erase "$(OUTDIR)\mod_digest.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_digest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_digest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_digest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_digest.pdb" /map:"$(INTDIR)\mod_digest.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib"\ - /base:@"BaseAddr.ref",mod_digest +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_digest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_digest.so" /implib:"$(OUTDIR)\mod_digest.lib" /base:@"BaseAddr.ref",mod_digest LINK32_OBJS= \ "$(INTDIR)\mod_digest.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_digest - Win32 Release" || "$(CFG)" ==\ - "mod_digest - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_digest.dep") +!INCLUDE "mod_digest.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_digest.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_digest - Win32 Release" || "$(CFG)" == "mod_digest - Win32 Debug" !IF "$(CFG)" == "mod_digest - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_digest - Win32 Debug" @@ -240,39 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_digest.c -DEP_CPP_MOD_D=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.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_md5.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_D=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" +"$(INTDIR)\mod_digest.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_expires.dep b/src/os/win32/mod_expires.dep new file mode 100644 index 00000000000..898172d84e6 --- /dev/null +++ b/src/os/win32/mod_expires.dep @@ -0,0 +1,18 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_expires.mak + +..\..\modules\standard\mod_expires.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_expires.mak b/src/os/win32/mod_expires.mak index 4a2f2324142..96c8fe30a0b 100644 --- a/src/os/win32/mod_expires.mak +++ b/src/os/win32/mod_expires.mak @@ -4,8 +4,7 @@ CFG=mod_expires - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_expires - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_expires - Win32 Release" && "$(CFG)" !=\ - "mod_expires - Win32 Debug" +!IF "$(CFG)" != "mod_expires - Win32 Release" && "$(CFG)" != "mod_expires - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_expires - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_expires - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_expires - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_expires - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_expires - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_expires.idb" -@erase "$(INTDIR)\mod_expires.obj" + -@erase "$(INTDIR)\mod_expires_src.idb" + -@erase "$(INTDIR)\mod_expires_src.pdb" -@erase "$(OUTDIR)\mod_expires.exp" -@erase "$(OUTDIR)\mod_expires.lib" - -@erase "$(OUTDIR)\mod_expires.map" + -@erase "$(OUTDIR)\mod_expires.pdb" -@erase "$(OUTDIR)\mod_expires.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_expires" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /machine:I386\ - /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib"\ - /base:@"BaseAddr.ref",mod_expires +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_expires.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_expires.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_expires.idb" -@erase "$(INTDIR)\mod_expires.obj" + -@erase "$(INTDIR)\mod_expires_src.idb" + -@erase "$(INTDIR)\mod_expires_src.pdb" -@erase "$(OUTDIR)\mod_expires.exp" -@erase "$(OUTDIR)\mod_expires.lib" - -@erase "$(OUTDIR)\mod_expires.map" -@erase "$(OUTDIR)\mod_expires.pdb" -@erase "$(OUTDIR)\mod_expires.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_expires" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_expires.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_expires.pdb" /map:"$(INTDIR)\mod_expires.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_expires.so"\ - /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_expires.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_expires.so" /implib:"$(OUTDIR)\mod_expires.lib" /base:@"BaseAddr.ref",mod_expires LINK32_OBJS= \ "$(INTDIR)\mod_expires.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_expires - Win32 Release" || "$(CFG)" ==\ - "mod_expires - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_expires.dep") +!INCLUDE "mod_expires.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_expires.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_expires - Win32 Release" || "$(CFG)" == "mod_expires - Win32 Debug" !IF "$(CFG)" == "mod_expires - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_expires - Win32 Debug" @@ -240,35 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_expires.c -DEP_CPP_MOD_E=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_E=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" +"$(INTDIR)\mod_expires.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_headers.dep b/src/os/win32/mod_headers.dep new file mode 100644 index 00000000000..a686ac2de6d --- /dev/null +++ b/src/os/win32/mod_headers.dep @@ -0,0 +1,17 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_headers.mak + +..\..\modules\standard\mod_headers.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_headers.mak b/src/os/win32/mod_headers.mak index 3c9cc3fb849..70d0790d893 100644 --- a/src/os/win32/mod_headers.mak +++ b/src/os/win32/mod_headers.mak @@ -4,8 +4,7 @@ CFG=mod_headers - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_headers - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_headers - Win32 Release" && "$(CFG)" !=\ - "mod_headers - Win32 Debug" +!IF "$(CFG)" != "mod_headers - Win32 Release" && "$(CFG)" != "mod_headers - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_headers - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_headers - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_headers - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_headers - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_headers - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_headers.idb" -@erase "$(INTDIR)\mod_headers.obj" + -@erase "$(INTDIR)\mod_headers_src.idb" + -@erase "$(INTDIR)\mod_headers_src.pdb" -@erase "$(OUTDIR)\mod_headers.exp" -@erase "$(OUTDIR)\mod_headers.lib" - -@erase "$(OUTDIR)\mod_headers.map" + -@erase "$(OUTDIR)\mod_headers.pdb" -@erase "$(OUTDIR)\mod_headers.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_headers" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /machine:I386\ - /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib"\ - /base:@"BaseAddr.ref",mod_headers +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_headers.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_headers.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_headers.idb" -@erase "$(INTDIR)\mod_headers.obj" + -@erase "$(INTDIR)\mod_headers_src.idb" + -@erase "$(INTDIR)\mod_headers_src.pdb" -@erase "$(OUTDIR)\mod_headers.exp" -@erase "$(OUTDIR)\mod_headers.lib" - -@erase "$(OUTDIR)\mod_headers.map" -@erase "$(OUTDIR)\mod_headers.pdb" -@erase "$(OUTDIR)\mod_headers.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_headers" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_headers.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_headers.pdb" /map:"$(INTDIR)\mod_headers.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_headers.so"\ - /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_headers.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_headers.so" /implib:"$(OUTDIR)\mod_headers.lib" /base:@"BaseAddr.ref",mod_headers LINK32_OBJS= \ "$(INTDIR)\mod_headers.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_headers - Win32 Release" || "$(CFG)" ==\ - "mod_headers - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_headers.dep") +!INCLUDE "mod_headers.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_headers.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_headers - Win32 Release" || "$(CFG)" == "mod_headers - Win32 Debug" !IF "$(CFG)" == "mod_headers - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_headers - Win32 Debug" @@ -240,34 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_headers.c -DEP_CPP_MOD_H=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_H=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" +"$(INTDIR)\mod_headers.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_info.dep b/src/os/win32/mod_info.dep new file mode 100644 index 00000000000..b17bac54cf0 --- /dev/null +++ b/src/os/win32/mod_info.dep @@ -0,0 +1,23 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_info.mak + +..\..\modules\standard\mod_info.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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\httpd.h"\ + "..\..\include\util_script.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_info.mak b/src/os/win32/mod_info.mak index 20ca25039b5..4b1ca88b957 100644 --- a/src/os/win32/mod_info.mak +++ b/src/os/win32/mod_info.mak @@ -4,8 +4,7 @@ CFG=mod_info - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_info - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_info - Win32 Release" && "$(CFG)" !=\ - "mod_info - Win32 Debug" +!IF "$(CFG)" != "mod_info - Win32 Release" && "$(CFG)" != "mod_info - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,8 +13,7 @@ CFG=mod_info - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_info - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_info - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_info - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. @@ -50,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_info.idb" -@erase "$(INTDIR)\mod_info.obj" + -@erase "$(INTDIR)\mod_info_src.idb" + -@erase "$(INTDIR)\mod_info_src.pdb" -@erase "$(OUTDIR)\mod_info.exp" -@erase "$(OUTDIR)\mod_info.lib" - -@erase "$(OUTDIR)\mod_info.map" + -@erase "$(OUTDIR)\mod_info.pdb" -@erase "$(OUTDIR)\mod_info.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_info" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -105,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /machine:I386\ - /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_info.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib" /base:@"BaseAddr.ref",mod_info /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" \ "..\..\Release\ApacheCore.lib" @@ -141,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_info.idb" -@erase "$(INTDIR)\mod_info.obj" + -@erase "$(INTDIR)\mod_info_src.idb" + -@erase "$(INTDIR)\mod_info_src.pdb" -@erase "$(OUTDIR)\mod_info.exp" -@erase "$(OUTDIR)\mod_info.lib" - -@erase "$(OUTDIR)\mod_info.map" -@erase "$(OUTDIR)\mod_info.pdb" -@erase "$(OUTDIR)\mod_info.so" @@ -153,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_info" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -197,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_info.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\ - /base:@"BaseAddr.ref",mod_info +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_info.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib" /base:@"BaseAddr.ref",mod_info LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" \ "..\..\Debug\ApacheCore.lib" @@ -213,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_info - Win32 Release" || "$(CFG)" ==\ - "mod_info - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_info.dep") +!INCLUDE "mod_info.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_info.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_info - Win32 Release" || "$(CFG)" == "mod_info - Win32 Debug" !IF "$(CFG)" == "mod_info - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_info - Win32 Debug" @@ -239,40 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_info.c -DEP_CPP_MOD_I=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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\httpd.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_I=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" +"$(INTDIR)\mod_info.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_mime_magic.dep b/src/os/win32/mod_mime_magic.dep new file mode 100644 index 00000000000..943a5655a44 --- /dev/null +++ b/src/os/win32/mod_mime_magic.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_mime_magic.mak + +..\..\modules\standard\mod_mime_magic.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_mime_magic.mak b/src/os/win32/mod_mime_magic.mak index 36a93c30d42..99438a9916f 100644 --- a/src/os/win32/mod_mime_magic.mak +++ b/src/os/win32/mod_mime_magic.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_mime_magic.dsp !IF "$(CFG)" == "" CFG=mod_mime_magic - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_mime_magic - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_mime_magic - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_mime_magic - Win32 Release" && "$(CFG)" !=\ - "mod_mime_magic - Win32 Debug" +!IF "$(CFG)" != "mod_mime_magic - Win32 Release" && "$(CFG)" != "mod_mime_magic - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_mime_magic - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_mime_magic - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_mime_magic - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_mime_magic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_mime_magic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_mime_magic.idb" -@erase "$(INTDIR)\mod_mime_magic.obj" + -@erase "$(INTDIR)\mod_mime_magic_src.idb" + -@erase "$(INTDIR)\mod_mime_magic_src.pdb" -@erase "$(OUTDIR)\mod_mime_magic.exp" -@erase "$(OUTDIR)\mod_mime_magic.lib" - -@erase "$(OUTDIR)\mod_mime_magic.map" + -@erase "$(OUTDIR)\mod_mime_magic.pdb" -@erase "$(OUTDIR)\mod_mime_magic.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_mime_magic" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_mime_magic_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_mime_magic.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /map:"$(INTDIR)\mod_mime_magic.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so"\ - /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so" /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_mime_magic.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_mime_magic.idb" -@erase "$(INTDIR)\mod_mime_magic.obj" + -@erase "$(INTDIR)\mod_mime_magic_src.idb" + -@erase "$(INTDIR)\mod_mime_magic_src.pdb" -@erase "$(OUTDIR)\mod_mime_magic.exp" -@erase "$(OUTDIR)\mod_mime_magic.lib" - -@erase "$(OUTDIR)\mod_mime_magic.map" -@erase "$(OUTDIR)\mod_mime_magic.pdb" -@erase "$(OUTDIR)\mod_mime_magic.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_mime_magic" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_mime_magic_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_mime_magic.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /map:"$(INTDIR)\mod_mime_magic.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so"\ - /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_mime_magic.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_mime_magic.so" /implib:"$(OUTDIR)\mod_mime_magic.lib" /base:@"BaseAddr.ref",mod_mime_magic LINK32_OBJS= \ "$(INTDIR)\mod_mime_magic.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_mime_magic - Win32 Release" || "$(CFG)" ==\ - "mod_mime_magic - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_mime_magic.dep") +!INCLUDE "mod_mime_magic.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_mime_magic.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_mime_magic - Win32 Release" || "$(CFG)" == "mod_mime_magic - Win32 Debug" !IF "$(CFG)" == "mod_mime_magic - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_mime_magic - Win32 Debug" @@ -241,38 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_mime_magic.c -DEP_CPP_MOD_M=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_M=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_mime_magic.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" +"$(INTDIR)\mod_mime_magic.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_proxy.dep b/src/os/win32/mod_proxy.dep new file mode 100644 index 00000000000..2c3a30467a1 --- /dev/null +++ b/src/os/win32/mod_proxy.dep @@ -0,0 +1,139 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_proxy.mak + +..\..\modules\proxy\mod_proxy.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ + "..\..\include\http_vhost.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_cache.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.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\httpd.h"\ + "..\..\include\multithread.h"\ + "..\..\include\util_date.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_connect.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_ftp.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_http.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_date.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +..\..\modules\proxy\proxy_util.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_md5.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\explain.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\http_main.h"\ + "..\..\include\http_protocol.h"\ + "..\..\include\httpd.h"\ + "..\..\include\multithread.h"\ + "..\..\include\util_date.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\proxy\mod_proxy.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_proxy.mak b/src/os/win32/mod_proxy.mak index 196f465226d..6c120dd6183 100644 --- a/src/os/win32/mod_proxy.mak +++ b/src/os/win32/mod_proxy.mak @@ -4,8 +4,7 @@ CFG=mod_proxy - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_proxy - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_proxy - Win32 Release" && "$(CFG)" !=\ - "mod_proxy - Win32 Debug" +!IF "$(CFG)" != "mod_proxy - Win32 Release" && "$(CFG)" != "mod_proxy - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_proxy - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_proxy - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_proxy - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,8 +48,9 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_proxy.idb" -@erase "$(INTDIR)\mod_proxy.obj" + -@erase "$(INTDIR)\mod_proxy_src.idb" + -@erase "$(INTDIR)\mod_proxy_src.pdb" -@erase "$(INTDIR)\proxy_cache.obj" -@erase "$(INTDIR)\proxy_connect.obj" -@erase "$(INTDIR)\proxy_ftp.obj" @@ -60,45 +58,41 @@ CLEAN : -@erase "$(INTDIR)\proxy_util.obj" -@erase "$(OUTDIR)\mod_proxy.exp" -@erase "$(OUTDIR)\mod_proxy.lib" - -@erase "$(OUTDIR)\mod_proxy.map" + -@erase "$(OUTDIR)\mod_proxy.pdb" -@erase "$(OUTDIR)\mod_proxy.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -111,10 +105,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib"\ - /base:@"BaseAddr.ref",mod_proxy +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_proxy.obj" \ "$(INTDIR)\proxy_cache.obj" \ @@ -152,8 +143,9 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_proxy.idb" -@erase "$(INTDIR)\mod_proxy.obj" + -@erase "$(INTDIR)\mod_proxy_src.idb" + -@erase "$(INTDIR)\mod_proxy_src.pdb" -@erase "$(INTDIR)\proxy_cache.obj" -@erase "$(INTDIR)\proxy_connect.obj" -@erase "$(INTDIR)\proxy_ftp.obj" @@ -161,7 +153,6 @@ CLEAN : -@erase "$(INTDIR)\proxy_util.obj" -@erase "$(OUTDIR)\mod_proxy.exp" -@erase "$(OUTDIR)\mod_proxy.lib" - -@erase "$(OUTDIR)\mod_proxy.map" -@erase "$(OUTDIR)\mod_proxy.pdb" -@erase "$(OUTDIR)\mod_proxy.so" @@ -169,38 +160,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\ - "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ - /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -213,10 +200,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\ - /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so" /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy LINK32_OBJS= \ "$(INTDIR)\mod_proxy.obj" \ "$(INTDIR)\proxy_cache.obj" \ @@ -234,196 +218,49 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\ - "mod_proxy - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_proxy.dep") +!INCLUDE "mod_proxy.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_proxy.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" == "mod_proxy - Win32 Debug" SOURCE=..\..\modules\proxy\mod_proxy.c -DEP_CPP_MOD_P=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\http_request.h"\ - "..\..\include\http_vhost.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_P=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)" +"$(INTDIR)\mod_proxy.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_cache.c -DEP_CPP_PROXY=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)" +"$(INTDIR)\proxy_cache.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_connect.c -DEP_CPP_PROXY_=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)" +"$(INTDIR)\proxy_connect.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_ftp.c -DEP_CPP_PROXY_F=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_F=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)" +"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_http.c -DEP_CPP_PROXY_H=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_H=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)" +"$(INTDIR)\proxy_http.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\..\modules\proxy\proxy_util.c -DEP_CPP_PROXY_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_md5.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\explain.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ - "..\..\include\http_protocol.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_date.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\proxy\mod_proxy.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_PROXY_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)" +"$(INTDIR)\proxy_util.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -431,14 +268,12 @@ NODEP_CPP_PROXY_U=\ "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_proxy - Win32 Debug" @@ -450,8 +285,7 @@ NODEP_CPP_PROXY_U=\ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF diff --git a/src/os/win32/mod_rewrite.dep b/src/os/win32/mod_rewrite.dep new file mode 100644 index 00000000000..76ddd96c042 --- /dev/null +++ b/src/os/win32/mod_rewrite.dep @@ -0,0 +1,27 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_rewrite.mak + +..\..\modules\standard\mod_rewrite.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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_request.h"\ + "..\..\include\http_vhost.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + "..\..\modules\standard\mod_rewrite.h"\ + ".\os.h"\ + ".\readdir.h"\ + + +.\passwd.c : \ + ".\passwd.h"\ + diff --git a/src/os/win32/mod_rewrite.mak b/src/os/win32/mod_rewrite.mak index 5dc424065d0..a3728fef547 100644 --- a/src/os/win32/mod_rewrite.mak +++ b/src/os/win32/mod_rewrite.mak @@ -4,8 +4,7 @@ CFG=mod_rewrite - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_rewrite - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_rewrite - Win32 Release" && "$(CFG)" !=\ - "mod_rewrite - Win32 Debug" +!IF "$(CFG)" != "mod_rewrite - Win32 Release" && "$(CFG)" != "mod_rewrite - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_rewrite - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_rewrite - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_rewrite - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_rewrite - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_rewrite - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,50 +48,47 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_rewrite.idb" -@erase "$(INTDIR)\mod_rewrite.obj" + -@erase "$(INTDIR)\mod_rewrite_src.idb" + -@erase "$(INTDIR)\mod_rewrite_src.pdb" -@erase "$(INTDIR)\passwd.obj" -@erase "$(OUTDIR)\mod_rewrite.exp" -@erase "$(OUTDIR)\mod_rewrite.lib" - -@erase "$(OUTDIR)\mod_rewrite.map" + -@erase "$(OUTDIR)\mod_rewrite.pdb" -@erase "$(OUTDIR)\mod_rewrite.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +101,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /machine:I386\ - /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib"\ - /base:@"BaseAddr.ref",mod_rewrite +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_rewrite.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_rewrite.obj" \ "$(INTDIR)\passwd.obj" \ @@ -144,12 +135,12 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_rewrite.idb" -@erase "$(INTDIR)\mod_rewrite.obj" + -@erase "$(INTDIR)\mod_rewrite_src.idb" + -@erase "$(INTDIR)\mod_rewrite_src.pdb" -@erase "$(INTDIR)\passwd.obj" -@erase "$(OUTDIR)\mod_rewrite.exp" -@erase "$(OUTDIR)\mod_rewrite.lib" - -@erase "$(OUTDIR)\mod_rewrite.map" -@erase "$(OUTDIR)\mod_rewrite.pdb" -@erase "$(OUTDIR)\mod_rewrite.so" @@ -157,38 +148,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_rewrite_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -201,10 +188,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_rewrite.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_rewrite.pdb" /map:"$(INTDIR)\mod_rewrite.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so"\ - /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_rewrite.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_rewrite.so" /implib:"$(OUTDIR)\mod_rewrite.lib" /base:@"BaseAddr.ref",mod_rewrite LINK32_OBJS= \ "$(INTDIR)\mod_rewrite.obj" \ "$(INTDIR)\passwd.obj" \ @@ -218,21 +202,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_rewrite - Win32 Release" || "$(CFG)" ==\ - "mod_rewrite - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_rewrite.dep") +!INCLUDE "mod_rewrite.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_rewrite.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_rewrite - Win32 Release" || "$(CFG)" == "mod_rewrite - Win32 Debug" !IF "$(CFG)" == "mod_rewrite - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_rewrite - Win32 Debug" @@ -244,49 +234,20 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_rewrite.c -DEP_CPP_MOD_R=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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_request.h"\ - "..\..\include\http_vhost.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - "..\..\modules\standard\mod_rewrite.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_R=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)" +"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\passwd.c -DEP_CPP_PASSW=\ - ".\passwd.h"\ - -"$(INTDIR)\passwd.obj" : $(SOURCE) $(DEP_CPP_PASSW) "$(INTDIR)" +"$(INTDIR)\passwd.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/os/win32/mod_speling.dep b/src/os/win32/mod_speling.dep new file mode 100644 index 00000000000..ece0bb4ff79 --- /dev/null +++ b/src/os/win32/mod_speling.dep @@ -0,0 +1,19 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_speling.mak + +..\..\modules\standard\mod_speling.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\http_log.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_speling.mak b/src/os/win32/mod_speling.mak index 1aeaad93daf..a1b468eb76a 100644 --- a/src/os/win32/mod_speling.mak +++ b/src/os/win32/mod_speling.mak @@ -4,8 +4,7 @@ CFG=mod_speling - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_speling - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_speling - Win32 Release" && "$(CFG)" !=\ - "mod_speling - Win32 Debug" +!IF "$(CFG)" != "mod_speling - Win32 Release" && "$(CFG)" != "mod_speling - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_speling - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_speling - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_speling - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_speling - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_speling - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_speling.idb" -@erase "$(INTDIR)\mod_speling.obj" + -@erase "$(INTDIR)\mod_speling_src.idb" + -@erase "$(INTDIR)\mod_speling_src.pdb" -@erase "$(OUTDIR)\mod_speling.exp" -@erase "$(OUTDIR)\mod_speling.lib" - -@erase "$(OUTDIR)\mod_speling.map" + -@erase "$(OUTDIR)\mod_speling.pdb" -@erase "$(OUTDIR)\mod_speling.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_speling" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /machine:I386\ - /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib"\ - /base:@"BaseAddr.ref",mod_speling +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_speling.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_speling.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_speling.idb" -@erase "$(INTDIR)\mod_speling.obj" + -@erase "$(INTDIR)\mod_speling_src.idb" + -@erase "$(INTDIR)\mod_speling_src.pdb" -@erase "$(OUTDIR)\mod_speling.exp" -@erase "$(OUTDIR)\mod_speling.lib" - -@erase "$(OUTDIR)\mod_speling.map" -@erase "$(OUTDIR)\mod_speling.pdb" -@erase "$(OUTDIR)\mod_speling.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_speling" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_speling.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_speling.pdb" /map:"$(INTDIR)\mod_speling.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_speling.so"\ - /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_speling.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_speling.so" /implib:"$(OUTDIR)\mod_speling.lib" /base:@"BaseAddr.ref",mod_speling LINK32_OBJS= \ "$(INTDIR)\mod_speling.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_speling - Win32 Release" || "$(CFG)" ==\ - "mod_speling - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_speling.dep") +!INCLUDE "mod_speling.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_speling.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_speling - Win32 Release" || "$(CFG)" == "mod_speling - Win32 Debug" !IF "$(CFG)" == "mod_speling - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_speling - Win32 Debug" @@ -240,36 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_speling.c -DEP_CPP_MOD_S=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" +"$(INTDIR)\mod_speling.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_status.dep b/src/os/win32/mod_status.dep new file mode 100644 index 00000000000..4ef8561d297 --- /dev/null +++ b/src/os/win32/mod_status.dep @@ -0,0 +1,24 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_status.mak + +..\..\modules\standard\mod_status.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.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\httpd.h"\ + "..\..\include\scoreboard.h"\ + "..\..\include\util_script.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_status.mak b/src/os/win32/mod_status.mak index 7c3880e69c8..d08f2ba62fa 100644 --- a/src/os/win32/mod_status.mak +++ b/src/os/win32/mod_status.mak @@ -4,8 +4,7 @@ CFG=mod_status - Win32 Release !MESSAGE No configuration specified. Defaulting to mod_status - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_status - Win32 Release" && "$(CFG)" !=\ - "mod_status - Win32 Debug" +!IF "$(CFG)" != "mod_status - Win32 Release" && "$(CFG)" != "mod_status - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=mod_status - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_status - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_status - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_status - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_status - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -51,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_status.idb" -@erase "$(INTDIR)\mod_status.obj" + -@erase "$(INTDIR)\mod_status_src.idb" + -@erase "$(INTDIR)\mod_status_src.pdb" -@erase "$(OUTDIR)\mod_status.exp" -@erase "$(OUTDIR)\mod_status.lib" - -@erase "$(OUTDIR)\mod_status.map" + -@erase "$(OUTDIR)\mod_status.pdb" -@erase "$(OUTDIR)\mod_status.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_status" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_status_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -106,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /machine:I386\ - /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_status.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib" /base:@"BaseAddr.ref",mod_status /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_status.obj" \ "..\..\Release\ApacheCore.lib" @@ -142,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_status.idb" -@erase "$(INTDIR)\mod_status.obj" + -@erase "$(INTDIR)\mod_status_src.idb" + -@erase "$(INTDIR)\mod_status_src.pdb" -@erase "$(OUTDIR)\mod_status.exp" -@erase "$(OUTDIR)\mod_status.lib" - -@erase "$(OUTDIR)\mod_status.map" -@erase "$(OUTDIR)\mod_status.pdb" -@erase "$(OUTDIR)\mod_status.so" @@ -154,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_status" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_status_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -198,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_status.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_status.pdb" /map:"$(INTDIR)\mod_status.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib"\ - /base:@"BaseAddr.ref",mod_status +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_status.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_status.so" /implib:"$(OUTDIR)\mod_status.lib" /base:@"BaseAddr.ref",mod_status LINK32_OBJS= \ "$(INTDIR)\mod_status.obj" \ "..\..\Debug\ApacheCore.lib" @@ -214,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_status - Win32 Release" || "$(CFG)" ==\ - "mod_status - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_status.dep") +!INCLUDE "mod_status.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_status.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_status - Win32 Release" || "$(CFG)" == "mod_status - Win32 Debug" !IF "$(CFG)" == "mod_status - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_status - Win32 Debug" @@ -240,41 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_status.c -DEP_CPP_MOD_S=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.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\httpd.h"\ - "..\..\include\scoreboard.h"\ - "..\..\include\util_script.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" +"$(INTDIR)\mod_status.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_unique_id.dep b/src/os/win32/mod_unique_id.dep new file mode 100644 index 00000000000..a91486c541a --- /dev/null +++ b/src/os/win32/mod_unique_id.dep @@ -0,0 +1,19 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_unique_id.mak + +..\..\modules\standard\mod_unique_id.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_log.h"\ + "..\..\include\httpd.h"\ + "..\..\include\multithread.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_unique_id.mak b/src/os/win32/mod_unique_id.mak index f8eb3f59f10..aebfa36f09d 100644 --- a/src/os/win32/mod_unique_id.mak +++ b/src/os/win32/mod_unique_id.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_unique_id.dsp !IF "$(CFG)" == "" CFG=mod_unique_id - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_unique_id - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_unique_id - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_unique_id - Win32 Release" && "$(CFG)" !=\ - "mod_unique_id - Win32 Debug" +!IF "$(CFG)" != "mod_unique_id - Win32 Release" && "$(CFG)" != "mod_unique_id - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_unique_id - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_unique_id - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_unique_id - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_unique_id - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_unique_id - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_unique_id.idb" -@erase "$(INTDIR)\mod_unique_id.obj" + -@erase "$(INTDIR)\mod_unique_id_src.idb" + -@erase "$(INTDIR)\mod_unique_id_src.pdb" -@erase "$(OUTDIR)\mod_unique_id.exp" -@erase "$(OUTDIR)\mod_unique_id.lib" - -@erase "$(OUTDIR)\mod_unique_id.map" + -@erase "$(OUTDIR)\mod_unique_id.pdb" -@erase "$(OUTDIR)\mod_unique_id.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_unique_id" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_unique_id_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,11 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_unique_id.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb"\ - /map:"$(INTDIR)\mod_unique_id.map" /machine:I386\ - /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib"\ - /base:@"BaseAddr.ref",mod_unique_id +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib" /base:@"BaseAddr.ref",mod_unique_id /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_unique_id.obj" \ "..\..\Release\ApacheCore.lib" @@ -144,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_unique_id.idb" -@erase "$(INTDIR)\mod_unique_id.obj" + -@erase "$(INTDIR)\mod_unique_id_src.idb" + -@erase "$(INTDIR)\mod_unique_id_src.pdb" -@erase "$(OUTDIR)\mod_unique_id.exp" -@erase "$(OUTDIR)\mod_unique_id.lib" - -@erase "$(OUTDIR)\mod_unique_id.map" -@erase "$(OUTDIR)\mod_unique_id.pdb" -@erase "$(OUTDIR)\mod_unique_id.so" @@ -156,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_unique_id" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_unique_id_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -200,11 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_unique_id.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb"\ - /map:"$(INTDIR)\mod_unique_id.map" /debug /machine:I386\ - /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib"\ - /base:@"BaseAddr.ref",mod_unique_id +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_unique_id.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_unique_id.so" /implib:"$(OUTDIR)\mod_unique_id.lib" /base:@"BaseAddr.ref",mod_unique_id LINK32_OBJS= \ "$(INTDIR)\mod_unique_id.obj" \ "..\..\Debug\ApacheCore.lib" @@ -217,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_unique_id - Win32 Release" || "$(CFG)" ==\ - "mod_unique_id - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_unique_id.dep") +!INCLUDE "mod_unique_id.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_unique_id.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_unique_id - Win32 Release" || "$(CFG)" == "mod_unique_id - Win32 Debug" !IF "$(CFG)" == "mod_unique_id - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_unique_id - Win32 Debug" @@ -243,36 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_unique_id.c -DEP_CPP_MOD_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_log.h"\ - "..\..\include\httpd.h"\ - "..\..\include\multithread.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_unique_id.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" +"$(INTDIR)\mod_unique_id.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_usertrack.dep b/src/os/win32/mod_usertrack.dep new file mode 100644 index 00000000000..43d6aeeb701 --- /dev/null +++ b/src/os/win32/mod_usertrack.dep @@ -0,0 +1,18 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_usertrack.mak + +..\..\modules\standard\mod_usertrack.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_usertrack.mak b/src/os/win32/mod_usertrack.mak index 27558cd1db1..9479f6aca05 100644 --- a/src/os/win32/mod_usertrack.mak +++ b/src/os/win32/mod_usertrack.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_usertrack.dsp !IF "$(CFG)" == "" CFG=mod_usertrack - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_usertrack - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_usertrack - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_usertrack - Win32 Release" && "$(CFG)" !=\ - "mod_usertrack - Win32 Debug" +!IF "$(CFG)" != "mod_usertrack - Win32 Release" && "$(CFG)" != "mod_usertrack - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_usertrack - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_usertrack - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_usertrack - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_usertrack - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_usertrack - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_usertrack.idb" -@erase "$(INTDIR)\mod_usertrack.obj" + -@erase "$(INTDIR)\mod_usertrack_src.idb" + -@erase "$(INTDIR)\mod_usertrack_src.pdb" -@erase "$(OUTDIR)\mod_usertrack.exp" -@erase "$(OUTDIR)\mod_usertrack.lib" - -@erase "$(OUTDIR)\mod_usertrack.map" + -@erase "$(OUTDIR)\mod_usertrack.pdb" -@erase "$(OUTDIR)\mod_usertrack.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_usertrack" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_usertrack.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so" /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_usertrack.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_usertrack.idb" -@erase "$(INTDIR)\mod_usertrack.obj" + -@erase "$(INTDIR)\mod_usertrack_src.idb" + -@erase "$(INTDIR)\mod_usertrack_src.pdb" -@erase "$(OUTDIR)\mod_usertrack.exp" -@erase "$(OUTDIR)\mod_usertrack.lib" - -@erase "$(OUTDIR)\mod_usertrack.map" -@erase "$(OUTDIR)\mod_usertrack.pdb" -@erase "$(OUTDIR)\mod_usertrack.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_usertrack" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_usertrack.pdb" /map:"$(INTDIR)\mod_usertrack.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so"\ - /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_usertrack.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_usertrack.so" /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@"BaseAddr.ref",mod_usertrack LINK32_OBJS= \ "$(INTDIR)\mod_usertrack.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_usertrack - Win32 Release" || "$(CFG)" ==\ - "mod_usertrack - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_usertrack.dep") +!INCLUDE "mod_usertrack.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_usertrack.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_usertrack - Win32 Release" || "$(CFG)" == "mod_usertrack - Win32 Debug" !IF "$(CFG)" == "mod_usertrack - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_usertrack - Win32 Debug" @@ -241,35 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_usertrack.c -DEP_CPP_MOD_U=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_U=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" +"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/os/win32/mod_vhost_alias.dep b/src/os/win32/mod_vhost_alias.dep new file mode 100644 index 00000000000..e4c3465afc1 --- /dev/null +++ b/src/os/win32/mod_vhost_alias.dep @@ -0,0 +1,18 @@ +# Microsoft Developer Studio Generated Dependency File, included by mod_vhost_alias.mak + +..\..\modules\standard\mod_vhost_alias.c : \ + "..\..\include\ap.h"\ + "..\..\include\ap_alloc.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_ebcdic.h"\ + "..\..\include\ap_mmn.h"\ + "..\..\include\buff.h"\ + "..\..\include\hsregex.h"\ + "..\..\include\http_config.h"\ + "..\..\include\http_core.h"\ + "..\..\include\httpd.h"\ + "..\..\include\util_uri.h"\ + ".\os.h"\ + ".\readdir.h"\ + diff --git a/src/os/win32/mod_vhost_alias.mak b/src/os/win32/mod_vhost_alias.mak index 73f6cd63349..c6b47f55d7e 100644 --- a/src/os/win32/mod_vhost_alias.mak +++ b/src/os/win32/mod_vhost_alias.mak @@ -1,12 +1,10 @@ # Microsoft Developer Studio Generated NMAKE File, Based on mod_vhost_alias.dsp !IF "$(CFG)" == "" CFG=mod_vhost_alias - Win32 Release -!MESSAGE No configuration specified. Defaulting to mod_vhost_alias - Win32\ - Release. +!MESSAGE No configuration specified. Defaulting to mod_vhost_alias - Win32 Release. !ENDIF -!IF "$(CFG)" != "mod_vhost_alias - Win32 Release" && "$(CFG)" !=\ - "mod_vhost_alias - Win32 Debug" +!IF "$(CFG)" != "mod_vhost_alias - Win32 Release" && "$(CFG)" != "mod_vhost_alias - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -15,10 +13,8 @@ CFG=mod_vhost_alias - Win32 Release !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_vhost_alias - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_vhost_alias - Win32 Debug" (based on\ - "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_vhost_alias - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_vhost_alias - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -52,49 +48,46 @@ CLEAN :"ApacheCore - Win32 ReleaseCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_vhost_alias.idb" -@erase "$(INTDIR)\mod_vhost_alias.obj" + -@erase "$(INTDIR)\mod_vhost_alias_src.idb" + -@erase "$(INTDIR)\mod_vhost_alias_src.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.exp" -@erase "$(OUTDIR)\mod_vhost_alias.lib" - -@erase "$(OUTDIR)\mod_vhost_alias.map" + -@erase "$(OUTDIR)\mod_vhost_alias.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.so" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\ - /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_vhost_alias" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_vhost_alias_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -107,10 +100,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_vhost_alias.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /map:"$(INTDIR)\mod_vhost_alias.map"\ - /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so"\ - /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so" /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias /opt:ref LINK32_OBJS= \ "$(INTDIR)\mod_vhost_alias.obj" \ "..\..\Release\ApacheCore.lib" @@ -143,11 +133,11 @@ CLEAN :"ApacheCore - Win32 DebugCLEAN" !ELSE CLEAN : !ENDIF - -@erase "$(INTDIR)\mod_vhost_alias.idb" -@erase "$(INTDIR)\mod_vhost_alias.obj" + -@erase "$(INTDIR)\mod_vhost_alias_src.idb" + -@erase "$(INTDIR)\mod_vhost_alias_src.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.exp" -@erase "$(OUTDIR)\mod_vhost_alias.lib" - -@erase "$(OUTDIR)\mod_vhost_alias.map" -@erase "$(OUTDIR)\mod_vhost_alias.pdb" -@erase "$(OUTDIR)\mod_vhost_alias.so" @@ -155,38 +145,34 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\mod_vhost_alias" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_vhost_alias_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -199,10 +185,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_vhost_alias.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /map:"$(INTDIR)\mod_vhost_alias.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so"\ - /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_vhost_alias.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_vhost_alias.so" /implib:"$(OUTDIR)\mod_vhost_alias.lib" /base:@"BaseAddr.ref",mod_vhost_alias LINK32_OBJS= \ "$(INTDIR)\mod_vhost_alias.obj" \ "..\..\Debug\ApacheCore.lib" @@ -215,21 +198,27 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "mod_vhost_alias - Win32 Release" || "$(CFG)" ==\ - "mod_vhost_alias - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("mod_vhost_alias.dep") +!INCLUDE "mod_vhost_alias.dep" +!ELSE +!MESSAGE Warning: cannot find "mod_vhost_alias.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "mod_vhost_alias - Win32 Release" || "$(CFG)" == "mod_vhost_alias - Win32 Debug" !IF "$(CFG)" == "mod_vhost_alias - Win32 Release" "ApacheCore - Win32 Release" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\ - + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" cd ".\os\win32" "ApacheCore - Win32 ReleaseCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Release" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release" RECURSE=1 CLEAN cd ".\os\win32" !ELSEIF "$(CFG)" == "mod_vhost_alias - Win32 Debug" @@ -241,35 +230,14 @@ LINK32_OBJS= \ "ApacheCore - Win32 DebugCLEAN" : cd "..\../..\src" - $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\ - CFG="ApacheCore - Win32 Debug" RECURSE=1 + $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" RECURSE=1 CLEAN cd ".\os\win32" !ENDIF SOURCE=..\..\modules\standard\mod_vhost_alias.c -DEP_CPP_MOD_V=\ - "..\..\include\ap.h"\ - "..\..\include\ap_alloc.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ - "..\..\include\ap_ebcdic.h"\ - "..\..\include\ap_mmn.h"\ - "..\..\include\buff.h"\ - "..\..\include\hsregex.h"\ - "..\..\include\http_config.h"\ - "..\..\include\http_core.h"\ - "..\..\include\httpd.h"\ - "..\..\include\util_uri.h"\ - ".\os.h"\ - ".\readdir.h"\ - -NODEP_CPP_MOD_V=\ - "..\..\include\ap_config_auto.h"\ - "..\..\include\sfio.h"\ - -"$(INTDIR)\mod_vhost_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_V) "$(INTDIR)" +"$(INTDIR)\mod_vhost_alias.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/src/regex/regex.dep b/src/regex/regex.dep new file mode 100644 index 00000000000..44b3604f9f5 --- /dev/null +++ b/src/regex/regex.dep @@ -0,0 +1,32 @@ +# Microsoft Developer Studio Generated Dependency File, included by regex.mak + +.\regcomp.c : \ + "..\include\ap_ctype.h"\ + "..\include\hsregex.h"\ + ".\cclass.h"\ + ".\cname.h"\ + ".\regcomp.ih"\ + ".\regex2.h"\ + ".\utils.h"\ + + +.\regerror.c : \ + "..\include\hsregex.h"\ + ".\regerror.ih"\ + ".\utils.h"\ + + +.\regexec.c : \ + "..\include\ap_ctype.h"\ + "..\include\hsregex.h"\ + ".\engine.c"\ + ".\engine.ih"\ + ".\regex2.h"\ + ".\utils.h"\ + + +.\regfree.c : \ + "..\include\hsregex.h"\ + ".\regex2.h"\ + ".\utils.h"\ + diff --git a/src/regex/regex.mak b/src/regex/regex.mak index a74e3e175f9..1bcf00da117 100644 --- a/src/regex/regex.mak +++ b/src/regex/regex.mak @@ -33,20 +33,14 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\regex.lib" -!ELSE - -ALL : "$(OUTDIR)\regex.lib" - -!ENDIF CLEAN : -@erase "$(INTDIR)\regcomp.obj" -@erase "$(INTDIR)\regerror.obj" -@erase "$(INTDIR)\regex.idb" + -@erase "$(INTDIR)\regex.pdb" -@erase "$(INTDIR)\regexec.obj" -@erase "$(INTDIR)\regfree.obj" -@erase "$(OUTDIR)\regex.lib" @@ -54,43 +48,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\ - "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c -CPP_OBJS=.\LibR/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc" BSC32_SBRS= \ @@ -116,15 +107,8 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\regex.lib" - -!ELSE - ALL : "$(OUTDIR)\regex.lib" -!ENDIF CLEAN : -@erase "$(INTDIR)\regcomp.obj" @@ -138,43 +122,40 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -RSC=rc.exe CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D\ - "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c -CPP_OBJS=.\LibD/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << +RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc" BSC32_SBRS= \ @@ -195,52 +176,34 @@ LIB32_OBJS= \ !ENDIF +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("regex.dep") +!INCLUDE "regex.dep" +!ELSE +!MESSAGE Warning: cannot find "regex.dep" +!ENDIF +!ENDIF + + !IF "$(CFG)" == "regex - Win32 Release" || "$(CFG)" == "regex - Win32 Debug" SOURCE=.\regcomp.c -DEP_CPP_REGCO=\ - "..\include\ap_ctype.h"\ - "..\include\hsregex.h"\ - ".\cclass.h"\ - ".\cname.h"\ - ".\regcomp.ih"\ - ".\regex2.h"\ - ".\utils.h"\ - -"$(INTDIR)\regcomp.obj" : $(SOURCE) $(DEP_CPP_REGCO) "$(INTDIR)" +"$(INTDIR)\regcomp.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\regerror.c -DEP_CPP_REGER=\ - "..\include\hsregex.h"\ - ".\regerror.ih"\ - ".\utils.h"\ - -"$(INTDIR)\regerror.obj" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)" +"$(INTDIR)\regerror.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\regexec.c -DEP_CPP_REGEX=\ - "..\include\ap_ctype.h"\ - "..\include\hsregex.h"\ - ".\engine.c"\ - ".\engine.ih"\ - ".\regex2.h"\ - ".\utils.h"\ - -"$(INTDIR)\regexec.obj" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)" +"$(INTDIR)\regexec.obj" : $(SOURCE) "$(INTDIR)" SOURCE=.\regfree.c -DEP_CPP_REGFR=\ - "..\include\hsregex.h"\ - ".\regex2.h"\ - ".\utils.h"\ - -"$(INTDIR)\regfree.obj" : $(SOURCE) $(DEP_CPP_REGFR) "$(INTDIR)" +"$(INTDIR)\regfree.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/support/htdigest.dep b/src/support/htdigest.dep new file mode 100644 index 00000000000..3c43702206c --- /dev/null +++ b/src/support/htdigest.dep @@ -0,0 +1,46 @@ +# Microsoft Developer Studio Generated Dependency File, included by htdigest.mak + +..\ap\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\ap\ap_getpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_md5c.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +.\htdigest.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + diff --git a/src/support/htdigest.mak b/src/support/htdigest.mak index 1742062da1e..6c39aa40782 100644 --- a/src/support/htdigest.mak +++ b/src/support/htdigest.mak @@ -4,8 +4,7 @@ CFG=htdigest - Win32 Debug !MESSAGE No configuration specified. Defaulting to htdigest - Win32 Debug. !ENDIF -!IF "$(CFG)" != "htdigest - Win32 Release" && "$(CFG)" !=\ - "htdigest - Win32 Debug" +!IF "$(CFG)" != "htdigest - Win32 Release" && "$(CFG)" != "htdigest - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,8 +13,7 @@ CFG=htdigest - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "htdigest - Win32 Release" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "htdigest - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "htdigest - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. @@ -35,61 +33,51 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\htdigest.exe" -!ELSE - -ALL : "$(OUTDIR)\htdigest.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\ap_cpystrn.obj" -@erase "$(INTDIR)\ap_getpass.obj" -@erase "$(INTDIR)\ap_md5c.obj" - -@erase "$(INTDIR)\htdigest.idb" -@erase "$(INTDIR)\htdigest.obj" + -@erase "$(INTDIR)\htdigest_src.idb" + -@erase "$(INTDIR)\htdigest_src.pdb" -@erase "$(OUTDIR)\htdigest.exe" - -@erase "$(OUTDIR)\htdigest.map" + -@erase "$(OUTDIR)\htdigest.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ - "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest" /FD\ - /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -100,9 +88,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /machine:I386\ - /out:"$(OUTDIR)\htdigest.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htdigest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\htdigest.exe" /opt:ref LINK32_OBJS= \ "$(INTDIR)\ap_cpystrn.obj" \ "$(INTDIR)\ap_getpass.obj" \ @@ -122,62 +108,51 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\htdigest.exe" - -!ELSE - ALL : "$(OUTDIR)\htdigest.exe" -!ENDIF CLEAN : -@erase "$(INTDIR)\ap_cpystrn.obj" -@erase "$(INTDIR)\ap_getpass.obj" -@erase "$(INTDIR)\ap_md5c.obj" - -@erase "$(INTDIR)\htdigest.idb" -@erase "$(INTDIR)\htdigest.obj" + -@erase "$(INTDIR)\htdigest_src.idb" + -@erase "$(INTDIR)\htdigest_src.pdb" -@erase "$(OUTDIR)\htdigest.exe" - -@erase "$(OUTDIR)\htdigest.map" -@erase "$(OUTDIR)\htdigest.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ - "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\htdigest" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -188,9 +163,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=/nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\htdigest.exe" +LINK32_FLAGS=/nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htdigest.pdb" /debug /machine:I386 /out:"$(OUTDIR)\htdigest.exe" LINK32_OBJS= \ "$(INTDIR)\ap_cpystrn.obj" \ "$(INTDIR)\ap_getpass.obj" \ @@ -205,83 +178,37 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" ==\ - "htdigest - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("htdigest.dep") +!INCLUDE "htdigest.dep" +!ELSE +!MESSAGE Warning: cannot find "htdigest.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" == "htdigest - Win32 Debug" SOURCE=..\ap\ap_cpystrn.c -DEP_CPP_AP_CP=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_CP=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)" +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_getpass.c -DEP_CPP_AP_GE=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_GE=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)" +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_md5c.c -DEP_CPP_AP_MD=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_MD=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)" +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\htdigest.c -DEP_CPP_HTDIG=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_HTDIG=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)" +"$(INTDIR)\htdigest.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/support/htpasswd.dep b/src/support/htpasswd.dep new file mode 100644 index 00000000000..6cae9958c12 --- /dev/null +++ b/src/support/htpasswd.dep @@ -0,0 +1,95 @@ +# Microsoft Developer Studio Generated Dependency File, included by htpasswd.mak + +..\ap\ap_base64.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_checkpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\ap\ap_getpass.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_md5c.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_sha1.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + + +..\ap\ap_snprintf.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +.\htpasswd.c : \ + "..\include\ap.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_md5.h"\ + "..\include\ap_mmn.h"\ + "..\include\ap_sha1.h"\ + "..\include\hsregex.h"\ + "..\os\win32\getopt.h"\ + "..\os\win32\os.h"\ + diff --git a/src/support/htpasswd.mak b/src/support/htpasswd.mak index bd63e86a521..9874573b76c 100644 --- a/src/support/htpasswd.mak +++ b/src/support/htpasswd.mak @@ -4,8 +4,7 @@ CFG=htpasswd - Win32 Debug !MESSAGE No configuration specified. Defaulting to htpasswd - Win32 Debug. !ENDIF -!IF "$(CFG)" != "htpasswd - Win32 Release" && "$(CFG)" !=\ - "htpasswd - Win32 Debug" +!IF "$(CFG)" != "htpasswd - Win32 Release" && "$(CFG)" != "htpasswd - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,8 +13,7 @@ CFG=htpasswd - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "htpasswd - Win32 Release" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "htpasswd - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "htpasswd - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. @@ -35,15 +33,8 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\htpasswd.exe" -!ELSE - -ALL : "$(OUTDIR)\htpasswd.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\ap_base64.obj" @@ -53,47 +44,44 @@ CLEAN : -@erase "$(INTDIR)\ap_md5c.obj" -@erase "$(INTDIR)\ap_sha1.obj" -@erase "$(INTDIR)\ap_snprintf.obj" - -@erase "$(INTDIR)\htpasswd.idb" -@erase "$(INTDIR)\htpasswd.obj" + -@erase "$(INTDIR)\htpasswd_src.idb" + -@erase "$(INTDIR)\htpasswd_src.pdb" -@erase "$(OUTDIR)\htpasswd.exe" - -@erase "$(OUTDIR)\htpasswd.map" + -@erase "$(OUTDIR)\htpasswd.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\htpasswd" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -104,9 +92,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /machine:I386\ - /out:"$(OUTDIR)\htpasswd.exe" +LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" /opt:ref LINK32_OBJS= \ "$(INTDIR)\ap_base64.obj" \ "$(INTDIR)\ap_checkpass.obj" \ @@ -130,15 +116,8 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\htpasswd.exe" -!ELSE - -ALL : "$(OUTDIR)\htpasswd.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\ap_base64.obj" @@ -148,48 +127,44 @@ CLEAN : -@erase "$(INTDIR)\ap_md5c.obj" -@erase "$(INTDIR)\ap_sha1.obj" -@erase "$(INTDIR)\ap_snprintf.obj" - -@erase "$(INTDIR)\htpasswd.idb" -@erase "$(INTDIR)\htpasswd.obj" + -@erase "$(INTDIR)\htpasswd_src.idb" + -@erase "$(INTDIR)\htpasswd_src.pdb" -@erase "$(OUTDIR)\htpasswd.exe" - -@erase "$(OUTDIR)\htpasswd.map" -@erase "$(OUTDIR)\htpasswd.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -200,9 +175,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" +LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\ap_base64.obj" \ "$(INTDIR)\ap_checkpass.obj" \ @@ -221,165 +194,61 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\ - "htpasswd - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("htpasswd.dep") +!INCLUDE "htpasswd.dep" +!ELSE +!MESSAGE Warning: cannot find "htpasswd.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" == "htpasswd - Win32 Debug" SOURCE=..\ap\ap_base64.c -DEP_CPP_AP_BA=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_BA=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)" +"$(INTDIR)\ap_base64.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_checkpass.c -DEP_CPP_AP_CH=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\ap_sha1.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_CH=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)" +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_cpystrn.c -DEP_CPP_AP_CP=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_CP=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)" +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_getpass.c -DEP_CPP_AP_GE=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_GE=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)" +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_md5c.c -DEP_CPP_AP_MD=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_MD=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)" +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_sha1.c -DEP_CPP_AP_SH=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\ap_sha1.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_AP_SH=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)" +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_snprintf.c -DEP_CPP_AP_SN=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_SN=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\htpasswd.c -DEP_CPP_HTPAS=\ - "..\include\ap.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_md5.h"\ - "..\include\ap_mmn.h"\ - "..\include\ap_sha1.h"\ - "..\include\hsregex.h"\ - "..\os\win32\getopt.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_HTPAS=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)" +"$(INTDIR)\htpasswd.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/support/logresolve.dep b/src/support/logresolve.dep new file mode 100644 index 00000000000..0480fc716d8 --- /dev/null +++ b/src/support/logresolve.dep @@ -0,0 +1,9 @@ +# Microsoft Developer Studio Generated Dependency File, included by logresolve.mak + +.\logresolve.c : \ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + diff --git a/src/support/logresolve.mak b/src/support/logresolve.mak index a427fa9877c..83a6a2f3b1d 100644 --- a/src/support/logresolve.mak +++ b/src/support/logresolve.mak @@ -4,8 +4,7 @@ CFG=logresolve - Win32 Debug !MESSAGE No configuration specified. Defaulting to logresolve - Win32 Debug. !ENDIF -!IF "$(CFG)" != "logresolve - Win32 Release" && "$(CFG)" !=\ - "logresolve - Win32 Debug" +!IF "$(CFG)" != "logresolve - Win32 Release" && "$(CFG)" != "logresolve - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=logresolve - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "logresolve - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "logresolve - Win32 Debug" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "logresolve - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "logresolve - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -36,58 +33,48 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\logresolve.exe" - -!ELSE - ALL : "$(OUTDIR)\logresolve.exe" -!ENDIF CLEAN : - -@erase "$(INTDIR)\logresolve.idb" -@erase "$(INTDIR)\logresolve.obj" + -@erase "$(INTDIR)\logresolve_src.idb" + -@erase "$(INTDIR)\logresolve_src.pdb" -@erase "$(OUTDIR)\logresolve.exe" - -@erase "$(OUTDIR)\logresolve.map" + -@erase "$(OUTDIR)\logresolve.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D\ - "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\logresolve" /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\logresolve_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -98,9 +85,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\logresolve.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map" /machine:I386\ - /out:"$(OUTDIR)\logresolve.exe" +LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb" /debug /machine:I386 /out:"$(OUTDIR)\logresolve.exe" /opt:ref LINK32_OBJS= \ "$(INTDIR)\logresolve.obj" @@ -117,59 +102,48 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\logresolve.exe" - -!ELSE - ALL : "$(OUTDIR)\logresolve.exe" -!ENDIF CLEAN : - -@erase "$(INTDIR)\logresolve.idb" -@erase "$(INTDIR)\logresolve.obj" + -@erase "$(INTDIR)\logresolve_src.idb" + -@erase "$(INTDIR)\logresolve_src.pdb" -@erase "$(OUTDIR)\logresolve.exe" - -@erase "$(OUTDIR)\logresolve.map" -@erase "$(OUTDIR)\logresolve.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ - "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\logresolve" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\logresolve_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -180,9 +154,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\logresolve.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no\ - /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map" /debug\ - /machine:I386 /out:"$(OUTDIR)\logresolve.exe" +LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb" /debug /machine:I386 /out:"$(OUTDIR)\logresolve.exe" LINK32_OBJS= \ "$(INTDIR)\logresolve.obj" @@ -194,21 +166,19 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "logresolve - Win32 Release" || "$(CFG)" ==\ - "logresolve - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("logresolve.dep") +!INCLUDE "logresolve.dep" +!ELSE +!MESSAGE Warning: cannot find "logresolve.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "logresolve - Win32 Release" || "$(CFG)" == "logresolve - Win32 Debug" SOURCE=.\logresolve.c -DEP_CPP_LOGRE=\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_LOGRE=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)" +"$(INTDIR)\logresolve.obj" : $(SOURCE) "$(INTDIR)" diff --git a/src/support/rotatelogs.dep b/src/support/rotatelogs.dep new file mode 100644 index 00000000000..f3b04c0656e --- /dev/null +++ b/src/support/rotatelogs.dep @@ -0,0 +1,43 @@ +# Microsoft Developer Studio Generated Dependency File, included by rotatelogs.mak + +..\ap\ap_cpystrn.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\ap\ap_snprintf.c : \ + "..\include\ap.h"\ + "..\include\ap_alloc.h"\ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_ebcdic.h"\ + "..\include\ap_mmn.h"\ + "..\include\buff.h"\ + "..\include\hsregex.h"\ + "..\include\httpd.h"\ + "..\include\util_uri.h"\ + "..\os\win32\os.h"\ + "..\os\win32\readdir.h"\ + + +..\os\win32\os.c : \ + "..\os\win32\os.h"\ + + +.\rotatelogs.c : \ + "..\include\ap_config.h"\ + "..\include\ap_ctype.h"\ + "..\include\ap_mmn.h"\ + "..\include\hsregex.h"\ + "..\os\win32\os.h"\ + diff --git a/src/support/rotatelogs.mak b/src/support/rotatelogs.mak index 723b04b0d15..230d461157c 100644 --- a/src/support/rotatelogs.mak +++ b/src/support/rotatelogs.mak @@ -4,8 +4,7 @@ CFG=rotatelogs - Win32 Debug !MESSAGE No configuration specified. Defaulting to rotatelogs - Win32 Debug. !ENDIF -!IF "$(CFG)" != "rotatelogs - Win32 Release" && "$(CFG)" !=\ - "rotatelogs - Win32 Debug" +!IF "$(CFG)" != "rotatelogs - Win32 Release" && "$(CFG)" != "rotatelogs - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: @@ -14,10 +13,8 @@ CFG=rotatelogs - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "rotatelogs - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "rotatelogs - Win32 Debug" (based on\ - "Win32 (x86) Console Application") +!MESSAGE "rotatelogs - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "rotatelogs - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF @@ -36,61 +33,51 @@ INTDIR=.\Release OutDir=.\Release # End Custom Macros -!IF "$(RECURSE)" == "0" - ALL : "$(OUTDIR)\rotatelogs.exe" -!ELSE - -ALL : "$(OUTDIR)\rotatelogs.exe" - -!ENDIF CLEAN : -@erase "$(INTDIR)\ap_cpystrn.obj" -@erase "$(INTDIR)\ap_snprintf.obj" -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\rotatelogs.idb" -@erase "$(INTDIR)\rotatelogs.obj" + -@erase "$(INTDIR)\rotatelogs_src.idb" + -@erase "$(INTDIR)\rotatelogs_src.pdb" -@erase "$(OUTDIR)\rotatelogs.exe" - -@erase "$(OUTDIR)\rotatelogs.map" + -@erase "$(OUTDIR)\rotatelogs.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\ - "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs"\ - /FD /c -CPP_OBJS=.\Release/ -CPP_SBRS=. +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -101,9 +88,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\ - /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\ - /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" /opt:ref LINK32_OBJS= \ "$(INTDIR)\ap_cpystrn.obj" \ "$(INTDIR)\ap_snprintf.obj" \ @@ -123,62 +108,51 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -!IF "$(RECURSE)" == "0" - -ALL : "$(OUTDIR)\rotatelogs.exe" - -!ELSE - ALL : "$(OUTDIR)\rotatelogs.exe" -!ENDIF CLEAN : -@erase "$(INTDIR)\ap_cpystrn.obj" -@erase "$(INTDIR)\ap_snprintf.obj" -@erase "$(INTDIR)\os.obj" - -@erase "$(INTDIR)\rotatelogs.idb" -@erase "$(INTDIR)\rotatelogs.obj" + -@erase "$(INTDIR)\rotatelogs_src.idb" + -@erase "$(INTDIR)\rotatelogs_src.pdb" -@erase "$(OUTDIR)\rotatelogs.exe" - -@erase "$(OUTDIR)\rotatelogs.map" -@erase "$(OUTDIR)\rotatelogs.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\ - "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\rotatelogs" /FD /c -CPP_OBJS=.\Debug/ -CPP_SBRS=. +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs_src" /FD /c -.c{$(CPP_OBJS)}.obj:: +.c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_OBJS)}.obj:: +.cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_OBJS)}.obj:: +.cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << -.c{$(CPP_SBRS)}.sbr:: +.c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cpp{$(CPP_SBRS)}.sbr:: +.cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << -.cxx{$(CPP_SBRS)}.sbr:: +.cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << @@ -189,9 +163,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\ - /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\ - /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" +LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" LINK32_OBJS= \ "$(INTDIR)\ap_cpystrn.obj" \ "$(INTDIR)\ap_snprintf.obj" \ @@ -206,78 +178,37 @@ LINK32_OBJS= \ !ENDIF -!IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\ - "rotatelogs - Win32 Debug" +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("rotatelogs.dep") +!INCLUDE "rotatelogs.dep" +!ELSE +!MESSAGE Warning: cannot find "rotatelogs.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" == "rotatelogs - Win32 Debug" SOURCE=..\ap\ap_cpystrn.c -DEP_CPP_AP_CP=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_CP=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)" +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\ap\ap_snprintf.c -DEP_CPP_AP_SN=\ - "..\include\ap.h"\ - "..\include\ap_alloc.h"\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_ebcdic.h"\ - "..\include\ap_mmn.h"\ - "..\include\buff.h"\ - "..\include\hsregex.h"\ - "..\include\httpd.h"\ - "..\include\util_uri.h"\ - "..\os\win32\os.h"\ - "..\os\win32\readdir.h"\ - -NODEP_CPP_AP_SN=\ - "..\include\ap_config_auto.h"\ - "..\include\sfio.h"\ - -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=..\os\win32\os.c -DEP_CPP_OS_C4=\ - "..\os\win32\os.h"\ - -"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C4) "$(INTDIR)" +"$(INTDIR)\os.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) SOURCE=.\rotatelogs.c -DEP_CPP_ROTAT=\ - "..\include\ap_config.h"\ - "..\include\ap_ctype.h"\ - "..\include\ap_mmn.h"\ - "..\include\hsregex.h"\ - "..\os\win32\os.h"\ - -NODEP_CPP_ROTAT=\ - "..\include\ap_config_auto.h"\ - -"$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)" +"$(INTDIR)\rotatelogs.obj" : $(SOURCE) "$(INTDIR)"