httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/support htdigest.dsp htdigest.mak htpasswd.dsp htpasswd.mak rotatelogs.dsp rotatelogs.mak
Date Tue, 21 Mar 2000 23:26:52 GMT
stoddard    00/03/21 15:26:51

  Modified:    src/ap   ap.dsp ap.mak
               src/lib/apr aprlib.dsp aprlib.mak
               src/os/win32 ApacheModuleAuthAnon.dsp
                        ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp
                        ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp
                        ApacheModuleDigest.mak ApacheModuleExpires.dsp
                        ApacheModuleExpires.mak ApacheModuleHeaders.dsp
                        ApacheModuleHeaders.mak ApacheModuleInfo.dsp
                        ApacheModuleInfo.mak ApacheModuleRewrite.dsp
                        ApacheModuleRewrite.mak ApacheModuleSpeling.dsp
                        ApacheModuleSpeling.mak ApacheModuleStatus.dsp
                        ApacheModuleStatus.mak ApacheModuleUserTrack.dsp
                        ApacheModuleUserTrack.mak ApacheOS.dsp ApacheOS.mak
               src/support htdigest.dsp htdigest.mak htpasswd.dsp
                        htpasswd.mak rotatelogs.dsp rotatelogs.mak
  Log:
  Win32: Continue removing precompiled header support from the dsp and
  mak files.
  Submitted by:	William Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.6       +4 -2      apache-2.0/src/ap/ap.dsp
  
  Index: ap.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ap.dsp	2000/02/11 18:52:26	1.5
  +++ ap.dsp	2000/03/21 23:26:31	1.6
  @@ -39,7 +39,8 @@
   # PROP Intermediate_Dir "Release"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /I "../os/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /I "../os/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -60,7 +61,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I "../lib/apr/include" /I "../os/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I "../lib/apr/include" /I "../os/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.9       +67 -4     apache-2.0/src/ap/ap.mak
  
  Index: ap.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap.mak	2000/02/11 18:52:27	1.8
  +++ ap.mak	2000/03/21 23:26:31	1.9
  @@ -56,8 +56,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /I\
  - "../os/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "../os/win32/" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -105,8 +105,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I "../lib/apr/include"\
  - /I "../os/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch"\
  - /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + /I "../os/win32/" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -208,6 +208,9 @@
   !ENDIF 
   
   SOURCE=.\ap_hooks.c
  +
  +!IF  "$(CFG)" == "ap - Win32 Release"
  +
   DEP_CPP_AP_HO=\
   	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
  @@ -241,7 +244,38 @@
   "$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
   
   
  +!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  +
  +DEP_CPP_AP_HO=\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_hooks.h"\
  +	"..\include\ap_iol.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\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\win32\os.h"\
  +	
  +
  +"$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
  +
  +
  +!ENDIF 
  +
   SOURCE=.\ap_sha1.c
  +
  +!IF  "$(CFG)" == "ap - Win32 Release"
  +
   DEP_CPP_AP_SH=\
   	"..\include\ap.h"\
   	"..\include\ap_ac_config.h"\
  @@ -276,6 +310,35 @@
   
   "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
   
  +
  +!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  +
  +DEP_CPP_AP_SH=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_iol.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\lib\apr\include\apr_errno.h"\
  +	"..\lib\apr\include\apr_file_io.h"\
  +	"..\lib\apr\include\apr_general.h"\
  +	"..\lib\apr\include\apr_lib.h"\
  +	"..\lib\apr\include\apr_network_io.h"\
  +	"..\lib\apr\include\apr_thread_proc.h"\
  +	"..\lib\apr\include\apr_time.h"\
  +	"..\lib\apr\include\apr_win.h"\
  +	"..\os\win32\os.h"\
  +	
  +
  +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  +
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.8       +4 -2      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- aprlib.dsp	2000/01/24 20:58:15	1.7
  +++ aprlib.dsp	2000/03/21 23:26:33	1.8
  @@ -42,7 +42,8 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -68,7 +69,8 @@
   # 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 /FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.8       +215 -7    apache-2.0/src/lib/apr/aprlib.mak
  
  Index: aprlib.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- aprlib.mak	2000/01/24 20:58:13	1.7
  +++ aprlib.mak	2000/03/21 23:26:33	1.8
  @@ -93,8 +93,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I\
  - "./file_io/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\aprlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "./file_io/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
  @@ -221,7 +221,7 @@
   
   CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
    "./misc/win32" /I "./file_io/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\aprlib.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
  @@ -329,6 +329,10 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\time\win32\atime.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_ACCES=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"
  @@ -368,6 +372,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_C=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"
  @@ -395,10 +404,25 @@
   
   SOURCE=.\lib\apr_execve.c
   
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +NODEP_CPP_APR_E=\
  +	".\lib\apr_config.h"\
  +	
  +
   "$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
  +
  +"$(INTDIR)\apr_execve.obj" : $(SOURCE) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ENDIF 
  +
   SOURCE=.\lib\apr_fnmatch.c
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
  @@ -412,6 +436,11 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_F=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) $(DEP_CPP_APR_F) "$(INTDIR)"
  @@ -450,6 +479,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_G=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"
  @@ -488,7 +522,12 @@
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_APR_M=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
  +	
   
   "$(INTDIR)\apr_md5.obj" : $(SOURCE) $(DEP_CPP_APR_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -530,6 +569,12 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_P=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"
  @@ -572,11 +617,16 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_S=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
  +	".\lib\http_log.h"\
   	
   CPP_SWITCHES=/nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I\
    "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
  - "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\aprlib.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   
   "$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) @<<
  @@ -598,8 +648,7 @@
   	
   CPP_SWITCHES=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I\
    "./misc/win32" /I "./file_io/win32" /I "./misc/win32/" /I "./file_io/win32/" /D\
  - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\aprlib.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   
   "$(INTDIR)\apr_slack.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) @<<
  @@ -610,6 +659,31 @@
   !ENDIF 
   
   SOURCE=.\lib\apr_snprintf.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_APR_SN=\
  +	".\include\apr_errno.h"\
  +	".\include\apr_file_io.h"\
  +	".\include\apr_general.h"\
  +	".\include\apr_lib.h"\
  +	".\include\apr_thread_proc.h"\
  +	".\include\apr_time.h"\
  +	".\include\apr_win.h"\
  +	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_SN=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
  +	
  +
  +"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_SN) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
   DEP_CPP_APR_SN=\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
  @@ -625,6 +699,8 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ENDIF 
  +
   SOURCE=.\lib\apr_tables.c
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
  @@ -641,6 +717,11 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_APR_T=\
  +	".\include\apr.h"\
  +	".\lib\apr_config.h"\
   	
   
   "$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"
  @@ -687,6 +768,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_DIR_C=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"
  @@ -732,7 +818,12 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_FILEA=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -774,6 +865,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_FILED=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"
  @@ -816,6 +912,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_FILES=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
  @@ -855,7 +956,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_GETOP=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -895,6 +1000,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\locks\win32\locks.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_LOCKS=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"
  @@ -936,6 +1045,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_NAMES=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"
  @@ -979,7 +1093,12 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_OPEN_=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1024,6 +1143,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_PIPE_=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"
  @@ -1065,7 +1189,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_POLL_=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1110,6 +1238,11 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_PROC_=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)"
  @@ -1142,6 +1275,20 @@
   !ENDIF 
   
   SOURCE=.\file_io\win32\readdir.c
  +
  +!IF  "$(CFG)" == "aprlib - Win32 Release"
  +
  +DEP_CPP_READD=\
  +	".\file_io\win32\readdir.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +
  +"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +
   DEP_CPP_READD=\
   	".\file_io\win32\readdir.h"\
   	
  @@ -1150,6 +1297,8 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ENDIF 
  +
   SOURCE=.\file_io\win32\readwrite.c
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
  @@ -1165,7 +1314,12 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_READW=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1207,6 +1361,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SEEK_=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"
  @@ -1239,16 +1398,24 @@
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
   DEP_CPP_SENDR=\
  +	".\file_io\win32\fileio.h"\
   	".\include\apr_errno.h"\
   	".\include\apr_file_io.h"\
   	".\include\apr_general.h"\
   	".\include\apr_lib.h"\
   	".\include\apr_network_io.h"\
  +	".\include\apr_pools.h"\
   	".\include\apr_thread_proc.h"\
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
  +	".\include\apr_winconfig.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_SENDR=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1293,6 +1460,11 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SIGNA=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"
  @@ -1335,6 +1507,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SOCKA=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"
  @@ -1377,7 +1553,11 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_SOCKE=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1419,6 +1599,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\network_io\win32\networkio.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_SOCKO=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"
  @@ -1461,6 +1645,10 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\misc\win32\misc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_START=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
  @@ -1506,7 +1694,11 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_THREA=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1547,6 +1739,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_THREAD=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"
  @@ -1587,6 +1783,10 @@
   	".\include\apr_time.h"\
   	".\include\apr_win.h"\
   	".\threadproc\win32\threadproc.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_THREADP=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"
  @@ -1632,7 +1832,11 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\time\win32\atime.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_TIME_=\
  +	".\include\apr.h"\
  +	
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -1677,6 +1881,10 @@
   	".\include\apr_win.h"\
   	".\include\apr_winconfig.h"\
   	".\time\win32\atime.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_TIMES=\
  +	".\include\apr.h"\
   	
   
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleAuthAnon.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleAuthAnon.dsp	2000/03/21 23:26:34	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +31 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleAuthAnon.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleAuthAnon.mak	2000/03/21 23:26:34	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
   
   OUTDIR=.\ApacheModuleAuthAnonR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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
  @@ -243,6 +207,10 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_A=\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleCERNMeta.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleCERNMeta.dsp	2000/03/21 23:26:34	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +36 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleCERNMeta.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleCERNMeta.mak	2000/03/21 23:26:35	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
   
   OUTDIR=.\ApacheModuleCERNMetaR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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
  @@ -219,6 +183,7 @@
   !IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
   
   DEP_CPP_MOD_C=\
  +	"..\..\include\ap_ac_config.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_hooks.h"\
  @@ -241,6 +206,14 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_C=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ap_config_win32.h"\
  +	"..\..\include\apr.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleDigest.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleDigest.dsp	2000/03/21 23:26:35	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +31 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleDigest.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleDigest.mak	2000/03/21 23:26:35	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
   
   OUTDIR=.\ApacheModuleDigestR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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"
   SOURCE=..\..\modules\standard\mod_digest.c
  @@ -245,6 +209,10 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_D=\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleExpires.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleExpires.dsp	2000/03/21 23:26:35	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +36 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleExpires.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleExpires.mak	2000/03/21 23:26:35	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
   
   OUTDIR=.\ApacheModuleExpiresR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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"
   SOURCE=..\..\modules\standard\mod_expires.c
  @@ -219,6 +183,7 @@
   !IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
   
   DEP_CPP_MOD_E=\
  +	"..\..\include\ap_ac_config.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_hooks.h"\
  @@ -240,6 +205,14 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_E=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ap_config_win32.h"\
  +	"..\..\include\apr.h"\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleHeaders.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleHeaders.dsp	2000/03/21 23:26:36	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +31 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleHeaders.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleHeaders.mak	2000/03/21 23:26:36	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
   
   OUTDIR=.\ApacheModuleHeadersR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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"
   SOURCE=..\..\modules\standard\mod_headers.c
  @@ -237,6 +201,10 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_H=\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleInfo.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleInfo.dsp	2000/03/21 23:26:36	1.3
  @@ -44,7 +44,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -70,7 +71,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +26 -74    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleInfo.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleInfo.mak	2000/03/21 23:26:36	1.3
  @@ -29,6 +29,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
   
   OUTDIR=.\ApacheModuleInfoR
  @@ -57,47 +61,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -147,13 +116,31 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
   
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
  @@ -185,36 +172,10 @@
      $(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\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -251,15 +212,6 @@
   "$(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.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleRewrite.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleRewrite.dsp	2000/03/21 23:26:36	1.3
  @@ -45,7 +45,8 @@
   # 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" /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 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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /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 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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +38 -106   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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleRewrite.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleRewrite.mak	2000/03/21 23:26:37	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
   
   OUTDIR=.\ApacheModuleRewriteR
  @@ -59,48 +63,13 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -153,14 +122,34 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
   
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
  @@ -192,39 +181,12 @@
      $(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"
   SOURCE=..\..\modules\standard\mod_rewrite.c
  -
  -!IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
  -
   DEP_CPP_MOD_R=\
  +	"..\..\include\ap_ac_config.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_hooks.h"\
  @@ -254,51 +216,21 @@
   	"..\..\lib\apr\include\apr_win.h"\
   	"..\..\modules\standard\mod_rewrite.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\locking.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
  -
  -DEP_CPP_MOD_R=\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_hooks.h"\
  -	"..\..\include\ap_iol.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_conf_globals.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_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"\
  +NODEP_CPP_MOD_R=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ap_config_win32.h"\
  +	"..\..\include\apr.h"\
  +	"..\..\lib\apr\include\apr.h"\
  +	"..\..\modules\standard\unixd.h"\
   	
   
   "$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   SOURCE=.\passwd.c
   DEP_CPP_PASSW=\
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleSpeling.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleSpeling.dsp	2000/03/21 23:26:37	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +31 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleSpeling.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleSpeling.mak	2000/03/21 23:26:37	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
   
   OUTDIR=.\ApacheModuleSpelingR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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"
   SOURCE=..\..\modules\standard\mod_speling.c
  @@ -239,6 +203,10 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_S=\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleStatus.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleStatus.dsp	2000/03/21 23:26:38	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +30 -99    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleStatus.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleStatus.mak	2000/03/21 23:26:38	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
   
   OUTDIR=.\ApacheModuleStatusR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusR/
   CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
   BSC32_SBRS= \
  @@ -149,13 +118,32 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusD/
   CPP_SBRS=.
  +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib ..\..\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"
  +
  +"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
   
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
  @@ -187,37 +175,10 @@
      $(CPP_PROJ) $< 
   <<
   
  -MTL=midl.exe
  -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  -RSC=rc.exe
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib ..\..\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"
  -
  -"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
   
  -
   !IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleStatus - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_status.c
  -
  -!IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
  -
   DEP_CPP_MOD_S=\
   	"..\..\include\ap_hooks.h"\
   	"..\..\include\ap_iol.h"\
  @@ -242,45 +203,15 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  -"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
  -
  -DEP_CPP_MOD_S=\
  -	"..\..\include\ap_hooks.h"\
  -	"..\..\include\ap_iol.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\mpm_status.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\lib\apr\include\apr_errno.h"\
  -	"..\..\lib\apr\include\apr_file_io.h"\
  -	"..\..\lib\apr\include\apr_general.h"\
  -	"..\..\lib\apr\include\apr_lib.h"\
  -	"..\..\lib\apr\include\apr_lock.h"\
  -	"..\..\lib\apr\include\apr_mmap.h"\
  -	"..\..\lib\apr\include\apr_network_io.h"\
  -	"..\..\lib\apr\include\apr_portable.h"\
  -	"..\..\lib\apr\include\apr_thread_proc.h"\
  -	"..\..\lib\apr\include\apr_time.h"\
  -	"..\..\lib\apr\include\apr_win.h"\
  -	".\os.h"\
  +NODEP_CPP_MOD_S=\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleUserTrack.dsp	2000/02/17 23:55:12	1.2
  +++ ApacheModuleUserTrack.dsp	2000/03/21 23:26:38	1.3
  @@ -45,7 +45,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +72,8 @@
   # 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" /I ".\\" /I "..\..\lib\apr\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" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +31 -63    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleUserTrack.mak	2000/02/17 23:55:12	1.2
  +++ ApacheModuleUserTrack.mak	2000/03/21 23:26:38	1.3
  @@ -30,6 +30,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
   
   OUTDIR=.\ApacheModuleUserTrackR
  @@ -58,47 +62,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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= \
  @@ -149,14 +118,33 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -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 
  + /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 ..\..\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 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -187,31 +175,7 @@
      $(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
  @@ -238,6 +202,10 @@
   	"..\..\lib\apr\include\apr_time.h"\
   	"..\..\lib\apr\include\apr_win.h"\
   	".\os.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_U=\
  +	"..\..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  
  
  
  1.4       +4 -2      apache-2.0/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheOS.dsp	2000/01/24 20:50:43	1.3
  +++ ApacheOS.dsp	2000/03/21 23:26:39	1.4
  @@ -39,7 +39,8 @@
   # PROP Intermediate_Dir "ApacheOSR"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -60,7 +61,8 @@
   # PROP Intermediate_Dir "ApacheOSD"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# SUBTRACT CPP /YX
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.4       +2 -4      apache-2.0/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheOS.mak	2000/01/24 20:50:44	1.3
  +++ ApacheOS.mak	2000/03/21 23:26:39	1.4
  @@ -55,8 +55,7 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../lib/apr/include" /D "WIN32" /D\
  - "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  + "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSR/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -100,8 +99,7 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../../lib/apr/include" /D "WIN32" /D\
  - "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheOS.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  + "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheOSD/
   CPP_SBRS=.
   BSC32=bscmake.exe
  
  
  
  1.2       +4 -2      apache-2.0/src/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htdigest.dsp	1999/08/27 20:43:41	1.1
  +++ htdigest.dsp	2000/03/21 23:26:49	1.2
  @@ -42,7 +42,8 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -67,7 +68,8 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.2       +36 -118   apache-2.0/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htdigest.mak	1999/08/27 20:43:40	1.1
  +++ htdigest.mak	2000/03/21 23:26:49	1.2
  @@ -27,6 +27,9 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   OUTDIR=.
  @@ -53,43 +56,10 @@
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\release\htdigest.exe"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htdigest.pch" /YX /FD /c 
  + "_CONSOLE" /D "_MBCS" /FD /c 
   CPP_OBJS=.
   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) $< 
  -<<
  -
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
   BSC32_SBRS= \
  @@ -140,12 +110,33 @@
   	-@erase "$(OUTDIR)\debug\htdigest.ilk"
   	-@erase "$(OUTDIR)\htdigest.pdb"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\htdigest.pch" /YX /FD /c 
  + "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c 
   CPP_OBJS=.
   CPP_SBRS=.
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=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:console /incremental:yes\
  + /pdb:"$(OUTDIR)\htdigest.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\debug\htdigest.exe" /pdbtype:sept 
  +LINK32_OBJS= \
  +	"$(INTDIR)\ap_cpystrn.obj" \
  +	"$(INTDIR)\ap_getpass.obj" \
  +	"$(INTDIR)\ap_md5c.obj" \
  +	"$(INTDIR)\htdigest.obj"
   
  +"$(OUTDIR)\debug\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -176,113 +167,35 @@
      $(CPP_PROJ) $< 
   <<
   
  -RSC=rc.exe
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=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:console /incremental:yes\
  - /pdb:"$(OUTDIR)\htdigest.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\debug\htdigest.exe" /pdbtype:sept 
  -LINK32_OBJS= \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_getpass.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\htdigest.obj"
   
  -"$(OUTDIR)\debug\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
  -
   !IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" ==\
    "htdigest - Win32 Debug"
   SOURCE=..\ap\ap_cpystrn.c
  -DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_iol.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_CP=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=..\ap\ap_getpass.c
  -DEP_CPP_AP_GE=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_GE=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=..\ap\ap_md5c.c
  -DEP_CPP_AP_MD=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_MD=\
  -	"..\ap\ebcdic.h"\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=.\htdigest.c
   DEP_CPP_HTDIG=\
   	"..\include\ap.h"\
  +	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -290,7 +203,12 @@
   	
   NODEP_CPP_HTDIG=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_win32.h"\
  +	"..\include\apr.h"\
  +	"..\include\apr_win.h"\
   	"..\include\os.h"\
  +	"..\os\win32\apr_general.h"\
  +	".\apr_lib.h"\
   	
   
   "$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
  
  
  
  1.2       +11 -9     apache-2.0/src/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htpasswd.dsp	1999/08/27 20:43:41	1.1
  +++ htpasswd.dsp	2000/03/21 23:26:49	1.2
  @@ -42,7 +42,8 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
  +# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +67,8 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c
  +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -85,31 +87,31 @@
   # Name "htpasswd - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\ap\ap_cpystrn.c
  +SOURCE=..\ap\ap_base64.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_getpass.c
  +SOURCE=..\ap\ap_checkpass.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_md5c.c
  +SOURCE=..\ap\ap_cpystrn.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_snprintf.c
  +SOURCE=..\ap\ap_getpass.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_sha1.c
  +SOURCE=..\ap\ap_md5c.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_checkpass.c
  +SOURCE=..\ap\ap_sha1.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\ap\ap_base64.c
  +SOURCE=..\ap\ap_snprintf.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.2       +63 -167   apache-2.0/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- htpasswd.mak	1999/08/27 20:43:38	1.1
  +++ htpasswd.mak	2000/03/21 23:26:50	1.2
  @@ -27,6 +27,9 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +RSC=rc.exe
  +
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   OUTDIR=.\Release
  @@ -60,44 +63,11 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fp"$(INTDIR)\htpasswd.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
   BSC32_SBRS= \
  @@ -157,12 +127,36 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
  - /Fp"$(INTDIR)\htpasswd.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  + advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:yes\
  + /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept 
  +LINK32_OBJS= \
  +	"$(INTDIR)\ap_base64.obj" \
  +	"$(INTDIR)\ap_checkpass.obj" \
  +	"$(INTDIR)\ap_cpystrn.obj" \
  +	"$(INTDIR)\ap_getpass.obj" \
  +	"$(INTDIR)\ap_md5c.obj" \
  +	"$(INTDIR)\ap_sha1.obj" \
  +	"$(INTDIR)\ap_snprintf.obj" \
  +	"$(INTDIR)\htpasswd.obj"
  +
  +"$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
   
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
  @@ -194,43 +188,16 @@
      $(CPP_PROJ) $< 
   <<
   
  -RSC=rc.exe
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:yes\
  - /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept 
  -LINK32_OBJS= \
  -	"$(INTDIR)\ap_base64.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_getpass.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_snprintf.obj" \
  -	"$(INTDIR)\htpasswd.obj"
  -
  -"$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   
   !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\
    "htpasswd - Win32 Debug"
   SOURCE=..\ap\ap_base64.c
   DEP_CPP_AP_BA=\
   	"..\include\ap.h"\
  +	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
  @@ -239,7 +206,11 @@
   NODEP_CPP_AP_BA=\
   	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_win32.h"\
  +	"..\include\apr.h"\
  +	"..\include\apr_win.h"\
   	"..\include\os.h"\
  +	"..\os\win32\apr_general.h"\
   	
   
   "$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  @@ -247,109 +218,42 @@
   
   
   SOURCE=..\ap\ap_checkpass.c
  -DEP_CPP_AP_CH=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\apr.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_CH=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=..\ap\ap_cpystrn.c
  -DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_iol.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_CP=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=..\ap\ap_getpass.c
  -DEP_CPP_AP_GE=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_GE=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  +"$(INTDIR)\ap_getpass.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=..\ap\ap_md5c.c
  -DEP_CPP_AP_MD=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_MD=\
  -	"..\ap\ebcdic.h"\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=..\ap\ap_sha1.c
   DEP_CPP_AP_SH=\
   	"..\include\ap.h"\
  +	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  +	"..\include\ap_iol.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
  -	"..\include\apr.h"\
  +	"..\include\buff.h"\
   	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
  @@ -357,7 +261,16 @@
   NODEP_CPP_AP_SH=\
   	"..\ap\ebcdic.h"\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_win32.h"\
  +	"..\include\apr.h"\
  +	"..\include\apr_errno.h"\
  +	"..\include\apr_general.h"\
  +	"..\include\apr_lib.h"\
  +	"..\include\apr_network_io.h"\
  +	"..\include\apr_time.h"\
  +	"..\include\apr_win.h"\
   	"..\include\os.h"\
  +	"..\os\win32\apr_general.h"\
   	
   
   "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  @@ -365,51 +278,34 @@
   
   
   SOURCE=..\ap\ap_snprintf.c
  -DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_iol.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\apr.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_AP_SN=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ebcdic.h"\
  -	"..\include\os.h"\
  -	
   
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   SOURCE=.\htpasswd.c
   DEP_CPP_HTPAS=\
   	"..\include\ap.h"\
  +	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
  -	"..\include\apr.h"\
   	"..\include\hsregex.h"\
  -	"..\os\win32\getopt.h"\
   	"..\os\win32\os.h"\
   	{$(INCLUDE)}"sys\stat.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTPAS=\
   	"..\include\ap_config_auto.h"\
  +	"..\include\ap_config_win32.h"\
  +	"..\include\apr.h"\
  +	"..\include\apr_win.h"\
   	"..\include\os.h"\
  +	"..\os\win32\apr_general.h"\
  +	"..\os\win32\getopt.h"\
  +	".\apr_lib.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
  
  
  
  1.2       +4 -2      apache-2.0/src/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rotatelogs.dsp	2000/02/16 18:00:22	1.1
  +++ rotatelogs.dsp	2000/03/21 23:26:50	1.2
  @@ -42,7 +42,8 @@
   # PROP Intermediate_Dir "Release"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -65,7 +66,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  
  
  
  1.2       +3 -3      apache-2.0/src/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rotatelogs.mak	2000/02/16 18:00:22	1.1
  +++ rotatelogs.mak	2000/03/21 23:26:50	1.2
  @@ -58,8 +58,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
  - "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rotatelogs.pch" /YX\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -110,7 +110,7 @@
   
   CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "../include" /I\
    "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
  - /Fp"$(INTDIR)\rotatelogs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  
  
  

Mime
View raw message