ake 00/02/17 15:55:14
Modified: src ApacheCore.def Makefile.nt src/modules/standard mod_digest.c mod_headers.c mod_speling.c 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 Windows project and makefiles so dynamically loadable modules get built Revision Changes Path 1.11 +13 -1 apache-2.0/src/ApacheCore.def Index: ApacheCore.def =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ApacheCore.def 2000/01/17 19:37:51 1.10 +++ ApacheCore.def 2000/02/17 23:55:11 1.11 @@ -381,4 +381,16 @@ isProcessService @376 ap_registry_get_server_root @377 ap_registry_get_service_conf @378 - + ap_hook_pre_connection @379 + ap_hook_post_read_request @380 + ap_hook_log_transaction @381 + ap_hook_http_method @382 + ap_hook_default_port @383 + ap_hook_translate_name @384 + ap_hook_type_checker @385 + ap_hook_access_checker @386 + ap_hook_header_parser @387 + ap_hook_pre_config @388 + ap_hook_post_config @389 + ap_hook_open_logs @390 + ap_hook_child_init @391 1.7 +25 -25 apache-2.0/src/Makefile.nt Index: Makefile.nt =================================================================== RCS file: /home/cvs/apache-2.0/src/Makefile.nt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.nt 2000/02/16 18:00:22 1.6 +++ Makefile.nt 2000/02/17 23:55:11 1.7 @@ -70,19 +70,19 @@ -del Core%SHORT%\buildmark.obj nmake /nologo CFG="ApacheCore - Win32 %LONG%" -f ApacheCore.mak nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak -# cd os\win32 + cd os\win32 # set CFG=ApacheModuleStatus - Win32 %LONG% # nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f ApacheModuleStatus.mak # nmake /nologo CFG ""/nologo -f ApacheModuleStatus.mak"=ApacheModuleInfo - Win32 %LONG%" -f ApacheModuleInfo.mak -# nmake /nologo CFG="ApacheModuleAuthAnon - Win32 %LONG%" -f ApacheModuleAuthAnon.mak -# nmake /nologo CFG="ApacheModuleDigest - Win32 %LONG%" -f ApacheModuleDigest.mak -# nmake /nologo CFG="ApacheModuleCERNMeta - Win32 %LONG%" -f ApacheModuleCERNMeta.mak -# nmake /nologo CFG="ApacheModuleExpires - Win32 %LONG%" -f ApacheModuleExpires.mak -# nmake /nologo CFG="ApacheModuleHeaders - Win32 %LONG%" -f ApacheModuleHeaders.mak -# nmake /nologo CFG="ApacheModuleSpeling - Win32 %LONG%" -f ApacheModuleSpeling.mak -# nmake /nologo CFG="ApacheModuleUserTrack - Win32 %LONG%" -f ApacheModuleUserTrack.mak + nmake /nologo CFG="ApacheModuleAuthAnon - Win32 %LONG%" -f ApacheModuleAuthAnon.mak + nmake /nologo CFG="ApacheModuleDigest - Win32 %LONG%" -f ApacheModuleDigest.mak + nmake /nologo CFG="ApacheModuleCERNMeta - Win32 %LONG%" -f ApacheModuleCERNMeta.mak + nmake /nologo CFG="ApacheModuleExpires - Win32 %LONG%" -f ApacheModuleExpires.mak + nmake /nologo CFG="ApacheModuleHeaders - Win32 %LONG%" -f ApacheModuleHeaders.mak + nmake /nologo CFG="ApacheModuleSpeling - Win32 %LONG%" -f ApacheModuleSpeling.mak + nmake /nologo CFG="ApacheModuleUserTrack - Win32 %LONG%" -f ApacheModuleUserTrack.mak # nmake /nologo CFG="ApacheModuleRewrite - Win32 %LONG%" -f ApacheModuleRewrite.mak -# cd ..\.. + cd ..\.. # cd modules\proxy # nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f ApacheModuleProxy.mak # cd ..\.. @@ -98,14 +98,14 @@ copy lib\apr\%LONG%\aprlib.dll $(INSTDIR) # copy os\win32\ApacheModuleStatus%SHORT%\ApacheModuleStatus.dll $(INSTDIR)\modules # copy os\win32\ApacheModuleInfo%SHORT%\ApacheModuleInfo.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleAuthAnon%SHORT%\ApacheModuleAuthAnon.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleDigest%SHORT%\ApacheModuleDigest.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleCERNMeta%SHORT%\ApacheModuleCERNMeta.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleExpires%SHORT%\ApacheModuleExpires.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleHeaders%SHORT%\ApacheModuleHeaders.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleAuthAnon%SHORT%\ApacheModuleAuthAnon.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleDigest%SHORT%\ApacheModuleDigest.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleCERNMeta%SHORT%\ApacheModuleCERNMeta.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleExpires%SHORT%\ApacheModuleExpires.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleHeaders%SHORT%\ApacheModuleHeaders.dll $(INSTDIR)\modules # copy os\win32\ApacheModuleRewrite%SHORT%\ApacheModuleRewrite.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleSpeling%SHORT%\ApacheModuleSpeling.dll $(INSTDIR)\modules -# copy os\win32\ApacheModuleUserTrack%SHORT%\ApacheModuleUserTrack.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleSpeling%SHORT%\ApacheModuleSpeling.dll $(INSTDIR)\modules + copy os\win32\ApacheModuleUserTrack%SHORT%\ApacheModuleUserTrack.dll $(INSTDIR)\modules # copy modules\proxy\%LONG%\ApacheModuleProxy.dll $(INSTDIR)\modules # copy support\%LONG%\htpasswd.exe $(INSTDIR)\bin # copy support\%LONG%\htdigest.exe $(INSTDIR)\bin @@ -137,18 +137,18 @@ cd .. nmake /nologo CFG="ApacheCore - Win32 %LONG%" -f ApacheCore.mak clean nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak clean -# cd os\win32 + cd os\win32 # nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f ApacheModuleStatus.mak clean # nmake /nologo CFG="ApacheModuleInfo - Win32 %LONG%" -f ApacheModuleInfo.mak clean -# nmake /nologo CFG="ApacheModuleAuthAnon - Win32 %LONG%" -f ApacheModuleAuthAnon.mak clean -# nmake /nologo CFG="ApacheModuleDigest - Win32 %LONG%" -f ApacheModuleDigest.mak clean -# nmake /nologo CFG="ApacheModuleCERNMeta - Win32 %LONG%" -f ApacheModuleCERNMeta.mak clean -# nmake /nologo CFG="ApacheModuleExpires - Win32 %LONG%" -f ApacheModuleExpires.mak clean -# nmake /nologo CFG="ApacheModuleHeaders - Win32 %LONG%" -f ApacheModuleHeaders.mak clean -# nmake /nologo CFG="ApacheModuleSpeling - Win32 %LONG%" -f ApacheModuleSpeling.mak clean -# nmake /nologo CFG="ApacheModuleUserTrack - Win32 %LONG%" -f ApacheModuleUserTrack.mak clean + nmake /nologo CFG="ApacheModuleAuthAnon - Win32 %LONG%" -f ApacheModuleAuthAnon.mak clean + nmake /nologo CFG="ApacheModuleDigest - Win32 %LONG%" -f ApacheModuleDigest.mak clean + nmake /nologo CFG="ApacheModuleCERNMeta - Win32 %LONG%" -f ApacheModuleCERNMeta.mak clean + nmake /nologo CFG="ApacheModuleExpires - Win32 %LONG%" -f ApacheModuleExpires.mak clean + nmake /nologo CFG="ApacheModuleHeaders - Win32 %LONG%" -f ApacheModuleHeaders.mak clean + nmake /nologo CFG="ApacheModuleSpeling - Win32 %LONG%" -f ApacheModuleSpeling.mak clean + nmake /nologo CFG="ApacheModuleUserTrack - Win32 %LONG%" -f ApacheModuleUserTrack.mak clean # nmake /nologo CFG="ApacheModuleRewrite - Win32 %LONG%" -f ApacheModuleRewrite.mak clean -# cd ..\.. + cd ..\.. # cd modules\proxy # nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f ApacheModuleProxy.mak clean # cd ..\.. 1.7 +1 -0 apache-2.0/src/modules/standard/mod_digest.c Index: mod_digest.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mod_digest.c 1999/12/31 17:06:15 1.6 +++ mod_digest.c 2000/02/17 23:55:11 1.7 @@ -68,6 +68,7 @@ #include "http_core.h" #include "http_log.h" #include "http_protocol.h" +#include "http_request.h" #include "util_md5.h" typedef struct digest_config_struct { 1.4 +1 -0 apache-2.0/src/modules/standard/mod_headers.c Index: mod_headers.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_headers.c 1999/08/31 05:33:50 1.3 +++ mod_headers.c 2000/02/17 23:55:11 1.4 @@ -103,6 +103,7 @@ #include "httpd.h" #include "http_config.h" +#include "http_request.h" typedef enum { hdr_add = 'a', /* add header (could mean multiple hdrs) */ 1.8 +1 -0 apache-2.0/src/modules/standard/mod_speling.c Index: mod_speling.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mod_speling.c 2000/01/07 15:52:21 1.7 +++ mod_speling.c 2000/02/17 23:55:11 1.8 @@ -59,6 +59,7 @@ #include "httpd.h" #include "http_core.h" #include "http_config.h" +#include "http_request.h" #include "http_log.h" #include "apr_file_io.h" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleAuthAnon.dsp Index: ApacheModuleAuthAnon.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthAnon.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleAuthAnon.dsp 1999/08/24 06:45:33 1.1 +++ ApacheModuleAuthAnon.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +95 -47 apache-2.0/src/os/win32/ApacheModuleAuthAnon.mak Index: ApacheModuleAuthAnon.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthAnon.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleAuthAnon.mak 1999/08/24 06:45:34 1.1 +++ ApacheModuleAuthAnon.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" OUTDIR=.\ApacheModuleAuthAnonR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\ /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib" LINK32_OBJS= \ @@ -117,32 +149,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /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) @<< @@ -174,7 +187,31 @@ $(CPP_PROJ) $< << +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 ..\..\lib\apr\Debug\aprlib.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 + + !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\ "ApacheModuleAuthAnon - Win32 Debug" SOURCE=..\..\modules\standard\mod_auth_anon.c @@ -182,11 +219,10 @@ !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" DEP_CPP_MOD_A=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ @@ -195,15 +231,18 @@ "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_A=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" @@ -213,11 +252,10 @@ !ELSEIF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug" DEP_CPP_MOD_A=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ @@ -226,8 +264,18 @@ "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleCERNMeta.dsp Index: ApacheModuleCERNMeta.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleCERNMeta.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleCERNMeta.dsp 1999/08/24 06:45:34 1.1 +++ ApacheModuleCERNMeta.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +93 -47 apache-2.0/src/os/win32/ApacheModuleCERNMeta.mak Index: ApacheModuleCERNMeta.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleCERNMeta.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleCERNMeta.mak 1999/08/24 06:45:34 1.1 +++ ApacheModuleCERNMeta.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" OUTDIR=.\ApacheModuleCERNMetaR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\ /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib" LINK32_OBJS= \ @@ -117,32 +149,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /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) @<< @@ -174,7 +187,31 @@ $(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 ..\..\lib\apr\Debug\aprlib.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" SOURCE=..\..\modules\standard\mod_cern_meta.c @@ -182,11 +219,12 @@ !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" DEP_CPP_MOD_C=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_log.h"\ @@ -194,15 +232,15 @@ "..\..\include\httpd.h"\ "..\..\include\util_script.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_C=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" @@ -212,11 +250,12 @@ !ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug" DEP_CPP_MOD_C=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_log.h"\ @@ -224,8 +263,15 @@ "..\..\include\httpd.h"\ "..\..\include\util_script.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleDigest.dsp Index: ApacheModuleDigest.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleDigest.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleDigest.dsp 1999/08/24 06:45:35 1.1 +++ ApacheModuleDigest.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleDigest - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +101 -50 apache-2.0/src/os/win32/ApacheModuleDigest.mak Index: ApacheModuleDigest.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleDigest.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleDigest.mak 1999/08/24 06:45:35 1.1 +++ ApacheModuleDigest.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" OUTDIR=.\ApacheModuleDigestR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleDigest.dll"\ /implib:"$(OUTDIR)\ApacheModuleDigest.lib" LINK32_OBJS= \ @@ -117,31 +149,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleDigest.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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 +187,30 @@ $(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 ..\..\lib\apr\Debug\aprlib.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,29 +219,32 @@ !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" DEP_CPP_MOD_D=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ + "..\..\include\ap_md5.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ - "..\..\include\ap_md5.h"\ "..\..\include\util_md5.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_D=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" @@ -213,22 +254,32 @@ !ELSEIF "$(CFG)" == "ApacheModuleDigest - Win32 Debug" DEP_CPP_MOD_D=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ + "..\..\include\ap_md5.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ "..\..\include\http_protocol.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ - "..\..\include\ap_md5.h"\ "..\..\include\util_md5.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleExpires.dsp Index: ApacheModuleExpires.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleExpires.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleExpires.dsp 1999/08/24 06:45:35 1.1 +++ ApacheModuleExpires.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleExpires - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +97 -48 apache-2.0/src/os/win32/ApacheModuleExpires.mak Index: ApacheModuleExpires.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleExpires.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleExpires.mak 1999/08/24 06:45:35 1.1 +++ ApacheModuleExpires.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" OUTDIR=.\ApacheModuleExpiresR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleExpires.dll"\ /implib:"$(OUTDIR)\ApacheModuleExpires.lib" LINK32_OBJS= \ @@ -117,32 +149,14 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleExpires.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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) @<< $(CPP_PROJ) $< @@ -173,6 +187,30 @@ $(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 ..\..\lib\apr\Debug\aprlib.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,25 +219,27 @@ !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" DEP_CPP_MOD_E=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_log.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_E=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" @@ -209,18 +249,27 @@ !ELSEIF "$(CFG)" == "ApacheModuleExpires - Win32 Debug" DEP_CPP_MOD_E=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_config.h"\ + "..\..\include\ap_ctype.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_log.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleHeaders.dsp Index: ApacheModuleHeaders.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleHeaders.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleHeaders.dsp 1999/08/24 06:45:35 1.1 +++ ApacheModuleHeaders.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleHeaders - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +93 -48 apache-2.0/src/os/win32/ApacheModuleHeaders.mak Index: ApacheModuleHeaders.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleHeaders.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleHeaders.mak 1999/08/24 06:45:36 1.1 +++ ApacheModuleHeaders.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" OUTDIR=.\ApacheModuleHeadersR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\ /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" LINK32_OBJS= \ @@ -117,32 +149,14 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleHeaders.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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) @<< $(CPP_PROJ) $< @@ -173,6 +187,30 @@ $(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 ..\..\lib\apr\Debug\aprlib.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,24 +219,24 @@ !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" DEP_CPP_MOD_H=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_H=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" @@ -208,17 +246,24 @@ !ELSEIF "$(CFG)" == "ApacheModuleHeaders - Win32 Debug" DEP_CPP_MOD_H=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleInfo.dsp Index: ApacheModuleInfo.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleInfo.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleInfo.dsp 1999/08/24 06:45:36 1.1 +++ ApacheModuleInfo.dsp 2000/02/17 23:55:12 1.2 @@ -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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +96 -41 apache-2.0/src/os/win32/ApacheModuleInfo.mak Index: ApacheModuleInfo.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleInfo.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleInfo.mak 1999/08/24 06:45:36 1.1 +++ ApacheModuleInfo.mak 2000/02/17 23:55:12 1.2 @@ -29,10 +29,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" OUTDIR=.\ApacheModuleInfoR @@ -61,20 +57,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleInfo.dll" /implib:"$(OUTDIR)\ApacheModuleInfo.lib" LINK32_OBJS= \ "$(INTDIR)\mod_info.obj" @@ -115,32 +147,14 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleInfo.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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) @<< $(CPP_PROJ) $< @@ -171,16 +185,41 @@ $(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 ..\..\lib\apr\Debug\aprlib.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 + +!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" + DEP_CPP_MOD_I=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_conf_globals.h"\ "..\..\include\http_config.h"\ @@ -191,20 +230,36 @@ "..\..\include\httpd.h"\ "..\..\include\util_script.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ {$(INCLUDE)}"sys\types.h"\ NODEP_CPP_MOD_I=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ + "..\..\lib\apr\include\apr.h"\ "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) + +!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug" + + +"$(INTDIR)\mod_info.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ENDIF !ENDIF 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleRewrite.dsp Index: ApacheModuleRewrite.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleRewrite.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleRewrite.dsp 1999/08/24 06:45:37 1.1 +++ ApacheModuleRewrite.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +99 -41 apache-2.0/src/os/win32/ApacheModuleRewrite.mak Index: ApacheModuleRewrite.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleRewrite.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleRewrite.mak 1999/08/24 06:45:37 1.1 +++ ApacheModuleRewrite.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" OUTDIR=.\ApacheModuleRewriteR @@ -63,21 +59,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\ +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\ + "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\ /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\ - /subsystem:windows /dll /incremental:no\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no\ /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\ /implib:"$(OUTDIR)\ApacheModuleRewrite.lib" @@ -122,34 +153,14 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\ - "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\ + "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\ + /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 ws2_32.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) @<< @@ -181,6 +192,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 ..\..\lib\apr\Debug\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib ws2_32.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" @@ -189,10 +225,10 @@ !IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" DEP_CPP_MOD_R=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ "..\..\include\ap_config.h"\ "..\..\include\ap_ctype.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ "..\..\include\hsregex.h"\ @@ -200,13 +236,24 @@ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ "..\..\include\http_request.h"\ "..\..\include\http_vhost.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ "..\..\modules\standard\mod_rewrite.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)" @@ -216,10 +263,10 @@ !ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug" DEP_CPP_MOD_R=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ "..\..\include\ap_config.h"\ "..\..\include\ap_ctype.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ "..\..\include\hsregex.h"\ @@ -227,13 +274,24 @@ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ + "..\..\include\http_protocol.h"\ "..\..\include\http_request.h"\ "..\..\include\http_vhost.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ "..\..\modules\standard\mod_rewrite.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleSpeling.dsp Index: ApacheModuleSpeling.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleSpeling.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleSpeling.dsp 1999/08/24 06:45:37 1.1 +++ ApacheModuleSpeling.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleSpeling - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +93 -48 apache-2.0/src/os/win32/ApacheModuleSpeling.mak Index: ApacheModuleSpeling.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleSpeling.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleSpeling.mak 1999/08/24 06:45:38 1.1 +++ ApacheModuleSpeling.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" OUTDIR=.\ApacheModuleSpelingR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleSpelingR/ 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)\ApacheModuleSpeling.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\ /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" LINK32_OBJS= \ @@ -117,32 +149,14 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleSpeling.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\ + /FD /c CPP_OBJS=.\ApacheModuleSpelingD/ CPP_SBRS=. -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleSpeling.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)\ApacheModuleSpeling.pdb" /debug\ - /machine:I386 /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\ - /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" -LINK32_OBJS= \ - "$(INTDIR)\mod_speling.obj" -"$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ENDIF - .c{$(CPP_OBJS)}.obj:: $(CPP) @<< $(CPP_PROJ) $< @@ -173,6 +187,30 @@ $(CPP_PROJ) $< << +MTL=midl.exe +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleSpeling.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:yes\ + /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb" /debug /machine:I386\ + /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\ + /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" +LINK32_OBJS= \ + "$(INTDIR)\mod_speling.obj" + +"$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + !IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" || "$(CFG)" ==\ "ApacheModuleSpeling - Win32 Debug" @@ -181,26 +219,26 @@ !IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" DEP_CPP_MOD_S=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_S=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" @@ -210,19 +248,26 @@ !ELSEIF "$(CFG)" == "ApacheModuleSpeling - Win32 Debug" DEP_CPP_MOD_S=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ "..\..\include\http_log.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleStatus.dsp Index: ApacheModuleStatus.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleStatus.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleStatus.dsp 1999/08/24 06:45:38 1.1 +++ ApacheModuleStatus.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleStatus - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +45 -32 apache-2.0/src/os/win32/ApacheModuleStatus.mak Index: ApacheModuleStatus.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleStatus.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleStatus.mak 1999/08/24 06:45:38 1.1 +++ ApacheModuleStatus.mak 2000/02/17 23:55:12 1.2 @@ -59,9 +59,10 @@ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\ + /c CPP_OBJS=.\ApacheModuleStatusR/ CPP_SBRS=. @@ -103,9 +104,10 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleStatus.dll"\ /implib:"$(OUTDIR)\ApacheModuleStatus.lib" LINK32_OBJS= \ @@ -148,9 +150,10 @@ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP=cl.exe -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch"\ - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\ + /c CPP_OBJS=.\ApacheModuleStatusD/ CPP_SBRS=. @@ -192,10 +195,11 @@ 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"\ +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.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" @@ -215,25 +219,29 @@ !IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" DEP_CPP_MOD_S=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ "..\..\include\buff.h"\ "..\..\include\hsregex.h"\ - "..\..\include\http_conf_globals.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ "..\..\include\http_protocol.h"\ "..\..\include\httpd.h"\ - "..\..\include\scoreboard.h"\ - "..\..\include\util_script.h"\ + "..\..\include\mpm_status.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" @@ -243,24 +251,29 @@ !ELSEIF "$(CFG)" == "ApacheModuleStatus - Win32 Debug" DEP_CPP_MOD_S=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ - "..\..\include\ap_config.h"\ - "..\..\include\ap_ctype.h"\ "..\..\include\buff.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ - "..\..\include\http_log.h"\ - "..\..\include\http_main.h"\ "..\..\include\http_protocol.h"\ "..\..\include\httpd.h"\ - "..\..\include\scoreboard.h"\ - "..\..\include\util_script.h"\ + "..\..\include\mpm_status.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_lock.h"\ + "..\..\lib\apr\include\apr_mmap.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_portable.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)" 1.2 +4 -4 apache-2.0/src/os/win32/ApacheModuleUserTrack.dsp Index: ApacheModuleUserTrack.dsp =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleUserTrack.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleUserTrack.dsp 1999/08/24 06:45:38 1.1 +++ ApacheModuleUserTrack.dsp 2000/02/17 23:55:12 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 "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 ..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug" @@ -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 "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 ..\..\CoreD\ApacheCore.lib ..\..\lib\apr\Debug\aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.2 +91 -47 apache-2.0/src/os/win32/ApacheModuleUserTrack.mak Index: ApacheModuleUserTrack.mak =================================================================== RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleUserTrack.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ApacheModuleUserTrack.mak 1999/08/24 06:45:38 1.1 +++ ApacheModuleUserTrack.mak 2000/02/17 23:55:12 1.2 @@ -30,10 +30,6 @@ NULL=nul !ENDIF -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" OUTDIR=.\ApacheModuleUserTrackR @@ -62,20 +58,56 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\ - "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX\ - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ + /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= \ LINK32=link.exe -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\ - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /machine:I386\ +LINK32_FLAGS=..\..\CoreR\ApacheCore.lib ..\..\lib\apr\Release\aprlib.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib /nologo /subsystem:windows /dll /incremental:no\ + /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /machine:I386\ /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\ /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib" LINK32_OBJS= \ @@ -117,32 +149,13 @@ "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\ - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I\ + "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\ /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) @<< @@ -174,7 +187,31 @@ $(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 ..\..\lib\apr\Debug\aprlib.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" SOURCE=..\..\modules\standard\mod_usertrack.c @@ -182,25 +219,25 @@ !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" DEP_CPP_MOD_U=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"sys\stat.h"\ - {$(INCLUDE)}"sys\types.h"\ - -NODEP_CPP_MOD_U=\ - "..\..\include\ebcdic.h"\ - "..\..\include\os.h"\ - "..\..\include\sfio.h"\ "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)" @@ -210,18 +247,25 @@ !ELSEIF "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug" DEP_CPP_MOD_U=\ - "..\..\include\alloc.h"\ - "..\..\include\ap.h"\ + "..\..\include\ap_hooks.h"\ + "..\..\include\ap_iol.h"\ "..\..\include\ap_mmn.h"\ "..\..\include\buff.h"\ - "..\..\include\conf.h"\ "..\..\include\hsregex.h"\ "..\..\include\http_config.h"\ "..\..\include\http_core.h"\ + "..\..\include\http_request.h"\ "..\..\include\httpd.h"\ "..\..\include\util_uri.h"\ + "..\..\lib\apr\include\apr_errno.h"\ + "..\..\lib\apr\include\apr_file_io.h"\ + "..\..\lib\apr\include\apr_general.h"\ + "..\..\lib\apr\include\apr_lib.h"\ + "..\..\lib\apr\include\apr_network_io.h"\ + "..\..\lib\apr\include\apr_thread_proc.h"\ + "..\..\lib\apr\include\apr_time.h"\ + "..\..\lib\apr\include\apr_win.h"\ ".\os.h"\ - ".\readdir.h"\ "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"