ben 97/12/27 07:07:18
Modified: src ApacheCore.mak Log: Switch on debugging info for release builds (note that it is switched off for the final link, so it should not affect DLL size - switch it on again to use it). Revision Changes Path 1.23 +65 -81 apachen/src/ApacheCore.mak Index: ApacheCore.mak =================================================================== RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ApacheCore.mak 1997/12/24 12:37:07 1.22 +++ ApacheCore.mak 1997/12/27 15:07:17 1.23 @@ -28,6 +28,10 @@ NULL=nul !ENDIF +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + !IF "$(CFG)" == "ApacheCore - Win32 Release" OUTDIR=.\CoreR @@ -92,6 +96,7 @@ [EMAIL PROTECTED] "$(INTDIR)\util_script.obj" [EMAIL PROTECTED] "$(INTDIR)\util_win32.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" + [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.lib" @@ -99,46 +104,12 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\ +CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\CoreR/ CPP_SBRS=. - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ @@ -321,46 +292,12 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D "WIN32"\ /D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\CoreD/ CPP_SBRS=.\CoreD/ - -.c{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_OBJS)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(CPP_SBRS)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ @@ -475,6 +412,36 @@ !ENDIF +.c{$(CPP_OBJS)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(CPP_OBJS)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(CPP_OBJS)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(CPP_SBRS)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(CPP_SBRS)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(CPP_SBRS)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\ "ApacheCore - Win32 Debug" @@ -527,11 +494,6 @@ ".\main\conf.h"\ ".\os\win32\os.h"\ ".\regex\regex.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_AP_SN=\ - ".\main\os.h"\ "$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" @@ -540,8 +502,14 @@ !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_AP_SN=\ + ".\main\conf.h"\ + ".\os\win32\os.h"\ + ".\regex\regex.h"\ + -"$(INTDIR)\ap_snprintf.obj" "$(INTDIR)\ap_snprintf.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\ap_snprintf.obj" "$(INTDIR)\ap_snprintf.sbr" : $(SOURCE)\ + $(DEP_CPP_AP_SN) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -2090,6 +2058,9 @@ !ENDIF SOURCE=.\os\win32\service.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_SERVI=\ ".\main\conf.h"\ ".\main\multithread.h"\ @@ -2098,15 +2069,19 @@ ".\regex\regex.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_SERVI=\ + ".\main\conf.h"\ + ".\main\multithread.h"\ + ".\os\win32\os.h"\ + ".\os\win32\service.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\service.obj" "$(INTDIR)\service.sbr" : $(SOURCE) $(DEP_CPP_SERVI)\ "$(INTDIR)" @@ -2284,6 +2259,9 @@ !ENDIF SOURCE=.\os\win32\util_win32.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_UTIL_W=\ ".\main\alloc.h"\ ".\main\buff.h"\ @@ -2294,15 +2272,21 @@ ".\regex\regex.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_UTIL_W=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\util_win32.obj" "$(INTDIR)\util_win32.sbr" : $(SOURCE)\ $(DEP_CPP_UTIL_W) "$(INTDIR)"