marc 98/01/23 20:07:24
Modified: src ApacheCore.dsp ApacheCore.mak src/modules/proxy ApacheModuleProxy.dsp ApacheModuleProxy.mak src/os/win32 ApacheModuleAuthAnon.dsp ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp ApacheModuleDigest.mak ApacheModuleExpires.dsp ApacheModuleExpires.mak ApacheModuleHeaders.dsp ApacheModuleHeaders.mak ApacheModuleInfo.dsp ApacheModuleInfo.mak ApacheModuleRewrite.dsp ApacheModuleRewrite.mak ApacheModuleSpeling.dsp ApacheModuleSpeling.mak ApacheModuleStatus.dsp ApacheModuleStatus.mak ApacheModuleUserTrack.dsp ApacheModuleUserTrack.mak Log: Update Win32 build to add new ap directory to includes. Revision Changes Path 1.17 +2 -2 apachen/src/ApacheCore.dsp Index: ApacheCore.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ApacheCore.dsp 1998/01/04 13:06:09 1.16 +++ ApacheCore.dsp 1998/01/24 04:07:07 1.17 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /I ".\ap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /I ".\ap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.27 +770 -156 apachen/src/ApacheCore.mak Index: ApacheCore.mak =================================================================== RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ApacheCore.mak 1998/01/04 13:06:09 1.26 +++ ApacheCore.mak 1998/01/24 04:07:08 1.27 @@ -28,10 +28,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheCore - Win32 Release" OUTDIR=.\CoreR @@ -102,12 +98,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /I ".\ap" /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= \ @@ -288,12 +318,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -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=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /I ".\ap" /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= \ @@ -407,41 +471,12 @@ !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" SOURCE=.\main\alloc.c DEP_CPP_ALLOC=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -455,6 +490,7 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_ALLOC=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ @@ -477,7 +513,11 @@ !ENDIF SOURCE=.\main\buff.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_BUFF_=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -491,19 +531,28 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_BUFF_=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_BUFF_=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\buff.obj" "$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_)\ "$(INTDIR)" @@ -529,7 +578,11 @@ !ENDIF SOURCE=.\main\explain.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_EXPLA=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -542,19 +595,27 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_EXPLA=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\explain.obj" : $(SOURCE) $(DEP_CPP_EXPLA) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_EXPLA=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\explain.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\explain.obj" "$(INTDIR)\explain.sbr" : $(SOURCE) $(DEP_CPP_EXPLA)\ "$(INTDIR)" @@ -604,7 +665,11 @@ !ENDIF SOURCE=.\main\http_bprintf.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -616,19 +681,26 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_bprintf.obj" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_) "$(INTDIR)" @@ -638,7 +710,11 @@ !ENDIF SOURCE=.\main\http_config.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_C=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -657,19 +733,33 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_C=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_C=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\explain.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_request.h"\ + ".\main\http_vhost.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_C) "$(INTDIR)" @@ -679,7 +769,11 @@ !ENDIF SOURCE=.\main\http_core.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_CO=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -704,19 +798,39 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_CO=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_CO=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\fnmatch.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\http_vhost.h"\ + ".\main\httpd.h"\ + ".\main\md5.h"\ + ".\main\rfc1413.h"\ + ".\main\scoreboard.h"\ + ".\main\util_md5.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_CO) "$(INTDIR)" @@ -726,7 +840,11 @@ !ENDIF SOURCE=.\main\http_log.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_L=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -742,19 +860,30 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_L=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_L=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L)\ "$(INTDIR)" @@ -764,7 +893,11 @@ !ENDIF SOURCE=.\main\http_main.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_M=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -789,19 +922,39 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_M=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_M=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\explain.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\http_vhost.h"\ + ".\main\httpd.h"\ + ".\main\multithread.h"\ + ".\main\scoreboard.h"\ + ".\os\win32\getopt.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\service.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_M) "$(INTDIR)" @@ -811,7 +964,11 @@ !ENDIF SOURCE=.\main\http_protocol.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_P=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -832,29 +989,49 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_P=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" - -"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" : $(SOURCE)\ - $(DEP_CPP_HTTP_P) "$(INTDIR)" +DEP_CPP_HTTP_P=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\http_vhost.h"\ + ".\main\httpd.h"\ + ".\main\util_date.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + + +"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" : $(SOURCE)\ + $(DEP_CPP_HTTP_P) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=.\main\http_request.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_R=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -874,19 +1051,34 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_R=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_R=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\fnmatch.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\scoreboard.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_R) "$(INTDIR)" @@ -896,7 +1088,11 @@ !ENDIF SOURCE=.\main\http_vhost.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_HTTP_V=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -913,19 +1109,31 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_HTTP_V=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_HTTP_V=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_log.h"\ + ".\main\http_protocol.h"\ + ".\main\http_vhost.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\http_vhost.obj" "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\ $(DEP_CPP_HTTP_V) "$(INTDIR)" @@ -935,6 +1143,9 @@ !ENDIF SOURCE=.\main\md5c.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MD5C_=\ ".\main\conf.h"\ ".\main\md5.h"\ @@ -947,15 +1158,18 @@ ".\main\os.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MD5C_=\ + ".\main\conf.h"\ + ".\main\md5.h"\ + ".\os\win32\os.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\md5c.obj" "$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_)\ "$(INTDIR)" @@ -965,7 +1179,11 @@ !ENDIF SOURCE=.\modules\standard\mod_access.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_A=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -981,19 +1199,30 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_A=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_A=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_A) "$(INTDIR)" @@ -1003,7 +1232,11 @@ !ENDIF SOURCE=.\modules\standard\mod_actions.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_AC=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1022,19 +1255,33 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_AC=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_AC=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_AC) "$(INTDIR)" @@ -1044,7 +1291,11 @@ !ENDIF SOURCE=.\modules\standard\mod_alias.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_AL=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1057,19 +1308,27 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_AL=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_AL=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_AL) "$(INTDIR)" @@ -1079,7 +1338,11 @@ !ENDIF SOURCE=.\modules\standard\mod_asis.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_AS=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1097,19 +1360,32 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_AS=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_AS=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE) $(DEP_CPP_MOD_AS)\ "$(INTDIR)" @@ -1119,7 +1395,11 @@ !ENDIF SOURCE=.\modules\standard\mod_auth.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_AU=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1135,19 +1415,30 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_AU=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_AU=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_protocol.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE) $(DEP_CPP_MOD_AU)\ "$(INTDIR)" @@ -1157,7 +1448,11 @@ !ENDIF SOURCE=.\modules\standard\mod_autoindex.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_AUT=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1176,19 +1471,33 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_AUT=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_AUT=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_AUT) "$(INTDIR)" @@ -1198,7 +1507,11 @@ !ENDIF SOURCE=.\modules\standard\mod_cgi.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_C=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1218,19 +1531,34 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_C=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_C=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE) $(DEP_CPP_MOD_C)\ "$(INTDIR)" @@ -1240,7 +1568,11 @@ !ENDIF SOURCE=.\modules\standard\mod_dir.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_D=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1259,19 +1591,33 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_D=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_D=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\ "$(INTDIR)" @@ -1281,7 +1627,11 @@ !ENDIF SOURCE=.\os\win32\mod_dll.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_DL=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1294,18 +1644,26 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_DL=\ + ".\main\ebcdic.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_DL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_DL=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_dll.obj" "$(INTDIR)\mod_dll.sbr" : $(SOURCE) $(DEP_CPP_MOD_DL)\ "$(INTDIR)" @@ -1315,7 +1673,11 @@ !ENDIF SOURCE=.\modules\standard\mod_env.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_E=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1328,19 +1690,27 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_E=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_E=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\ "$(INTDIR)" @@ -1350,7 +1720,11 @@ !ENDIF SOURCE=.\modules\standard\mod_imap.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_I=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1369,19 +1743,33 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_I=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_I=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\ "$(INTDIR)" @@ -1391,7 +1779,11 @@ !ENDIF SOURCE=.\modules\standard\mod_include.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_IN=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1410,21 +1802,35 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_IN=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ ".\modules\standard\config.h"\ ".\modules\standard\modules\perl\mod_perl.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_IN=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_include.obj" "$(INTDIR)\mod_include.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_IN) "$(INTDIR)" @@ -1434,7 +1840,11 @@ !ENDIF SOURCE=.\os\win32\mod_isapi.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_IS=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1452,18 +1862,31 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_IS=\ + ".\main\ebcdic.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_IS=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_isapi.obj" "$(INTDIR)\mod_isapi.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_IS) "$(INTDIR)" @@ -1473,7 +1896,11 @@ !ENDIF SOURCE=.\modules\standard\mod_log_config.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_L=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1488,19 +1915,29 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_L=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_L=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_L) "$(INTDIR)" @@ -1510,7 +1947,11 @@ !ENDIF SOURCE=.\modules\standard\mod_mime.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_M=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1524,19 +1965,28 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_M=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_M=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\httpd.h"\ + ".\modules\standard\mod_mime.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\ "$(INTDIR)" @@ -1546,7 +1996,11 @@ !ENDIF SOURCE=.\modules\standard\mod_negotiation.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_N=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1563,19 +2017,31 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_N=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_N=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_N) "$(INTDIR)" @@ -1585,7 +2051,11 @@ !ENDIF SOURCE=.\modules\standard\mod_setenvif.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_S=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1600,19 +2070,29 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_S=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_S=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_S) "$(INTDIR)" @@ -1622,7 +2102,11 @@ !ENDIF SOURCE=.\modules\standard\mod_userdir.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MOD_U=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1635,19 +2119,27 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_U=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MOD_U=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\ $(DEP_CPP_MOD_U) "$(INTDIR)" @@ -1657,7 +2149,11 @@ !ENDIF SOURCE=.\os\win32\modules.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MODUL=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1670,18 +2166,26 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MODUL=\ + ".\main\ebcdic.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MODUL=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_config.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE) $(DEP_CPP_MODUL)\ "$(INTDIR)" @@ -1691,6 +2195,9 @@ !ENDIF SOURCE=.\os\win32\multithread.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_MULTI=\ ".\main\conf.h"\ ".\main\multithread.h"\ @@ -1700,15 +2207,18 @@ {$(INCLUDE)}"sys\types.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_MULTI=\ + ".\main\conf.h"\ + ".\main\multithread.h"\ + ".\os\win32\os.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\multithread.obj" "$(INTDIR)\multithread.sbr" : $(SOURCE)\ $(DEP_CPP_MULTI) "$(INTDIR)" @@ -1718,20 +2228,23 @@ !ENDIF SOURCE=.\os\win32\readdir.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_READD=\ ".\os\win32\readdir.h"\ {$(INCLUDE)}"sys\types.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_READD=\ + ".\os\win32\readdir.h"\ + "$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\ "$(INTDIR)" @@ -1741,7 +2254,11 @@ !ENDIF SOURCE=.\main\rfc1413.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_RFC14=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1756,19 +2273,29 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_RFC14=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_RFC14=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\httpd.h"\ + ".\main\rfc1413.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\rfc1413.obj" "$(INTDIR)\rfc1413.sbr" : $(SOURCE) $(DEP_CPP_RFC14)\ "$(INTDIR)" @@ -1778,18 +2305,29 @@ !ENDIF SOURCE=.\os\win32\service.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_SERVI=\ + ".\ap\ap.h"\ + ".\main\alloc.h"\ + ".\main\buff.h"\ ".\main\conf.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\httpd.h"\ ".\main\multithread.h"\ ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ ".\os\win32\service.h"\ ".\regex\regex.h"\ {$(INCLUDE)}"sys\stat.h"\ {$(INCLUDE)}"sys\types.h"\ - -!IF "$(CFG)" == "ApacheCore - Win32 Release" - +NODEP_CPP_SERVI=\ + ".\main\ebcdic.h"\ + ".\main\sfio.h"\ + "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -1797,6 +2335,19 @@ !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_SERVI=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\httpd.h"\ + ".\main\multithread.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\os\win32\service.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\service.obj" "$(INTDIR)\service.sbr" : $(SOURCE) $(DEP_CPP_SERVI)\ "$(INTDIR)" @@ -1806,7 +2357,11 @@ !ENDIF SOURCE=.\main\util.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_UTIL_=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1820,19 +2375,28 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_UTIL_=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_UTIL_=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_log.h"\ + ".\main\httpd.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\ "$(INTDIR)" @@ -1842,6 +2406,9 @@ !ENDIF SOURCE=.\main\util_date.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_UTIL_D=\ ".\main\conf.h"\ ".\main\util_date.h"\ @@ -1854,15 +2421,18 @@ ".\main\os.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_UTIL_D=\ + ".\main\conf.h"\ + ".\main\util_date.h"\ + ".\os\win32\os.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\util_date.obj" "$(INTDIR)\util_date.sbr" : $(SOURCE)\ $(DEP_CPP_UTIL_D) "$(INTDIR)" @@ -1872,7 +2442,11 @@ !ENDIF SOURCE=.\main\util_md5.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_UTIL_M=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1886,19 +2460,28 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_UTIL_M=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_UTIL_M=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\httpd.h"\ + ".\main\md5.h"\ + ".\main\util_md5.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\util_md5.obj" "$(INTDIR)\util_md5.sbr" : $(SOURCE) $(DEP_CPP_UTIL_M)\ "$(INTDIR)" @@ -1908,7 +2491,11 @@ !ENDIF SOURCE=.\main\util_script.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_UTIL_S=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1929,19 +2516,35 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_UTIL_S=\ + ".\main\ebcdic.h"\ ".\main\os.h"\ ".\main\sfio.h"\ -!IF "$(CFG)" == "ApacheCore - Win32 Release" - - "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" +DEP_CPP_UTIL_S=\ + ".\main\alloc.h"\ + ".\main\buff.h"\ + ".\main\conf.h"\ + ".\main\http_conf_globals.h"\ + ".\main\http_config.h"\ + ".\main\http_core.h"\ + ".\main\http_log.h"\ + ".\main\http_main.h"\ + ".\main\http_protocol.h"\ + ".\main\http_request.h"\ + ".\main\httpd.h"\ + ".\main\util_date.h"\ + ".\main\util_script.h"\ + ".\os\win32\os.h"\ + ".\os\win32\readdir.h"\ + ".\regex\regex.h"\ + "$(INTDIR)\util_script.obj" "$(INTDIR)\util_script.sbr" : $(SOURCE)\ $(DEP_CPP_UTIL_S) "$(INTDIR)" @@ -1951,7 +2554,11 @@ !ENDIF SOURCE=.\os\win32\util_win32.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + DEP_CPP_UTIL_W=\ + ".\ap\ap.h"\ ".\main\alloc.h"\ ".\main\buff.h"\ ".\main\conf.h"\ @@ -1963,18 +2570,25 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_UTIL_W=\ + ".\main\ebcdic.h"\ ".\main\sfio.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)" 1.6 +2 -2 apachen/src/modules/proxy/ApacheModuleProxy.dsp Index: ApacheModuleProxy.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ApacheModuleProxy.dsp 1998/01/04 13:20:41 1.5 +++ ApacheModuleProxy.dsp 1998/01/24 04:07:09 1.6 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\..\regex" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\main" /I "..\..\regex" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\main" /I "..\..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.7 +80 -194 apachen/src/modules/proxy/ApacheModuleProxy.mak Index: ApacheModuleProxy.mak =================================================================== RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheModuleProxy.mak 1998/01/04 13:20:41 1.6 +++ ApacheModuleProxy.mak 1998/01/24 04:07:10 1.7 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" OUTDIR=.\Release @@ -67,12 +63,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\..\regex" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\main" /I "..\..\regex"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\Release/ 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)\ApacheModuleProxy.bsc" BSC32_SBRS= \ @@ -132,36 +162,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\main" /I\ + "..\..\regex" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\ + /c CPP_OBJS=.\Debug/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\ - /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\ - /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\ - /implib:"$(OUTDIR)\ApacheModuleProxy.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_proxy.obj" \ - "$(INTDIR)\proxy_cache.obj" \ - "$(INTDIR)\proxy_connect.obj" \ - "$(INTDIR)\proxy_ftp.obj" \ - "$(INTDIR)\proxy_http.obj" \ - "$(INTDIR)\proxy_util.obj" - -"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -193,34 +200,40 @@ $(CPP_PROJ) $< << - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\ - "ApacheModuleProxy - Win32 Debug" -SOURCE=.\mod_proxy.c - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" - -DEP_CPP_MOD_P=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\explain.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\os\win32\os.h"\ - "..\..\os\win32\readdir.h"\ - "..\..\regex\regex.h"\ - ".\mod_proxy.h"\ +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc" +BSC32_SBRS= \ +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\ + /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\ + /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\ + /implib:"$(OUTDIR)\ApacheModuleProxy.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_proxy.obj" \ + "$(INTDIR)\proxy_cache.obj" \ + "$(INTDIR)\proxy_connect.obj" \ + "$(INTDIR)\proxy_ftp.obj" \ + "$(INTDIR)\proxy_http.obj" \ + "$(INTDIR)\proxy_util.obj" -"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)" +"$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< +!ENDIF -!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug" +!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\ + "ApacheModuleProxy - Win32 Debug" +SOURCE=.\mod_proxy.c DEP_CPP_MOD_P=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -237,6 +250,7 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_P=\ + "..\..\main\ebcdic.h"\ "..\..\main\os.h"\ "..\..\main\sfio.h"\ @@ -244,37 +258,9 @@ "$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)" -!ENDIF - SOURCE=.\proxy_cache.c - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" - -DEP_CPP_PROXY=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\explain.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_main.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\main\md5.h"\ - "..\..\main\multithread.h"\ - "..\..\main\util_date.h"\ - "..\..\os\win32\os.h"\ - "..\..\os\win32\readdir.h"\ - "..\..\regex\regex.h"\ - ".\mod_proxy.h"\ - - -"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug" - DEP_CPP_PROXY=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -296,6 +282,7 @@ {$(INCLUDE)}"sys\utime.h"\ NODEP_CPP_PROXY=\ + "..\..\main\ebcdic.h"\ "..\..\main\os.h"\ "..\..\main\sfio.h"\ @@ -303,34 +290,9 @@ "$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)" -!ENDIF - SOURCE=.\proxy_connect.c - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" - -DEP_CPP_PROXY_=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\explain.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_main.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\os\win32\os.h"\ - "..\..\os\win32\readdir.h"\ - "..\..\regex\regex.h"\ - ".\mod_proxy.h"\ - - -"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug" - DEP_CPP_PROXY_=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -348,6 +310,7 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_PROXY_=\ + "..\..\main\ebcdic.h"\ "..\..\main\os.h"\ "..\..\main\sfio.h"\ @@ -355,34 +318,9 @@ "$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)" -!ENDIF - SOURCE=.\proxy_ftp.c - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" - -DEP_CPP_PROXY_F=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\explain.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_main.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\os\win32\os.h"\ - "..\..\os\win32\readdir.h"\ - "..\..\regex\regex.h"\ - "..\standard\mod_mime.h"\ - ".\mod_proxy.h"\ - - -"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug" - DEP_CPP_PROXY_F=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -400,6 +338,7 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_PROXY_F=\ + "..\..\main\ebcdic.h"\ "..\..\main\os.h"\ "..\..\main\sfio.h"\ @@ -407,35 +346,9 @@ "$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)" -!ENDIF - SOURCE=.\proxy_http.c - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" - -DEP_CPP_PROXY_H=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\explain.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_main.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\main\util_date.h"\ - "..\..\os\win32\os.h"\ - "..\..\os\win32\readdir.h"\ - "..\..\regex\regex.h"\ - ".\mod_proxy.h"\ - - -"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug" - DEP_CPP_PROXY_H=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -454,6 +367,7 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_PROXY_H=\ + "..\..\main\ebcdic.h"\ "..\..\main\os.h"\ "..\..\main\sfio.h"\ @@ -461,36 +375,9 @@ "$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)" -!ENDIF - SOURCE=.\proxy_util.c - -!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" - -DEP_CPP_PROXY_U=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\explain.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_main.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\main\md5.h"\ - "..\..\main\multithread.h"\ - "..\..\os\win32\os.h"\ - "..\..\os\win32\readdir.h"\ - "..\..\regex\regex.h"\ - ".\mod_proxy.h"\ - - -"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)" - - -!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug" - DEP_CPP_PROXY_U=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -510,14 +397,13 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_PROXY_U=\ + "..\..\main\ebcdic.h"\ "..\..\main\os.h"\ "..\..\main\sfio.h"\ "$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)" - -!ENDIF !ENDIF 1.5 +2 -2 apachen/src/os/win32/ApacheModuleAuthAnon.dsp Index: ApacheModuleAuthAnon.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleAuthAnon.dsp 1997/10/20 20:19:13 1.4 +++ ApacheModuleAuthAnon.dsp 1998/01/24 04:07:11 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +72 -55 apachen/src/os/win32/ApacheModuleAuthAnon.mak Index: ApacheModuleAuthAnon.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleAuthAnon.mak 1997/10/20 20:19:14 1.7 +++ ApacheModuleAuthAnon.mak 1998/01/24 04:07:12 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" OUTDIR=.\ApacheModuleAuthAnonR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch"\ + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleAuthAnonR/ 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)\ApacheModuleAuthAnon.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleAuthAnonD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthAnon.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\ - /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_auth_anon.obj" - -"$(OUTDIR)\ApacheModuleAuthAnon.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,35 +185,35 @@ $(CPP_PROJ) $< << - -!IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\ - "ApacheModuleAuthAnon - Win32 Debug" -SOURCE=..\..\modules\standard\mod_auth_anon.c - -!IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" - -DEP_CPP_MOD_A=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_core.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\http_request.h"\ - "..\..\main\httpd.h"\ - "..\..\regex\regex.h"\ - ".\os.h"\ - ".\readdir.h"\ +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleAuthAnon.bsc" +BSC32_SBRS= \ +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\ + /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_auth_anon.obj" -"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(OUTDIR)\ApacheModuleAuthAnon.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< +!ENDIF -!ELSEIF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug" +!IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\ + "ApacheModuleAuthAnon - Win32 Debug" +SOURCE=..\..\modules\standard\mod_auth_anon.c DEP_CPP_MOD_A=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -214,13 +226,18 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_A=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) - -!ENDIF !ENDIF 1.5 +2 -2 apachen/src/os/win32/ApacheModuleCERNMeta.dsp Index: ApacheModuleCERNMeta.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleCERNMeta.dsp 1997/10/20 20:19:16 1.4 +++ ApacheModuleCERNMeta.dsp 1998/01/24 04:07:12 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +73 -30 apachen/src/os/win32/ApacheModuleCERNMeta.mak Index: ApacheModuleCERNMeta.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleCERNMeta.mak 1997/10/20 20:19:17 1.7 +++ ApacheModuleCERNMeta.mak 1998/01/24 04:07:12 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" OUTDIR=.\ApacheModuleCERNMetaR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch"\ + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleCERNMetaR/ 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)\ApacheModuleCERNMeta.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleCERNMetaD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleCERNMeta.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\ - /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_cern_meta.obj" - -"$(OUTDIR)\ApacheModuleCERNMeta.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,6 +185,29 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleCERNMeta.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\ + /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_cern_meta.obj" + +"$(OUTDIR)\ApacheModuleCERNMeta.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\ "ApacheModuleCERNMeta - Win32 Debug" @@ -181,6 +216,7 @@ !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" DEP_CPP_MOD_C=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -192,6 +228,13 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_C=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" 1.5 +2 -2 apachen/src/os/win32/ApacheModuleDigest.dsp Index: ApacheModuleDigest.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleDigest.dsp 1997/10/20 20:19:18 1.4 +++ ApacheModuleDigest.dsp 1998/01/24 04:07:13 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +72 -29 apachen/src/os/win32/ApacheModuleDigest.mak Index: ApacheModuleDigest.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleDigest.mak 1997/10/20 20:19:18 1.7 +++ ApacheModuleDigest.mak 1998/01/24 04:07:13 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" OUTDIR=.\ApacheModuleDigestR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleDigestR/ 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)\ApacheModuleDigest.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\ + /c CPP_OBJS=.\ApacheModuleDigestD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleDigest.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\ - /implib:"$(OUTDIR)\ApacheModuleDigest.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_digest.obj" - -"$(OUTDIR)\ApacheModuleDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,6 +185,29 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleDigest.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\ + /implib:"$(OUTDIR)\ApacheModuleDigest.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_digest.obj" + +"$(OUTDIR)\ApacheModuleDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" || "$(CFG)" ==\ "ApacheModuleDigest - Win32 Debug" @@ -181,6 +216,7 @@ !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" DEP_CPP_MOD_D=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -194,6 +230,13 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_D=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" 1.5 +2 -2 apachen/src/os/win32/ApacheModuleExpires.dsp Index: ApacheModuleExpires.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleExpires.dsp 1997/10/20 20:19:19 1.4 +++ ApacheModuleExpires.dsp 1998/01/24 04:07:14 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +72 -29 apachen/src/os/win32/ApacheModuleExpires.mak Index: ApacheModuleExpires.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleExpires.mak 1997/10/20 20:19:20 1.7 +++ ApacheModuleExpires.mak 1998/01/24 04:07:14 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" OUTDIR=.\ApacheModuleExpiresR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleExpiresR/ 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)\ApacheModuleExpires.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleExpiresD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleExpires.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleExpires.dll"\ - /implib:"$(OUTDIR)\ApacheModuleExpires.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_expires.obj" - -"$(OUTDIR)\ApacheModuleExpires.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,6 +185,29 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleExpires.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleExpires.dll"\ + /implib:"$(OUTDIR)\ApacheModuleExpires.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_expires.obj" + +"$(OUTDIR)\ApacheModuleExpires.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" || "$(CFG)" ==\ "ApacheModuleExpires - Win32 Debug" @@ -181,6 +216,7 @@ !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" DEP_CPP_MOD_E=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -190,6 +226,13 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_E=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" 1.5 +2 -2 apachen/src/os/win32/ApacheModuleHeaders.dsp Index: ApacheModuleHeaders.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleHeaders.dsp 1997/10/20 20:19:22 1.4 +++ ApacheModuleHeaders.dsp 1998/01/24 04:07:15 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +72 -29 apachen/src/os/win32/ApacheModuleHeaders.mak Index: ApacheModuleHeaders.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleHeaders.mak 1997/10/20 20:19:23 1.7 +++ ApacheModuleHeaders.mak 1998/01/24 04:07:15 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" OUTDIR=.\ApacheModuleHeadersR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleHeadersR/ 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)\ApacheModuleHeaders.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleHeadersD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleHeaders.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\ - /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_headers.obj" - -"$(OUTDIR)\ApacheModuleHeaders.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,6 +185,29 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleHeaders.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\ + /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_headers.obj" + +"$(OUTDIR)\ApacheModuleHeaders.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" || "$(CFG)" ==\ "ApacheModuleHeaders - Win32 Debug" @@ -181,6 +216,7 @@ !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" DEP_CPP_MOD_H=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -189,6 +225,13 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_H=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" 1.5 +2 -2 apachen/src/os/win32/ApacheModuleInfo.dsp Index: ApacheModuleInfo.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleInfo.dsp 1997/10/20 20:19:24 1.4 +++ ApacheModuleInfo.dsp 1998/01/24 04:07:16 1.5 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.5 +68 -32 apachen/src/os/win32/ApacheModuleInfo.mak Index: ApacheModuleInfo.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.mak,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleInfo.mak 1997/10/20 20:19:24 1.4 +++ ApacheModuleInfo.mak 1998/01/24 04:07:16 1.5 @@ -29,10 +29,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" OUTDIR=.\ApacheModuleInfoR @@ -61,12 +57,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX /Fo"$(INTDIR)\\"\ - /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX\ + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleInfoR/ 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)\ApacheModuleInfo.bsc" BSC32_SBRS= \ @@ -115,31 +145,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\ + /c CPP_OBJS=.\ApacheModuleInfoD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleInfo.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\ - /implib:"$(OUTDIR)\ApacheModuleInfo.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_info.obj" - -"$(OUTDIR)\ApacheModuleInfo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -171,11 +183,35 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleInfo.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\ + /implib:"$(OUTDIR)\ApacheModuleInfo.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_info.obj" + +"$(OUTDIR)\ApacheModuleInfo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" || "$(CFG)" ==\ "ApacheModuleInfo - Win32 Debug" SOURCE=..\..\modules\standard\mod_info.c DEP_CPP_MOD_I=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -186,8 +222,6 @@ "..\..\main\http_main.h"\ "..\..\main\http_protocol.h"\ "..\..\main\httpd.h"\ - "..\..\main\os-inline.c"\ - "..\..\main\os.h"\ "..\..\main\util_script.h"\ "..\..\regex\regex.h"\ ".\os.h"\ @@ -196,6 +230,8 @@ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_I=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ "..\..\main\sfio.h"\ 1.7 +2 -2 apachen/src/os/win32/ApacheModuleRewrite.dsp Index: ApacheModuleRewrite.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheModuleRewrite.dsp 1997/10/20 20:19:25 1.6 +++ ApacheModuleRewrite.dsp 1998/01/24 04:07:17 1.7 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.7 +75 -31 apachen/src/os/win32/ApacheModuleRewrite.mak Index: ApacheModuleRewrite.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.mak,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheModuleRewrite.mak 1997/10/20 20:19:25 1.6 +++ ApacheModuleRewrite.mak 1998/01/24 04:07:17 1.7 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" OUTDIR=.\ApacheModuleRewriteR @@ -63,12 +59,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleRewriteR/ 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)\ApacheModuleRewrite.bsc" BSC32_SBRS= \ @@ -121,33 +151,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleRewriteD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleRewrite.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\ - /subsystem:windows /dll /incremental:yes\ - /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\ - /implib:"$(OUTDIR)\ApacheModuleRewrite.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_rewrite.obj" \ - "$(INTDIR)\passwd.obj" - -"$(OUTDIR)\ApacheModuleRewrite.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -179,6 +189,31 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleRewrite.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\ + /subsystem:windows /dll /incremental:yes\ + /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /debug /machine:I386\ + /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\ + /implib:"$(OUTDIR)\ApacheModuleRewrite.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_rewrite.obj" \ + "$(INTDIR)\passwd.obj" + +"$(OUTDIR)\ApacheModuleRewrite.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" || "$(CFG)" ==\ "ApacheModuleRewrite - Win32 Debug" @@ -187,6 +222,7 @@ !IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" DEP_CPP_MOD_R=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -200,6 +236,14 @@ ".\os.h"\ ".\passwd.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\locking.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_R=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)" 1.2 +2 -2 apachen/src/os/win32/ApacheModuleSpeling.dsp Index: ApacheModuleSpeling.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleSpeling.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleSpeling.dsp 1998/01/24 03:42:16 1.1 +++ ApacheModuleSpeling.dsp 1998/01/24 04:07:18 1.2 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.2 +14 -5 apachen/src/os/win32/ApacheModuleSpeling.mak Index: ApacheModuleSpeling.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleSpeling.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleSpeling.mak 1998/01/24 03:42:17 1.1 +++ ApacheModuleSpeling.mak 1998/01/24 04:07:18 1.2 @@ -59,8 +59,8 @@ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\ +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleSpelingR/ CPP_SBRS=. @@ -148,9 +148,10 @@ 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" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleSpelingD/ CPP_SBRS=. @@ -233,6 +234,7 @@ !ELSEIF "$(CFG)" == "ApacheModuleSpeling - Win32 Debug" DEP_CPP_MOD_S=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -242,6 +244,13 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_S=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" 1.5 +2 -2 apachen/src/os/win32/ApacheModuleStatus.dsp Index: ApacheModuleStatus.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleStatus.dsp 1997/10/20 20:19:26 1.4 +++ ApacheModuleStatus.dsp 1998/01/24 04:07:19 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /I "..\..\ap" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /I "..\..\ap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +71 -56 apachen/src/os/win32/ApacheModuleStatus.mak Index: ApacheModuleStatus.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleStatus.mak 1997/10/20 20:19:27 1.7 +++ ApacheModuleStatus.mak 1998/01/24 04:07:19 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" OUTDIR=.\ApacheModuleStatusR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /I "..\..\ap"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleStatusR/ 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)\ApacheModuleStatus.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /I\ + "..\..\ap" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\ + /c CPP_OBJS=.\ApacheModuleStatusD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\ - /implib:"$(OUTDIR)\ApacheModuleStatus.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_status.obj" - -"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,37 +185,35 @@ $(CPP_PROJ) $< << - -!IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" || "$(CFG)" ==\ - "ApacheModuleStatus - Win32 Debug" -SOURCE=..\..\modules\standard\mod_status.c - -!IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" - -DEP_CPP_MOD_S=\ - "..\..\main\alloc.h"\ - "..\..\main\buff.h"\ - "..\..\main\conf.h"\ - "..\..\main\http_config.h"\ - "..\..\main\http_core.h"\ - "..\..\main\http_log.h"\ - "..\..\main\http_main.h"\ - "..\..\main\http_protocol.h"\ - "..\..\main\httpd.h"\ - "..\..\main\scoreboard.h"\ - "..\..\main\util_script.h"\ - "..\..\regex\regex.h"\ - ".\os.h"\ - ".\readdir.h"\ +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" +BSC32_SBRS= \ +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\ + /implib:"$(OUTDIR)\ApacheModuleStatus.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_status.obj" -"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< +!ENDIF -!ELSEIF "$(CFG)" == "ApacheModuleStatus - Win32 Debug" +!IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" || "$(CFG)" ==\ + "ApacheModuleStatus - Win32 Debug" +SOURCE=..\..\modules\standard\mod_status.c DEP_CPP_MOD_S=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -218,13 +228,18 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_S=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) - -!ENDIF !ENDIF 1.5 +2 -2 apachen/src/os/win32/ApacheModuleUserTrack.dsp Index: ApacheModuleUserTrack.dsp =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ApacheModuleUserTrack.dsp 1997/10/20 20:19:27 1.4 +++ ApacheModuleUserTrack.dsp 1998/01/24 04:07:20 1.5 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" 1.8 +73 -30 apachen/src/os/win32/ApacheModuleUserTrack.mak Index: ApacheModuleUserTrack.mak =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.mak,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ApacheModuleUserTrack.mak 1997/10/20 20:19:27 1.7 +++ ApacheModuleUserTrack.mak 1998/01/24 04:07:20 1.8 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" OUTDIR=.\ApacheModuleUserTrackR @@ -62,12 +58,46 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\ - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\ap" /I "..\..\regex" /I "..\..\main"\ + /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch"\ + /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\ApacheModuleUserTrackR/ 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)\ApacheModuleUserTrack.bsc" BSC32_SBRS= \ @@ -117,31 +147,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\ - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\ap" /I "..\..\regex" /I\ + "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\ + /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleUserTrackD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleUserTrack.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\ - /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_usertrack.obj" - -"$(OUTDIR)\ApacheModuleUserTrack.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF .c{$(CPP_OBJS)}.obj:: $(CPP) @<< @@ -173,6 +185,29 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleUserTrack.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /debug\ + /machine:I386 /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\ + /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_usertrack.obj" + +"$(OUTDIR)\ApacheModuleUserTrack.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" || "$(CFG)" ==\ "ApacheModuleUserTrack - Win32 Debug" @@ -181,6 +216,7 @@ !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" DEP_CPP_MOD_U=\ + "..\..\ap\ap.h"\ "..\..\main\alloc.h"\ "..\..\main\buff.h"\ "..\..\main\conf.h"\ @@ -190,6 +226,13 @@ "..\..\regex\regex.h"\ ".\os.h"\ ".\readdir.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_MOD_U=\ + "..\..\main\ebcdic.h"\ + "..\..\main\os.h"\ + "..\..\main\sfio.h"\ "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"