httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/support htdigest.dsp htdigest.mak htpasswd.dsp htpasswd.mak logresolve.dsp logresolve.mak rotatelogs.dsp rotatelogs.mak
Date Fri, 23 Jun 2000 00:18:36 GMT
wrowe       00/06/22 17:18:34

  Modified:    src      Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak
               src/ap   ap.dsp ap.mak
               src/lib/expat-lite xmlparse.dsp xmlparse.mak xmltok.dsp
                        xmltok.mak
               src/main gen_test_char.dsp gen_test_char.mak
                        gen_uri_delims.dsp gen_uri_delims.mak
               src/modules/proxy ApacheModuleProxy.dsp
                        ApacheModuleProxy.mak
               src/os/win32 ApacheModuleAuthAnon.dsp
                        ApacheModuleAuthAnon.mak ApacheModuleAuthDigest.dsp
                        ApacheModuleAuthDigest.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 MakeModuleMak.mak
               src/os/win32/installer/installdll install.dsp install.mak
               src/os/win32/installer/installdll/test test.mak
               src/support htdigest.dsp htdigest.mak htpasswd.dsp
                        htpasswd.mak logresolve.dsp logresolve.mak
                        rotatelogs.dsp rotatelogs.mak
  Log:
    Revise the Win32 Build for three purposes;
  
      1) Remove libraries specified under the Apache.dsw 'dependencies' to
         eliminate duplicate link references in .mak files.  Exporting all
         make files from Apache.dsw, or building applications dependent on
         libraries within the IDE both consistently add the libraries to
         the linkage.
      2) Add the include path os/win32 to .dsp projects as appropriate,
         mostly to resolve to os.h in a manner consistent with unix.
      3) Remove entirely useless libraries that are auto included by MSVC.
  
    These changes level the field for deployment of other Win32 compilers.
  
    No source files were harmed durring this production :)
  
  Revision  Changes    Path
  1.11      +9 -2      apache-1.3/src/Apache.dsp
  
  Index: Apache.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Apache.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Apache.dsp	2000/06/08 14:18:33	1.10
  +++ Apache.dsp	2000/06/23 00:17:51	1.11
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /map /machine:I386
  +# ADD LINK32 /nologo /subsystem:console /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
   
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
  -# ADD LINK32 CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
  +# ADD LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  @@ -104,6 +104,13 @@
   # Begin Source File
   
   SOURCE=.\os\win32\apache.rc
  +
  +!IF  "$(CFG)" == "Apache - Win32 Release"
  +
  +!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  +
  +!ENDIF 
  +
   # End Source File
   # End Group
   # End Target
  
  
  
  1.10      +6 -8      apache-1.3/src/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Apache.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Apache.mak	2000/05/10 20:43:33	1.9
  +++ Apache.mak	2000/06/23 00:17:52	1.10
  @@ -70,10 +70,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\
  - /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map"\
  - /machine:I386 /out:"$(OUTDIR)\Apache.exe" 
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
  + /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /machine:I386\
  + /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\apache.res" \
   	"$(INTDIR)\main_win32.obj" \
  @@ -128,10 +127,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console\
  - /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /debug\
  - /machine:I386 /out:"$(OUTDIR)\Apache.exe" 
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
  + /pdb:"$(OUTDIR)\Apache.pdb" /map:"$(INTDIR)\Apache.map" /debug /machine:I386\
  + /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\apache.res" \
   	"$(INTDIR)\main_win32.obj" \
  
  
  
  1.34      +6 -6      apache-1.3/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.dsp,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ApacheCore.dsp	2000/06/22 23:22:16	1.33
  +++ ApacheCore.dsp	2000/06/23 00:17:52	1.34
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
  -# ADD LINK32 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
  -# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
   
   !ENDIF 
   
  @@ -264,11 +264,11 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  -SOURCE=.\include\ap_alloc.h
  +SOURCE=.\include\ap.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\include\ap.h
  +SOURCE=.\include\ap_alloc.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.45      +340 -1257 apache-1.3/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- ApacheCore.mak	2000/06/22 23:22:17	1.44
  +++ ApacheCore.mak	2000/06/23 00:17:53	1.45
  @@ -109,8 +109,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /I ".\os\win32" /D "NDEBUG" /D\
  + "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -119,12 +120,11 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib\
  - ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  - /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /map:"$(INTDIR)\ApacheCore.map"\
  - /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
  - /implib:"$(OUTDIR)\ApacheCore.lib" /base:@"os\win32\BaseAddr.ref",ApacheCore 
  +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo\
  + /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb"\
  + /map:"$(INTDIR)\ApacheCore.map" /machine:I386 /def:".\ApacheCore.def"\
  + /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"\
  + /base:@"os\win32\BaseAddr.ref",ApacheCore 
   DEF_FILE= \
   	".\ApacheCore.def"
   LINK32_OBJS= \
  @@ -258,9 +258,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /D "_DEBUG" /D "WIN32"\
  - /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\
  - 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I ".\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -269,10 +269,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib\
  - ap\Debug\ap.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)\ApacheCore.pdb"\
  +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo\
  + /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb"\
    /map:"$(INTDIR)\ApacheCore.map" /debug /machine:I386 /def:".\ApacheCore.def"\
    /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"\
    /base:@"os\win32\BaseAddr.ref",ApacheCore 
  @@ -365,34 +363,9 @@
   !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
    "ApacheCore - Win32 Debug"
   SOURCE=.\main\alloc.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_ALLOC=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\multithread.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_ALLOC=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -405,42 +378,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_ALLOC=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\buff.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_BUFF_=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_BUFF_=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -453,39 +404,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_BUFF_=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\buildmark.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_BUILD=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_BUILD=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -496,12 +428,15 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_BUILD=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\buildmark.obj" : $(SOURCE) $(DEP_CPP_BUILD) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\os\win32\getopt.c
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)"
  @@ -509,39 +444,9 @@
   
   
   SOURCE=.\main\http_config.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_HTTP_=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\explain.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_request.h"\
  -	".\include\http_vhost.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_HTTP_=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -559,20 +464,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_HTTP_=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\http_core.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_HTTP_C=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_md5.h"\
  @@ -596,78 +501,89 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_HTTP_C=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_C=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\main\http_log.c
  +DEP_CPP_HTTP_L=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  -	".\include\ap_md5.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
   	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
   	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\rfc1413.h"\
  -	".\include\scoreboard.h"\
  -	".\include\util_md5.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_HTTP_L=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
  +"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_log.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_L=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\main\http_main.c
  +DEP_CPP_HTTP_M=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  +	".\include\explain.h"\
   	".\include\hsregex.h"\
   	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
   	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
  +	".\include\http_request.h"\
  +	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  +	".\include\multithread.h"\
  +	".\include\scoreboard.h"\
  +	".\include\util_script.h"\
   	".\include\util_uri.h"\
  +	".\os\win32\getopt.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
  +	".\os\win32\registry.h"\
  +	".\os\win32\service.h"\
  +	
  +NODEP_CPP_HTTP_M=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	".\main\xmlparse.h"\
   	
   
  -"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
  +"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_L=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\main\http_protocol.c
  +DEP_CPP_HTTP_P=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -678,30 +594,34 @@
   	".\include\http_core.h"\
   	".\include\http_log.h"\
   	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
  +	".\include\http_request.h"\
  +	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  +	".\include\util_date.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_HTTP_P=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
  +"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_main.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_M=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\main\http_request.c
  +DEP_CPP_HTTP_R=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\explain.h"\
  +	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
   	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
  @@ -710,102 +630,88 @@
   	".\include\http_main.h"\
   	".\include\http_protocol.h"\
   	".\include\http_request.h"\
  -	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\multithread.h"\
   	".\include\scoreboard.h"\
  -	".\include\util_script.h"\
   	".\include\util_uri.h"\
  -	".\os\win32\getopt.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
  -	".\os\win32\registry.h"\
  -	".\os\win32\service.h"\
   	
  +NODEP_CPP_HTTP_R=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
  +"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_M=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\main\http_vhost.c
  +DEP_CPP_HTTP_V=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\explain.h"\
   	".\include\hsregex.h"\
   	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
  -	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_main.h"\
   	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\multithread.h"\
  -	".\include\scoreboard.h"\
  -	".\include\util_script.h"\
   	".\include\util_uri.h"\
  -	".\os\win32\getopt.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
  -	".\os\win32\registry.h"\
  -	".\os\win32\service.h"\
   	
  +NODEP_CPP_HTTP_V=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
  +"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
  -SOURCE=.\main\http_protocol.c
  -DEP_CPP_HTTP_P=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_access.c
  +DEP_CPP_MOD_A=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
   	".\include\http_request.h"\
  -	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\util_date.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_A=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
  +"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -SOURCE=.\main\http_request.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_R=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_actions.c
  +DEP_CPP_MOD_AC=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  @@ -813,108 +719,80 @@
   	".\include\http_protocol.h"\
   	".\include\http_request.h"\
   	".\include\httpd.h"\
  -	".\include\scoreboard.h"\
  +	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_AC=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
  +"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_HTTP_R=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_alias.c
  +DEP_CPP_MOD_AL=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
   	".\include\httpd.h"\
  -	".\include\scoreboard.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  -
  -"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_vhost.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_HTTP_V=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
  -	".\include\http_config.h"\
  -	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_vhost.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  +NODEP_CPP_MOD_AL=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
   	
   
  -"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
  +"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_HTTP_V=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_asis.c
  +DEP_CPP_MOD_AS=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
   	".\include\http_log.h"\
  +	".\include\http_main.h"\
   	".\include\http_protocol.h"\
  -	".\include\http_vhost.h"\
  +	".\include\http_request.h"\
   	".\include\httpd.h"\
  +	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_AS=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
  +"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_access.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_A=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_auth.c
  +DEP_CPP_MOD_AU=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -923,55 +801,64 @@
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_request.h"\
  +	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_AU=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  +"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_A=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_autoindex.c
  +DEP_CPP_MOD_AUT=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  +	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  +	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
   	".\include\http_request.h"\
   	".\include\httpd.h"\
  +	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_AUT=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  +"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_actions.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AC=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_cgi.c
  +DEP_CPP_MOD_C=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_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"\
  @@ -984,16 +871,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_C=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
  +"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AC=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_dir.c
  +DEP_CPP_MOD_D=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -1011,20 +902,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_D=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
  +"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_alias.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AL=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_env.c
  +DEP_CPP_MOD_E=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -1036,47 +927,58 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_E=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
  +"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AL=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_imap.c
  +DEP_CPP_MOD_I=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
  +	".\include\http_core.h"\
  +	".\include\http_log.h"\
  +	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
  +	".\include\http_request.h"\
   	".\include\httpd.h"\
  +	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_I=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
  +"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_asis.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AS=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_include.c
  +DEP_CPP_MOD_IN=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
  +	".\include\http_core.h"\
   	".\include\http_log.h"\
   	".\include\http_main.h"\
   	".\include\http_protocol.h"\
  @@ -1087,24 +989,30 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_IN=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	".\modules\standard\config.h"\
  +	".\modules\standard\modules\perl\mod_perl.h"\
  +	
   
  -"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
  +"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AS=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\os\win32\mod_isapi.c
  +DEP_CPP_MOD_IS=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
  +	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_main.h"\
   	".\include\http_protocol.h"\
   	".\include\http_request.h"\
   	".\include\httpd.h"\
  @@ -1113,20 +1021,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_IS=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
  +"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_auth.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AU=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_log_config.c
  +DEP_CPP_MOD_L=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -1135,60 +1043,59 @@
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_L=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
  +"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AU=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_mime.c
  +DEP_CPP_MOD_M=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
  -	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_M=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
  +"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_autoindex.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AUT=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_negotiation.c
  +DEP_CPP_MOD_N=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_main.h"\
   	".\include\http_protocol.h"\
   	".\include\http_request.h"\
   	".\include\httpd.h"\
  @@ -1197,703 +1104,98 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_N=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  +"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_AUT=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_setenvif.c
  +DEP_CPP_MOD_S=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\fnmatch.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
   	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
   	".\include\httpd.h"\
  -	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_S=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_cgi.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_C=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_so.c
  +DEP_CPP_MOD_SO=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
  -	".\include\http_core.h"\
   	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
   	".\include\httpd.h"\
  -	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_SO=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  +"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_C=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\modules\standard\mod_userdir.c
  +DEP_CPP_MOD_U=\
   	".\include\ap.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
   	".\include\httpd.h"\
  -	".\include\util_script.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MOD_U=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_dir.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_D=\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\os\win32\modules.c
  +DEP_CPP_MODUL=\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_D=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_env.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_E=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_E=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_imap.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_I=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_I=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_include.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_IN=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_IN=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\os\win32\mod_isapi.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_IS=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_IS=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_log_config.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_L=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_L=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_mime.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_M=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_M=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_negotiation.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_N=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_N=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_setenvif.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_S=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_S=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_so.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_SO=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_SO=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_userdir.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_U=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_U=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\os\win32\modules.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MODUL=\
  -	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MODUL=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -1902,35 +1204,20 @@
   	".\include\http_config.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\os\win32\multithread.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MULTI=\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\hsregex.h"\
  -	".\include\multithread.h"\
   	".\os\win32\os.h"\
  +	".\os\win32\readdir.h"\
  +	
  +NODEP_CPP_MODUL=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
   	
   
  -"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
  +"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  +SOURCE=.\os\win32\multithread.c
   DEP_CPP_MULTI=\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1939,13 +1226,14 @@
   	".\include\multithread.h"\
   	".\os\win32\os.h"\
   	
  +NODEP_CPP_MULTI=\
  +	".\include\ap_config_auto.h"\
  +	
   
   "$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\os\win32\readdir.c
   DEP_CPP_READD=\
   	".\os\win32\readdir.h"\
  @@ -1956,33 +1244,9 @@
   
   
   SOURCE=.\os\win32\registry.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_REGIS=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_REGIS=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -1994,43 +1258,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_REGIS=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\rfc1413.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_RFC14=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\httpd.h"\
  -	".\include\rfc1413.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_RFC14=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -2044,46 +1285,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_RFC14=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\os\win32\service.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_SERVI=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\httpd.h"\
  -	".\include\multithread.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	".\os\win32\registry.h"\
  -	".\os\win32\service.h"\
  -	
  -
  -"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_SERVI=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -2100,43 +1315,20 @@
   	".\os\win32\registry.h"\
   	".\os\win32\service.h"\
   	
  +NODEP_CPP_SERVI=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\util.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_UTIL_=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\main\test_char.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_UTIL_=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -2150,17 +1342,17 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_UTIL_=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\util_date.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_UTIL_D=\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2169,57 +1361,18 @@
   	".\include\util_date.h"\
   	".\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_UTIL_D=\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\hsregex.h"\
  -	".\include\util_date.h"\
  -	".\os\win32\os.h"\
  +NODEP_CPP_UTIL_D=\
  +	".\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\util_md5.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_UTIL_M=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_md5.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\httpd.h"\
  -	".\include\util_md5.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_UTIL_M=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_md5.h"\
  @@ -2232,49 +1385,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_UTIL_M=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\util_script.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_UTIL_S=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\util_date.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_UTIL_S=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -2294,43 +1418,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_UTIL_S=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\main\util_uri.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_UTIL_U=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_conf_globals.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\main\uri_delims.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_UTIL_U=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -2344,41 +1445,20 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_UTIL_U=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\util_uri.obj" : $(SOURCE) $(DEP_CPP_UTIL_U) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\os\win32\util_win32.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_UTIL_W=\
  -	".\include\ap_alloc.h"\
   	".\include\ap.h"\
  -	".\include\ap_config.h"\
  -	".\include\ap_ctype.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\buff.h"\
  -	".\include\hsregex.h"\
  -	".\include\http_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_UTIL_W=\
   	".\include\ap_alloc.h"\
  -	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
   	".\include\ap_mmn.h"\
  @@ -2390,12 +1470,15 @@
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_UTIL_W=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
   "$(INTDIR)\util_win32.obj" : $(SOURCE) $(DEP_CPP_UTIL_W) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  
  
  
  1.10      +16 -16    apache-1.3/src/ap/ap.dsp
  
  Index: ap.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ap/ap.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap.dsp	2000/06/08 14:18:35	1.9
  +++ ap.dsp	2000/06/23 00:17:56	1.10
  @@ -40,7 +40,7 @@
   # PROP Intermediate_Dir "Release"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -61,7 +61,7 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -80,44 +80,44 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\ap_cpystrn.c
  +SOURCE=.\ap_base64.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_fnmatch.c
  +SOURCE=.\ap_checkpass.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_signal.c
  +SOURCE=.\ap_cpystrn.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_slack.c
  +SOURCE=.\ap_fnmatch.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_snprintf.c
  +SOURCE=.\ap_md5c.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter ""
  -# End Group
   # Begin Source File
   
  -SOURCE=.\ap_base64.c
  +SOURCE=.\ap_sha1.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_checkpass.c
  +SOURCE=.\ap_signal.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_md5c.c
  +SOURCE=.\ap_slack.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\ap_sha1.c
  +SOURCE=.\ap_snprintf.c
   # End Source File
  +# End Group
  +# Begin Group "Header Files"
  +
  +# PROP Default_Filter ""
  +# End Group
   # End Target
   # End Project
  
  
  
  1.10      +81 -384   apache-1.3/src/ap/ap.mak
  
  Index: ap.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ap.mak	2000/06/22 23:22:22	1.9
  +++ ap.mak	2000/06/23 00:17:56	1.10
  @@ -1,11 +1,15 @@
  -# Microsoft Developer Studio Generated NMAKE File, Based on ap.dsp
  -!IF "$(CFG)" == ""
  -CFG=ap - Win32 Debug
  -!MESSAGE No configuration specified. Defaulting to ap - Win32 Debug.
  -!ENDIF 
  +# Microsoft Developer Studio Project File - Name="ap" - Package Owner=<4>
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
  +# ** DO NOT EDIT **
  +
  +# TARGTYPE "Win32 (x86) Static Library" 0x0104
   
  -!IF "$(CFG)" != "ap - Win32 Release" && "$(CFG)" != "ap - Win32 Debug"
  -!MESSAGE Invalid configuration "$(CFG)" specified.
  +CFG=ap - Win32 Debug
  +!MESSAGE This is not a valid makefile. To build this project using NMAKE,
  +!MESSAGE use the Export Makefile command and run
  +!MESSAGE 
  +!MESSAGE NMAKE /f "ap.mak".
  +!MESSAGE 
   !MESSAGE You can specify a configuration when running NMAKE
   !MESSAGE by defining the macro CFG on the command line. For example:
   !MESSAGE 
  @@ -16,410 +20,103 @@
   !MESSAGE "ap - Win32 Release" (based on "Win32 (x86) Static Library")
   !MESSAGE "ap - Win32 Debug" (based on "Win32 (x86) Static Library")
   !MESSAGE 
  -!ERROR An invalid configuration is specified.
  -!ENDIF 
  -
  -!IF "$(OS)" == "Windows_NT"
  -NULL=
  -!ELSE 
  -NULL=nul
  -!ENDIF 
   
  +# Begin Project
  +# PROP Scc_ProjName ""
  +# PROP Scc_LocalPath ""
   CPP=cl.exe
   
   !IF  "$(CFG)" == "ap - Win32 Release"
  -
  -OUTDIR=.\Release
  -INTDIR=.\Release
  -# Begin Custom Macros
  -OutDir=.\Release
  -# End Custom Macros
  -
  -!IF "$(RECURSE)" == "0" 
  -
  -ALL : "$(OUTDIR)\ap.lib"
   
  -!ELSE 
  -
  -ALL : "$(OUTDIR)\ap.lib"
  -
  -!ENDIF 
  -
  -CLEAN :
  -	-@erase "$(INTDIR)\ap_base64.obj"
  -	-@erase "$(INTDIR)\ap_checkpass.obj"
  -	-@erase "$(INTDIR)\ap_cpystrn.obj"
  -	-@erase "$(INTDIR)\ap_fnmatch.obj"
  -	-@erase "$(INTDIR)\ap_md5c.obj"
  -	-@erase "$(INTDIR)\ap_sha1.obj"
  -	-@erase "$(INTDIR)\ap_signal.obj"
  -	-@erase "$(INTDIR)\ap_slack.obj"
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(OUTDIR)\ap.lib"
  -
  -"$(OUTDIR)" :
  -    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  -
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D\
  - "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\Release/
  -CPP_SBRS=.
  +# PROP BASE Use_MFC 0
  +# PROP BASE Use_Debug_Libraries 0
  +# PROP BASE Output_Dir "Release"
  +# PROP BASE Intermediate_Dir "Release"
  +# PROP BASE Target_Dir ""
  +# PROP Use_MFC 0
  +# PROP Use_Debug_Libraries 0
  +# PROP Output_Dir "Release"
  +# PROP Intermediate_Dir "Release"
  +# PROP Target_Dir ""
  +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" 
  -BSC32_SBRS= \
  -	
  +# ADD BASE BSC32 /nologo
  +# ADD BSC32 /nologo
   LIB32=link.exe -lib
  -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib" 
  -LIB32_OBJS= \
  -	"$(INTDIR)\ap_base64.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_fnmatch.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_signal.obj" \
  -	"$(INTDIR)\ap_slack.obj" \
  -	"$(INTDIR)\ap_snprintf.obj"
  -
  -"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  -    $(LIB32) @<<
  -  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  -<<
  +# ADD BASE LIB32 /nologo
  +# ADD LIB32 /nologo
   
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -OUTDIR=.\Debug
  -INTDIR=.\Debug
  -# Begin Custom Macros
  -OutDir=.\Debug
  -# End Custom Macros
  -
  -!IF "$(RECURSE)" == "0" 
   
  -ALL : "$(OUTDIR)\ap.lib"
  -
  -!ELSE 
  -
  -ALL : "$(OUTDIR)\ap.lib"
  -
  -!ENDIF 
  -
  -CLEAN :
  -	-@erase "$(INTDIR)\ap_base64.obj"
  -	-@erase "$(INTDIR)\ap_checkpass.obj"
  -	-@erase "$(INTDIR)\ap_cpystrn.obj"
  -	-@erase "$(INTDIR)\ap_fnmatch.obj"
  -	-@erase "$(INTDIR)\ap_md5c.obj"
  -	-@erase "$(INTDIR)\ap_sha1.obj"
  -	-@erase "$(INTDIR)\ap_signal.obj"
  -	-@erase "$(INTDIR)\ap_slack.obj"
  -	-@erase "$(INTDIR)\ap_snprintf.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(OUTDIR)\ap.lib"
  -
  -"$(OUTDIR)" :
  -    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  -
  -CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D\
  - "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\Debug/
  -CPP_SBRS=.
  +# PROP BASE Use_MFC 0
  +# PROP BASE Use_Debug_Libraries 1
  +# PROP BASE Output_Dir "Debug"
  +# PROP BASE Intermediate_Dir "Debug"
  +# PROP BASE Target_Dir ""
  +# PROP Use_MFC 0
  +# PROP Use_Debug_Libraries 1
  +# PROP Output_Dir "Debug"
  +# PROP Intermediate_Dir "Debug"
  +# PROP Target_Dir ""
  +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" 
  -BSC32_SBRS= \
  -	
  +# ADD BASE BSC32 /nologo
  +# ADD BSC32 /nologo
   LIB32=link.exe -lib
  -LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib" 
  -LIB32_OBJS= \
  -	"$(INTDIR)\ap_base64.obj" \
  -	"$(INTDIR)\ap_checkpass.obj" \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_fnmatch.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\ap_sha1.obj" \
  -	"$(INTDIR)\ap_signal.obj" \
  -	"$(INTDIR)\ap_slack.obj" \
  -	"$(INTDIR)\ap_snprintf.obj"
  -
  -"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
  -    $(LIB32) @<<
  -  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
  -<<
  -
  -!ENDIF 
  -
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -
  -!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
  -SOURCE=.\ap_cpystrn.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
  -DEP_CPP_AP_CP=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -DEP_CPP_AP_CP=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\ap_fnmatch.c
  -DEP_CPP_AP_FN=\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\fnmatch.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	
  -
  -"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
  -
  -
  -SOURCE=.\ap_signal.c
  +# ADD BASE LIB32 /nologo
  +# ADD LIB32 /nologo
   
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
  -DEP_CPP_AP_SI=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -DEP_CPP_AP_SI=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
  -
  -
   !ENDIF 
  -
  -SOURCE=.\ap_slack.c
   
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
  -DEP_CPP_AP_SL=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\http_log.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  +# Begin Target
   
  -DEP_CPP_AP_SL=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\http_log.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  +# Name "ap - Win32 Release"
  +# Name "ap - Win32 Debug"
  +# Begin Group "Source Files"
   
  -"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
  +# PROP Default_Filter ""
  +# Begin Source File
   
  -
  -!ENDIF 
  -
  -SOURCE=.\ap_snprintf.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
  -DEP_CPP_AP_SN=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -DEP_CPP_AP_SN=\
  -	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  -
  -
  -!ENDIF 
  -
   SOURCE=.\ap_base64.c
  -DEP_CPP_AP_BA=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	
  -
  -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  +# End Source File
  +# Begin Source File
   
  -
   SOURCE=.\ap_checkpass.c
  -DEP_CPP_AP_CH=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	
  +# End Source File
  +# Begin Source File
   
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  +SOURCE=.\ap_cpystrn.c
  +# End Source File
  +# Begin Source File
   
  +SOURCE=.\ap_fnmatch.c
  +# End Source File
  +# Begin Source File
   
   SOURCE=.\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\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	
  +# End Source File
  +# Begin Source File
   
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  -
  -
   SOURCE=.\ap_sha1.c
  -DEP_CPP_AP_SH=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  -	
  -
  -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  +# End Source File
  +# Begin Source File
   
  -
  +SOURCE=.\ap_signal.c
  +# End Source File
  +# Begin Source File
   
  -!ENDIF 
  +SOURCE=.\ap_slack.c
  +# End Source File
  +# Begin Source File
   
  +SOURCE=.\ap_snprintf.c
  +# End Source File
  +# End Group
  +# Begin Group "Header Files"
  +
  +# PROP Default_Filter ""
  +# End Group
  +# End Target
  +# End Project
  
  
  
  1.4       +2 -2      apache-1.3/src/lib/expat-lite/xmlparse.dsp
  
  Index: xmlparse.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmlparse.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- xmlparse.dsp	2000/06/08 14:18:35	1.3
  +++ xmlparse.dsp	2000/06/23 00:17:57	1.4
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
   # SUBTRACT LINK32 /profile
   
   !ELSEIF  "$(CFG)" == "xmlparse - Win32 Debug"
  @@ -80,7 +80,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmlparse
   
   !ENDIF 
   
  
  
  
  1.3       +8 -37     apache-1.3/src/lib/expat-lite/xmlparse.mak
  
  Index: xmlparse.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmlparse.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmlparse.mak	2000/05/10 20:43:38	1.2
  +++ xmlparse.mak	2000/06/23 00:17:59	1.3
  @@ -75,9 +75,7 @@
   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:windows /dll /incremental:no\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
    /pdb:"$(OUTDIR)\xmlparse.pdb" /machine:I386 /def:".\xmlparse.def"\
    /out:"$(OUTDIR)\xmlparse.dll" /implib:"$(OUTDIR)\xmlparse.lib"\
    /base:@"..\..\os\win32\BaseAddr.ref",xmlparse 
  @@ -139,9 +137,7 @@
   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:windows /dll /incremental:no\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
    /pdb:"$(OUTDIR)\xmlparse.pdb" /debug /machine:I386 /def:".\xmlparse.def"\
    /out:"$(OUTDIR)\xmlparse.dll" /implib:"$(OUTDIR)\xmlparse.lib"\
    /base:@"..\..\os\win32\BaseAddr.ref",xmlparse 
  @@ -193,33 +189,19 @@
   !IF "$(CFG)" == "xmlparse - Win32 Release" || "$(CFG)" ==\
    "xmlparse - Win32 Debug"
   SOURCE=.\hashtable.c
  -
  -!IF  "$(CFG)" == "xmlparse - Win32 Release"
  -
   DEP_CPP_HASHT=\
   	".\hashtable.h"\
   	".\xmldef.h"\
   	
  -
  -"$(INTDIR)\hashtable.obj" : $(SOURCE) $(DEP_CPP_HASHT) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "xmlparse - Win32 Debug"
  -
  -DEP_CPP_HASHT=\
  -	".\hashtable.h"\
  -	".\xmldef.h"\
  +NODEP_CPP_HASHT=\
  +	".\ap_config.h"\
  +	".\nspr.h"\
   	
   
   "$(INTDIR)\hashtable.obj" : $(SOURCE) $(DEP_CPP_HASHT) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\xmlparse.c
  -
  -!IF  "$(CFG)" == "xmlparse - Win32 Release"
  -
   DEP_CPP_XMLPA=\
   	".\hashtable.h"\
   	".\xmldef.h"\
  @@ -227,24 +209,13 @@
   	".\xmlrole.h"\
   	".\xmltok.h"\
   	
  -
  -"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "xmlparse - Win32 Debug"
  -
  -DEP_CPP_XMLPA=\
  -	".\hashtable.h"\
  -	".\xmldef.h"\
  -	".\xmlparse.h"\
  -	".\xmlrole.h"\
  -	".\xmltok.h"\
  +NODEP_CPP_XMLPA=\
  +	".\ap_config.h"\
  +	".\nspr.h"\
   	
   
   "$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "xmlparse - Win32 Release"
   
  
  
  
  1.4       +2 -2      apache-1.3/src/lib/expat-lite/xmltok.dsp
  
  Index: xmltok.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- xmltok.dsp	2000/06/08 14:18:35	1.3
  +++ xmltok.dsp	2000/06/23 00:17:59	1.4
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmltok
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"DllMain" /subsystem:windows /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmltok
  +# ADD LINK32 /nologo /entry:"DllMain" /subsystem:windows /dll /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmltok
   
   !ELSEIF  "$(CFG)" == "xmltok - Win32 Debug"
   
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmltok
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmltok
  +# ADD LINK32 /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /base:@"..\..\os\win32\BaseAddr.ref",xmltok
   
   !ENDIF 
   
  
  
  
  1.3       +8 -43     apache-1.3/src/lib/expat-lite/xmltok.mak
  
  Index: xmltok.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmltok.mak	2000/05/10 20:43:39	1.2
  +++ xmltok.mak	2000/06/23 00:17:59	1.3
  @@ -69,9 +69,7 @@
   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 /entry:"DllMain" /subsystem:windows /dll /incremental:no\
  +LINK32_FLAGS=/nologo /entry:"DllMain" /subsystem:windows /dll /incremental:no\
    /pdb:"$(OUTDIR)\xmltok.pdb" /machine:I386 /def:".\xmltok.def"\
    /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\
    /base:@"..\..\os\win32\BaseAddr.ref",xmltok 
  @@ -129,9 +127,7 @@
   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:windows /dll /incremental:no\
  +LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\
    /pdb:"$(OUTDIR)\xmltok.pdb" /debug /machine:I386 /def:".\xmltok.def"\
    /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\
    /base:@"..\..\os\win32\BaseAddr.ref",xmltok 
  @@ -187,35 +183,20 @@
   
   
   SOURCE=.\xmlrole.c
  -
  -!IF  "$(CFG)" == "xmltok - Win32 Release"
  -
   DEP_CPP_XMLRO=\
   	".\xmldef.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
   	
  -
  -"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "xmltok - Win32 Debug"
  -
  -DEP_CPP_XMLRO=\
  -	".\xmldef.h"\
  -	".\xmlrole.h"\
  -	".\xmltok.h"\
  +NODEP_CPP_XMLRO=\
  +	".\ap_config.h"\
  +	".\nspr.h"\
   	
   
   "$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\xmltok.c
  -
  -!IF  "$(CFG)" == "xmltok - Win32 Release"
  -
   DEP_CPP_XMLTO=\
   	".\asciitab.h"\
   	".\iasciitab.h"\
  @@ -228,29 +209,13 @@
   	".\xmltok_impl.h"\
   	".\xmltok_ns.c"\
   	
  -
  -"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "xmltok - Win32 Debug"
  -
  -DEP_CPP_XMLTO=\
  -	".\asciitab.h"\
  -	".\iasciitab.h"\
  -	".\latin1tab.h"\
  -	".\nametab.h"\
  -	".\utf8tab.h"\
  -	".\xmldef.h"\
  -	".\xmltok.h"\
  -	".\xmltok_impl.c"\
  -	".\xmltok_impl.h"\
  -	".\xmltok_ns.c"\
  +NODEP_CPP_XMLTO=\
  +	".\ap_config.h"\
  +	".\nspr.h"\
   	
   
   "$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   SOURCE=.\xmltok_impl.c
   
  
  
  
  1.4       +3 -4      apache-1.3/src/main/gen_test_char.dsp
  
  Index: gen_test_char.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/gen_test_char.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen_test_char.dsp	2000/06/08 14:18:35	1.3
  +++ gen_test_char.dsp	2000/06/23 00:18:02	1.4
  @@ -42,7 +42,7 @@
   # 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 /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
   # ADD RSC /l 0x809 /d "NDEBUG"
  @@ -51,7 +51,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386
  +# ADD LINK32 /nologo /subsystem:console /machine:I386
   # Begin Special Build Tool
   SOURCE=$(InputPath)
   PostBuild_Desc=Create test_char.h
  @@ -81,8 +81,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
  -# SUBTRACT LINK32 /pdbtype:<none>
  +# ADD LINK32 /nologo /subsystem:console /incremental:no /debug /machine:I386
   # Begin Special Build Tool
   SOURCE=$(InputPath)
   PostBuild_Desc=Create test_char.h
  
  
  
  1.5       +17 -9     apache-1.3/src/main/gen_test_char.mak
  
  Index: gen_test_char.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/gen_test_char.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gen_test_char.mak	2000/06/22 23:22:28	1.4
  +++ gen_test_char.mak	2000/06/23 00:18:02	1.5
  @@ -57,8 +57,8 @@
   "$(INTDIR)" :
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\gen_test_char_R/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -66,8 +66,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\gen_test_char.pdb" /machine:I386\
    /out:"$(OUTDIR)\gen_test_char.exe" 
   LINK32_OBJS= \
  @@ -129,8 +128,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\gen_test_char.pdb" /debug /machine:I386\
    /out:"$(OUTDIR)\gen_test_char.exe" 
   LINK32_OBJS= \
  @@ -195,8 +193,8 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   DEP_CPP_GEN_T=\
  -	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  @@ -207,6 +205,11 @@
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
   	
  +NODEP_CPP_GEN_T=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
   
   "$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
   
  @@ -214,8 +217,8 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   DEP_CPP_GEN_T=\
  -	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  @@ -223,8 +226,13 @@
   	"..\include\hsregex.h"\
   	"..\include\httpd.h"\
   	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_GEN_T=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\os.h"\
  +	"..\include\sfio.h"\
   	
   
   "$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
  
  
  
  1.4       +2 -3      apache-1.3/src/main/gen_uri_delims.dsp
  
  Index: gen_uri_delims.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/gen_uri_delims.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen_uri_delims.dsp	2000/06/08 14:18:35	1.3
  +++ gen_uri_delims.dsp	2000/06/23 00:18:02	1.4
  @@ -51,7 +51,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386
  +# ADD LINK32 /nologo /subsystem:console /machine:I386
   # Begin Special Build Tool
   SOURCE=$(InputPath)
   PostBuild_Desc=Create uri_delims.h
  @@ -81,8 +81,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386
  -# SUBTRACT LINK32 /pdbtype:<none>
  +# ADD LINK32 /nologo /subsystem:console /incremental:no /debug /machine:I386
   # Begin Special Build Tool
   SOURCE=$(InputPath)
   PostBuild_Desc=Create uri_delims.h
  
  
  
  1.3       +2 -4      apache-1.3/src/main/gen_uri_delims.mak
  
  Index: gen_uri_delims.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/gen_uri_delims.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gen_uri_delims.mak	2000/05/10 20:43:41	1.2
  +++ gen_uri_delims.mak	2000/06/23 00:18:03	1.3
  @@ -67,8 +67,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\gen_uri_delims.pdb" /machine:I386\
    /out:"$(OUTDIR)\gen_uri_delims.exe" 
   LINK32_OBJS= \
  @@ -130,8 +129,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib /nologo /subsystem:console /incremental:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\gen_uri_delims.pdb" /debug /machine:I386\
    /out:"$(OUTDIR)\gen_uri_delims.exe" 
   LINK32_OBJS= \
  
  
  
  1.13      +4 -4      apache-1.3/src/modules/proxy/ApacheModuleProxy.dsp
  
  Index: ApacheModuleProxy.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.dsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ApacheModuleProxy.dsp	2000/06/08 14:18:36	1.12
  +++ ApacheModuleProxy.dsp	2000/06/23 00:18:05	1.13
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /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
  @@ -54,7 +54,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386
  +# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
  @@ -70,7 +70,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /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
  @@ -81,7 +81,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  
  
  
  1.17      +40 -203   apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
  
  Index: ApacheModuleProxy.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ApacheModuleProxy.mak	2000/06/22 23:22:35	1.16
  +++ ApacheModuleProxy.mak	2000/06/23 00:18:06	1.17
  @@ -72,9 +72,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -83,9 +83,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
  - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
  +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  + /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
    /map:"$(INTDIR)\ApacheModuleProxy.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
    /implib:"$(OUTDIR)\ApacheModuleProxy.lib" 
  @@ -143,9 +142,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D\
  + "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -154,9 +153,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
  - /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
  +LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
  + /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
    /map:"$(INTDIR)\ApacheModuleProxy.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
    /implib:"$(OUTDIR)\ApacheModuleProxy.lib" 
  @@ -210,38 +208,9 @@
   !IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleProxy - Win32 Debug"
   SOURCE=.\mod_proxy.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_MOD_P=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\explain.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\http_vhost.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  -	
  -
  -"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_MOD_P=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -259,48 +228,19 @@
   	"..\..\os\win32\readdir.h"\
   	".\mod_proxy.h"\
   	
  +NODEP_CPP_MOD_P=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\proxy_cache.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_PROXY=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_md5.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\explain.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_conf_globals.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\multithread.h"\
  -	"..\..\include\util_date.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  -	
  -
  -"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_md5.h"\
  @@ -321,44 +261,19 @@
   	"..\..\os\win32\readdir.h"\
   	".\mod_proxy.h"\
   	
  +NODEP_CPP_PROXY=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\proxy_connect.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_PROXY_=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\explain.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  -	
  -
  -"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -375,45 +290,19 @@
   	"..\..\os\win32\readdir.h"\
   	".\mod_proxy.h"\
   	
  +NODEP_CPP_PROXY_=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\proxy_ftp.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_PROXY_F=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\explain.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  -	
  -
  -"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_F=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -431,46 +320,19 @@
   	"..\..\os\win32\readdir.h"\
   	".\mod_proxy.h"\
   	
  +NODEP_CPP_PROXY_F=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\proxy_http.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_PROXY_H=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\explain.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_date.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  -	
  -
  -"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_H=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -489,47 +351,19 @@
   	"..\..\os\win32\readdir.h"\
   	".\mod_proxy.h"\
   	
  +NODEP_CPP_PROXY_H=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\proxy_util.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_PROXY_U=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_md5.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\explain.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\multithread.h"\
  -	"..\..\include\util_date.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  -	
  -
  -"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_U=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_md5.h"\
  @@ -549,11 +383,14 @@
   	"..\..\os\win32\readdir.h"\
   	".\mod_proxy.h"\
   	
  +NODEP_CPP_PROXY_U=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleAuthAnon.dsp
  
  Index: ApacheModuleAuthAnon.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleAuthAnon.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleAuthAnon.dsp	2000/06/23 00:18:07	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_auth_anon
   
   !ENDIF 
   
  
  
  
  1.15      +15 -41    apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak
  
  Index: ApacheModuleAuthAnon.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleAuthAnon.mak	2000/06/22 23:22:56	1.14
  +++ ApacheModuleAuthAnon.mak	2000/06/23 00:18:08	1.15
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleAuthAnonR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,9 +78,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"\
    /map:"$(INTDIR)\ApacheModuleAuthAnon.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
    /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib"\
  @@ -128,9 +128,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleAuthAnonD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -139,9 +139,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"\
    /map:"$(INTDIR)\ApacheModuleAuthAnon.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
    /implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib"\
  @@ -191,37 +190,9 @@
   !IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleAuthAnon - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_auth_anon.c
  -
  -!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
  -
   DEP_CPP_MOD_A=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
  -
  -DEP_CPP_MOD_A=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -237,12 +208,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_A=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
   
  
  
  
  1.4       +4 -4      apache-1.3/src/os/win32/ApacheModuleAuthDigest.dsp
  
  Index: ApacheModuleAuthDigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthDigest.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleAuthDigest.dsp	2000/06/08 14:18:38	1.3
  +++ ApacheModuleAuthDigest.dsp	2000/06/23 00:18:09	1.4
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # 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"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_auth_digest
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_digest
  +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_auth_digest
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # 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"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /base:@"BaseAddr.ref",mod_auth_digest
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /pdbtype:sept /base:@"BaseAddr.ref",mod_auth_digest
  +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /pdbtype:sept /base:@"BaseAddr.ref",mod_auth_digest
   
   !ENDIF 
   
  
  
  
  1.4       +9 -47     apache-1.3/src/os/win32/ApacheModuleAuthDigest.mak
  
  Index: ApacheModuleAuthDigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthDigest.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleAuthDigest.mak	2000/06/22 23:22:57	1.3
  +++ ApacheModuleAuthDigest.mak	2000/06/23 00:18:09	1.4
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleAuthDigestR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
  @@ -77,9 +78,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
  - uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
  +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\
    /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthDigest.pdb"\
    /map:"$(INTDIR)\ApacheModuleAuthDigest.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleAuthDigest.dll"\
  @@ -129,9 +128,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleAuthDigestD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
  @@ -140,9 +139,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
  - uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll\
  +LINK32_FLAGS=kernel32.lib advapi32.lib /nologo /subsystem:windows /dll\
    /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthDigest.pdb"\
    /map:"$(INTDIR)\ApacheModuleAuthDigest.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleAuthDigest.dll"\
  @@ -223,12 +220,9 @@
   !ENDIF 
   
   SOURCE=..\..\modules\experimental\mod_auth_digest.c
  -
  -!IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
  -
   DEP_CPP_MOD_A=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_md5.h"\
  @@ -251,7 +245,6 @@
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
   	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
   	"..\..\include\sfio.h"\
   	"..\..\modules\experimental\mm.h"\
   	
  @@ -259,37 +252,6 @@
   "$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
  -
  -DEP_CPP_MOD_A=\
  -	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_md5.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\ap_sha1.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_conf_globals.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_md5.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleCERNMeta.dsp
  
  Index: ApacheModuleCERNMeta.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleCERNMeta.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleCERNMeta.dsp	2000/06/23 00:18:09	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
   
   !ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_cern_meta
   
   !ENDIF 
   
  
  
  
  1.15      +15 -40    apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak
  
  Index: ApacheModuleCERNMeta.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleCERNMeta.mak	2000/06/22 23:22:57	1.14
  +++ ApacheModuleCERNMeta.mak	2000/06/23 00:18:09	1.15
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleCERNMetaR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,9 +78,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"\
    /map:"$(INTDIR)\ApacheModuleCERNMeta.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
    /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib"\
  @@ -128,9 +128,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleCERNMetaD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -139,9 +139,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"\
    /map:"$(INTDIR)\ApacheModuleCERNMeta.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
    /implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib"\
  @@ -191,36 +190,9 @@
   !IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleCERNMeta - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_cern_meta.c
  -
  -!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
  -
   DEP_CPP_MOD_C=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
  -
  -DEP_CPP_MOD_C=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -235,12 +207,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_C=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleDigest.dsp
  
  Index: ApacheModuleDigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleDigest.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleDigest.dsp	2000/06/23 00:18:09	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_digest
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_digest
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_digest
   
   !ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_digest
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_digest
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_digest
   
   !ENDIF 
   
  
  
  
  1.16      +17 -46    apache-1.3/src/os/win32/ApacheModuleDigest.mak
  
  Index: ApacheModuleDigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApacheModuleDigest.mak	2000/06/22 23:22:57	1.15
  +++ ApacheModuleDigest.mak	2000/06/23 00:18:10	1.16
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleDigestR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,11 +78,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb"\
  - /map:"$(INTDIR)\ApacheModuleDigest.map" /machine:I386\
  - /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /map:"$(INTDIR)\ApacheModuleDigest.map"\
  + /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
    /implib:"$(OUTDIR)\ApacheModuleDigest.lib" /base:@"BaseAddr.ref",mod_digest 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_digest.obj" \
  @@ -127,9 +126,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleDigestD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -138,11 +137,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb"\
  - /map:"$(INTDIR)\ApacheModuleDigest.map" /debug /machine:I386\
  - /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /map:"$(INTDIR)\ApacheModuleDigest.map"\
  + /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
    /implib:"$(OUTDIR)\ApacheModuleDigest.lib" /base:@"BaseAddr.ref",mod_digest 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_digest.obj" \
  @@ -189,38 +186,9 @@
   !IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleDigest - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_digest.c
  -
  -!IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
  -
   DEP_CPP_MOD_D=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_md5.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_md5.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
  -
  -DEP_CPP_MOD_D=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_md5.h"\
  @@ -237,12 +205,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_D=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleExpires.dsp
  
  Index: ApacheModuleExpires.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleExpires.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleExpires.dsp	2000/06/23 00:18:11	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_expires
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_expires
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_expires
   
   !ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_expires
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_expires
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_expires
   
   !ENDIF 
   
  
  
  
  1.15      +15 -38    apache-1.3/src/os/win32/ApacheModuleExpires.mak
  
  Index: ApacheModuleExpires.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleExpires.mak	2000/06/22 23:22:57	1.14
  +++ ApacheModuleExpires.mak	2000/06/23 00:18:11	1.15
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleExpiresR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,9 +78,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb"\
    /map:"$(INTDIR)\ApacheModuleExpires.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleExpires.dll"\
    /implib:"$(OUTDIR)\ApacheModuleExpires.lib" /base:@"BaseAddr.ref",mod_expires 
  @@ -127,9 +127,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleExpiresD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -138,9 +138,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb"\
    /map:"$(INTDIR)\ApacheModuleExpires.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleExpires.dll"\
    /implib:"$(OUTDIR)\ApacheModuleExpires.lib" /base:@"BaseAddr.ref",mod_expires 
  @@ -189,34 +188,9 @@
   !IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleExpires - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_expires.c
  -
  -!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
  -
   DEP_CPP_MOD_E=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
  -
  -DEP_CPP_MOD_E=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -229,12 +203,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_E=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleHeaders.dsp
  
  Index: ApacheModuleHeaders.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleHeaders.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleHeaders.dsp	2000/06/23 00:18:11	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_headers
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_headers
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_headers
   
   !ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_headers
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_headers
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_headers
   
   !ENDIF 
   
  
  
  
  1.15      +15 -37    apache-1.3/src/os/win32/ApacheModuleHeaders.mak
  
  Index: ApacheModuleHeaders.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleHeaders.mak	2000/06/22 23:22:57	1.14
  +++ ApacheModuleHeaders.mak	2000/06/23 00:18:12	1.15
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleHeadersR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,9 +78,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb"\
    /map:"$(INTDIR)\ApacheModuleHeaders.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
    /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" /base:@"BaseAddr.ref",mod_headers 
  @@ -127,9 +127,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleHeadersD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -138,9 +138,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb"\
    /map:"$(INTDIR)\ApacheModuleHeaders.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
    /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" /base:@"BaseAddr.ref",mod_headers 
  @@ -189,33 +188,9 @@
   !IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleHeaders - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_headers.c
  -
  -!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
  -
   DEP_CPP_MOD_H=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
  -
  -DEP_CPP_MOD_H=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -227,12 +202,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_H=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleInfo.dsp
  
  Index: ApacheModuleInfo.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleInfo.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleInfo.dsp	2000/06/23 00:18:12	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_info
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_info
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_info
   
   !ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_info
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_info
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_info
   
   !ENDIF 
   
  
  
  
  1.12      +19 -49    apache-1.3/src/os/win32/ApacheModuleInfo.mak
  
  Index: ApacheModuleInfo.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheModuleInfo.mak	2000/06/22 23:22:57	1.11
  +++ ApacheModuleInfo.mak	2000/06/23 00:18:13	1.12
  @@ -66,8 +66,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleInfoR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -76,12 +77,10 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb"\
  - /map:"$(INTDIR)\ApacheModuleInfo.map" /machine:I386\
  - /out:"$(OUTDIR)\ApacheModuleInfo.dll" /implib:"$(OUTDIR)\ApacheModuleInfo.lib"\
  - /base:@"BaseAddr.ref",mod_info 
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /map:"$(INTDIR)\ApacheModuleInfo.map"\
  + /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\
  + /implib:"$(OUTDIR)\ApacheModuleInfo.lib" /base:@"BaseAddr.ref",mod_info 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_info.obj" \
   	"..\..\CoreR\ApacheCore.lib"
  @@ -126,9 +125,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleInfoD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -137,12 +136,10 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb"\
  - /map:"$(INTDIR)\ApacheModuleInfo.map" /debug /machine:I386\
  - /out:"$(OUTDIR)\ApacheModuleInfo.dll" /implib:"$(OUTDIR)\ApacheModuleInfo.lib"\
  - /base:@"BaseAddr.ref",mod_info 
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /map:"$(INTDIR)\ApacheModuleInfo.map"\
  + /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\
  + /implib:"$(OUTDIR)\ApacheModuleInfo.lib" /base:@"BaseAddr.ref",mod_info 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_info.obj" \
   	"..\..\CoreD\ApacheCore.lib"
  @@ -188,39 +185,9 @@
   !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_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_conf_globals.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
  -
  -DEP_CPP_MOD_I=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -238,12 +205,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_I=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
   
  
  
  
  1.14      +4 -4      apache-1.3/src/os/win32/ApacheModuleRewrite.dsp
  
  Index: ApacheModuleRewrite.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheModuleRewrite.dsp	2000/06/08 14:18:38	1.13
  +++ ApacheModuleRewrite.dsp	2000/06/23 00:18:13	1.14
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
   
   !ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_rewrite
   
   !ENDIF 
   
  
  
  
  1.16      +14 -44    apache-1.3/src/os/win32/ApacheModuleRewrite.mak
  
  Index: ApacheModuleRewrite.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApacheModuleRewrite.mak	2000/06/22 23:22:58	1.15
  +++ ApacheModuleRewrite.mak	2000/06/23 00:18:14	1.16
  @@ -68,9 +68,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\
  + "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleRewriteR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -79,9 +79,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
  - /subsystem:windows /dll /incremental:no\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
    /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb"\
    /map:"$(INTDIR)\ApacheModuleRewrite.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
  @@ -132,9 +130,10 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D\
  - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D\
  + "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  + /c 
   CPP_OBJS=.\ApacheModuleRewriteD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -143,9 +142,7 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo\
  - /subsystem:windows /dll /incremental:no\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
    /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb"\
    /map:"$(INTDIR)\ApacheModuleRewrite.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
  @@ -196,39 +193,9 @@
   !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_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_conf_globals.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\http_vhost.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\modules\standard\mod_rewrite.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(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_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -246,12 +213,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_R=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   SOURCE=.\passwd.c
   DEP_CPP_PASSW=\
  
  
  
  1.7       +4 -4      apache-1.3/src/os/win32/ApacheModuleSpeling.dsp
  
  Index: ApacheModuleSpeling.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleSpeling.dsp	2000/06/08 14:18:38	1.6
  +++ ApacheModuleSpeling.dsp	2000/06/23 00:18:14	1.7
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_speling
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_speling
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_speling
   
   !ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_speling
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_speling
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_speling
   
   !ENDIF 
   
  
  
  
  1.9       +15 -39    apache-1.3/src/os/win32/ApacheModuleSpeling.mak
  
  Index: ApacheModuleSpeling.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ApacheModuleSpeling.mak	2000/06/22 23:22:58	1.8
  +++ ApacheModuleSpeling.mak	2000/06/23 00:18:14	1.9
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleSpelingR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,9 +78,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb"\
    /map:"$(INTDIR)\ApacheModuleSpeling.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\
    /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" /base:@"BaseAddr.ref",mod_speling 
  @@ -127,9 +127,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleSpelingD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -138,9 +138,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb"\
    /map:"$(INTDIR)\ApacheModuleSpeling.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\
    /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" /base:@"BaseAddr.ref",mod_speling 
  @@ -189,35 +188,9 @@
   !IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleSpeling - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_speling.c
  -
  -!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
  -
   DEP_CPP_MOD_S=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
  -
  -DEP_CPP_MOD_S=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -231,12 +204,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_S=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleStatus.dsp
  
  Index: ApacheModuleStatus.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleStatus.dsp	2000/06/08 14:18:38	1.9
  +++ ApacheModuleStatus.dsp	2000/06/23 00:18:14	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_status
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_status
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_status
   
   !ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_status
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_status
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_status
   
   !ENDIF 
   
  
  
  
  1.17      +17 -48    apache-1.3/src/os/win32/ApacheModuleStatus.mak
  
  Index: ApacheModuleStatus.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ApacheModuleStatus.mak	2000/06/22 23:22:58	1.16
  +++ ApacheModuleStatus.mak	2000/06/23 00:18:14	1.17
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,11 +78,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb"\
  - /map:"$(INTDIR)\ApacheModuleStatus.map" /machine:I386\
  - /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /map:"$(INTDIR)\ApacheModuleStatus.map"\
  + /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
    /implib:"$(OUTDIR)\ApacheModuleStatus.lib" /base:@"BaseAddr.ref",mod_status 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_status.obj" \
  @@ -127,9 +126,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -138,11 +137,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb"\
  - /map:"$(INTDIR)\ApacheModuleStatus.map" /debug /machine:I386\
  - /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /map:"$(INTDIR)\ApacheModuleStatus.map"\
  + /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
    /implib:"$(OUTDIR)\ApacheModuleStatus.lib" /base:@"BaseAddr.ref",mod_status 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_status.obj" \
  @@ -189,40 +186,9 @@
   !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_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_conf_globals.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_main.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\scoreboard.h"\
  -	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(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_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -241,12 +207,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_S=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
   
  
  
  
  1.10      +4 -4      apache-1.3/src/os/win32/ApacheModuleUserTrack.dsp
  
  Index: ApacheModuleUserTrack.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheModuleUserTrack.dsp	2000/06/08 14:18:39	1.9
  +++ ApacheModuleUserTrack.dsp	2000/06/23 00:18:15	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
  -# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
   
   !ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
  -# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /base:@"BaseAddr.ref",mod_usertrack
   
   !ENDIF 
   
  
  
  
  1.15      +15 -38    apache-1.3/src/os/win32/ApacheModuleUserTrack.mak
  
  Index: ApacheModuleUserTrack.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleUserTrack.mak	2000/06/22 23:22:58	1.14
  +++ ApacheModuleUserTrack.mak	2000/06/23 00:18:15	1.15
  @@ -67,8 +67,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  + "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleUserTrackR/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  @@ -77,9 +78,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"\
    /map:"$(INTDIR)\ApacheModuleUserTrack.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\
    /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib"\
  @@ -128,9 +128,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  - /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleUserTrackD/
   CPP_SBRS=.
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  @@ -139,9 +139,8 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"\
  +LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"\
    /map:"$(INTDIR)\ApacheModuleUserTrack.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\
    /implib:"$(OUTDIR)\ApacheModuleUserTrack.lib"\
  @@ -191,34 +190,9 @@
   !IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleUserTrack - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_usertrack.c
  -
  -!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
  -
   DEP_CPP_MOD_U=\
  -	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\buff.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\include\http_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  -	
  -
  -"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
  -
  -DEP_CPP_MOD_U=\
   	"..\..\include\ap_alloc.h"\
  -	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
   	"..\..\include\ap_mmn.h"\
  @@ -231,12 +205,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  +NODEP_CPP_MOD_U=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	
   
   "$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   !IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
   
  
  
  
  1.2       +10 -10    apache-1.3/src/os/win32/MakeModuleMak.mak
  
  Index: MakeModuleMak.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/MakeModuleMak.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MakeModuleMak.mak	1997/07/17 20:01:39	1.1
  +++ MakeModuleMak.mak	2000/06/23 00:18:15	1.2
  @@ -35,7 +35,7 @@
   ################################################################################
   # Begin Project
   RSC=rc.exe
  -CPP=cl.exe
  +CPP=bcc32.exe
   
   !IF  "$(CFG)" == "MakeModuleMak - Win32 Release"
   
  @@ -63,8 +63,8 @@
   
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
   # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
  - /Fp"$(INTDIR)/MakeModuleMak.pch" /YX /Fo"$(INTDIR)/" /c 
  +CPP_PROJ=-s /ML -w-8057 -w-8008 -w-8066 /O2 -D"WIN32" -D"NDEBUG" -D"_CONSOLE"\
  + /Fp"$(INTDIR)/MakeModuleMak.pch" /YX -o"$(INTDIR)/$&.obj" /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.\.
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -121,8 +121,8 @@
   
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
   # ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
  -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
  - /Fp"$(INTDIR)/MakeModuleMak.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
  +CPP_PROJ=-s /MLd -w-8057 -w-8008 -w-8066 /Gm -v /Od -D"WIN32" -D"_DEBUG" -D"_CONSOLE"\
  + /Fp"$(INTDIR)/MakeModuleMak.pch" /YX -o"$(INTDIR)/$&.obj" /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.\.
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -151,13 +151,13 @@
   
   !ENDIF 
   
  -.c{$(CPP_OBJS)}.obj:
  +.c.obj:
      $(CPP) $(CPP_PROJ) $<  
   
  -.cpp{$(CPP_OBJS)}.obj:
  +.cpp.obj:
      $(CPP) $(CPP_PROJ) $<  
   
  -.cxx{$(CPP_OBJS)}.obj:
  +.cxx.obj:
      $(CPP) $(CPP_PROJ) $<  
   
   .c{$(CPP_SBRS)}.sbr:
  @@ -184,9 +184,9 @@
   ################################################################################
   # Begin Source File
   
  -SOURCE=.\MakeModuleMak.cpp
  +SOURCE_1=.\MakeModuleMak.cpp
   
  -"$(INTDIR)\MakeModuleMak.obj" : $(SOURCE) "$(INTDIR)"
  +"$(INTDIR)\MakeModuleMak.obj" : $(SOURCE_0) "$(INTDIR)"
   
   
   # End Source File
  
  
  
  1.5       +1 -1      apache-1.3/src/os/win32/installer/installdll/install.dsp
  
  Index: install.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/install.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- install.dsp	2000/06/08 14:18:40	1.4
  +++ install.dsp	2000/06/23 00:18:27	1.5
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\..\include" /I "..\..\..\..\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  
  
  
  1.6       +55 -3     apache-1.3/src/os/win32/installer/installdll/install.mak
  
  Index: install.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/install.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- install.mak	2000/06/22 23:23:05	1.5
  +++ install.mak	2000/06/23 00:18:27	1.6
  @@ -61,8 +61,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../../../../include" /D "WIN32" /D\
  - "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\..\..\..\include" /I\
  + "..\..\..\..\os\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 
  @@ -182,9 +183,12 @@
   !IF "$(CFG)" == "install - Win32 Release" || "$(CFG)" ==\
    "install - Win32 Debug"
   SOURCE=..\..\..\..\ap\ap_snprintf.c
  +
  +!IF  "$(CFG)" == "install - Win32 Release"
  +
   DEP_CPP_AP_SN=\
  -	"..\..\..\..\include\ap_alloc.h"\
   	"..\..\..\..\include\ap.h"\
  +	"..\..\..\..\include\ap_alloc.h"\
   	"..\..\..\..\include\ap_config.h"\
   	"..\..\..\..\include\ap_ctype.h"\
   	"..\..\..\..\include\ap_mmn.h"\
  @@ -198,6 +202,30 @@
   NODEP_CPP_AP_SN=\
   	"..\..\..\..\include\ap_config_auto.h"\
   	"..\..\..\..\include\ebcdic.h"\
  +	"..\..\..\..\include\sfio.h"\
  +	
  +
  +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +!ELSEIF  "$(CFG)" == "install - Win32 Debug"
  +
  +DEP_CPP_AP_SN=\
  +	"..\..\..\..\include\ap.h"\
  +	"..\..\..\..\include\ap_alloc.h"\
  +	"..\..\..\..\include\ap_config.h"\
  +	"..\..\..\..\include\ap_ctype.h"\
  +	"..\..\..\..\include\ap_mmn.h"\
  +	"..\..\..\..\include\buff.h"\
  +	"..\..\..\..\include\hsregex.h"\
  +	"..\..\..\..\include\httpd.h"\
  +	"..\..\..\..\include\util_uri.h"\
  +	"..\..\readdir.h"\
  +	
  +NODEP_CPP_AP_SN=\
  +	"..\..\..\..\include\ap_config_auto.h"\
  +	"..\..\..\..\include\ebcdic.h"\
   	"..\..\..\..\include\os.h"\
   	"..\..\..\..\include\sfio.h"\
   	
  @@ -206,7 +234,12 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +!ENDIF 
  +
   SOURCE=.\install.c
  +
  +!IF  "$(CFG)" == "install - Win32 Release"
  +
   DEP_CPP_INSTA=\
   	"..\..\..\..\include\ap.h"\
   	"..\..\..\..\include\ap_config.h"\
  @@ -218,11 +251,30 @@
   	
   NODEP_CPP_INSTA=\
   	"..\..\..\..\include\ap_config_auto.h"\
  +	
  +
  +"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
  +
  +
  +!ELSEIF  "$(CFG)" == "install - Win32 Debug"
  +
  +DEP_CPP_INSTA=\
  +	"..\..\..\..\include\ap.h"\
  +	"..\..\..\..\include\ap_config.h"\
  +	"..\..\..\..\include\ap_ctype.h"\
  +	"..\..\..\..\include\ap_mmn.h"\
  +	"..\..\..\..\include\conf.h"\
  +	"..\..\..\..\include\hsregex.h"\
  +	
  +NODEP_CPP_INSTA=\
  +	"..\..\..\..\include\ap_config_auto.h"\
   	"..\..\..\..\include\os.h"\
   	
   
   "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
   
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.3       +23 -23    apache-1.3/src/os/win32/installer/installdll/test/test.mak
  
  Index: test.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/test/test.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test.mak	1999/02/16 12:31:43	1.2
  +++ test.mak	2000/06/23 00:18:29	1.3
  @@ -52,38 +52,38 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP=bcc32.exe
  +CPP_PROJ=-s /ML -w-8057 -w-8008 -w-8066 /O2 -D"WIN32" -D"NDEBUG" -D"_WINDOWS"\
  + /Fp"$(INTDIR)\test.pch" /YX -o"$(INTDIR)\\$&.obj" /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  -.c{$(CPP_OBJS)}.obj::
  +.c.obj:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cpp{$(CPP_OBJS)}.obj::
  +.cpp.obj:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cxx{$(CPP_OBJS)}.obj::
  +.cxx.obj:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.c{$(CPP_SBRS)}.sbr::
  +.c{$(CPP_SBRS)}.sbr:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cpp{$(CPP_SBRS)}.sbr::
  +.cpp{$(CPP_SBRS)}.sbr:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cxx{$(CPP_SBRS)}.sbr::
  +.cxx{$(CPP_SBRS)}.sbr:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
  @@ -142,38 +142,38 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP=cl.exe
  -CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP=bcc32.exe
  +CPP_PROJ=-s /MLd -w-8057 -w-8008 -w-8066 /Gm -v /Od -D"WIN32" -D"_DEBUG" -D"_WINDOWS"\
  + /Fp"$(INTDIR)\test.pch" /YX -o"$(INTDIR)\\$&.obj" /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  -.c{$(CPP_OBJS)}.obj::
  +.c.obj:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cpp{$(CPP_OBJS)}.obj::
  +.cpp.obj:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cxx{$(CPP_OBJS)}.obj::
  +.cxx.obj:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.c{$(CPP_SBRS)}.sbr::
  +.c{$(CPP_SBRS)}.sbr:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cpp{$(CPP_SBRS)}.sbr::
  +.cpp{$(CPP_SBRS)}.sbr:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
   
  -.cxx{$(CPP_SBRS)}.sbr::
  +.cxx{$(CPP_SBRS)}.sbr:
      $(CPP) @<<
      $(CPP_PROJ) $< 
   <<
  @@ -206,22 +206,22 @@
   
   
   !IF "$(CFG)" == "test - Win32 Release" || "$(CFG)" == "test - Win32 Debug"
  -SOURCE=.\test.c
  +SOURCE_1=.\test.c
   DEP_CPP_TEST_=\
   	".\test.h"\
   	
   
  -"$(INTDIR)\test.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"
  +"$(INTDIR)\test.obj" : $(SOURCE_0) $(DEP_CPP_TEST_) "$(INTDIR)"
   
   
  -SOURCE=.\test.rc
  +SOURCE_1=.\test.rc
   DEP_RSC_TEST_R=\
   	".\test.h"\
   	".\test.ico"\
   	
   
  -"$(INTDIR)\test.res" : $(SOURCE) $(DEP_RSC_TEST_R) "$(INTDIR)"
  -	$(RSC) $(RSC_PROJ) $(SOURCE)
  +"$(INTDIR)\test.res" : $(SOURCE_0) $(DEP_RSC_TEST_R) "$(INTDIR)"
  +	$(RSC) $(RSC_PROJ) $(SOURCE_0)
   
   
   
  
  
  
  1.5       +4 -4      apache-1.3/src/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htdigest.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htdigest.dsp	2000/06/08 14:18:41	1.4
  +++ htdigest.dsp	2000/06/23 00:18:30	1.5
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
  +# ADD LINK32 /nologo /subsystem:console /map /machine:I386
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  @@ -67,7 +67,7 @@
   # 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" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.5       +20 -74    apache-1.3/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htdigest.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htdigest.mak	2000/06/22 23:23:15	1.4
  +++ htdigest.mak	2000/06/23 00:18:30	1.5
  @@ -60,8 +60,8 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  - "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -69,9 +69,7 @@
   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:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /machine:I386\
    /out:"$(OUTDIR)\htdigest.exe" 
   LINK32_OBJS= \
  @@ -117,8 +115,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\
  - "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -126,9 +125,7 @@
   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:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /debug\
    /machine:I386 /out:"$(OUTDIR)\htdigest.exe" /pdbtype:sept 
   LINK32_OBJS= \
  @@ -178,32 +175,9 @@
   !IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" ==\
    "htdigest - Win32 Debug"
   SOURCE=..\ap\ap_cpystrn.c
  -
  -!IF  "$(CFG)" == "htdigest - Win32 Release"
  -
   DEP_CPP_AP_CP=\
  -	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  -
  -DEP_CPP_AP_CP=\
   	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  @@ -214,17 +188,17 @@
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
   	
  +NODEP_CPP_AP_CP=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
   
   "$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_getpass.c
  -
  -!IF  "$(CFG)" == "htdigest - Win32 Release"
  -
   DEP_CPP_AP_GE=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -233,32 +207,15 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  -
  -DEP_CPP_AP_GE=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_GE=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_md5c.c
  -
  -!IF  "$(CFG)" == "htdigest - Win32 Release"
  -
   DEP_CPP_AP_MD=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -268,29 +225,15 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  -
  -DEP_CPP_AP_MD=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_MD=\
  +	"..\ap\ebcdic.h"\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\htdigest.c
   DEP_CPP_HTDIG=\
   	"..\include\ap.h"\
  @@ -300,6 +243,9 @@
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_HTDIG=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
  
  
  
  1.13      +4 -4      apache-1.3/src/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.dsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- htpasswd.dsp	2000/06/08 14:18:42	1.12
  +++ htpasswd.dsp	2000/06/23 00:18:30	1.13
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
  +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  @@ -66,7 +66,7 @@
   # 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" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\os\win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
   # SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
  
  
  
  1.13      +32 -179   apache-1.3/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.mak,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- htpasswd.mak	2000/06/22 23:23:18	1.12
  +++ htpasswd.mak	2000/06/23 00:18:30	1.13
  @@ -64,8 +64,8 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D\
  - "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
    /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  @@ -74,8 +74,7 @@
   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:no\
  +LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /machine:I386\
    /out:"$(OUTDIR)\htpasswd.exe" 
   LINK32_OBJS= \
  @@ -129,9 +128,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "_DEBUG" /D\
  - "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -139,8 +138,7 @@
   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:no\
  +LINK32_FLAGS=ws2_32.lib /nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\htpasswd.pdb" /map:"$(INTDIR)\htpasswd.map" /debug\
    /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept 
   LINK32_OBJS= \
  @@ -194,9 +192,6 @@
   !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\
    "htpasswd - Win32 Debug"
   SOURCE=..\ap\ap_base64.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_BA=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -205,32 +200,16 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_BA=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_BA=\
  +	"..\ap\ebcdic.h"\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_checkpass.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_CH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -241,57 +220,18 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_CH=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_CH=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_cpystrn.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_CP=\
  -	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_CP=\
   	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  @@ -302,17 +242,17 @@
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
   	
  +NODEP_CPP_AP_CP=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
   
   "$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_getpass.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_GE=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -321,32 +261,15 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_GE=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_GE=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_getpass.obj" : $(SOURCE) $(DEP_CPP_AP_GE) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_md5c.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_MD=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -356,33 +279,16 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_MD=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_MD=\
  +	"..\ap\ebcdic.h"\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_sha1.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_SH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -392,56 +298,19 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_SH=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_SH=\
  +	"..\ap\ebcdic.h"\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=..\ap\ap_snprintf.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_AP_SN=\
  -	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\buff.h"\
  -	"..\include\hsregex.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  -	
  -
  -"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_AP_SN=\
   	"..\include\ap_alloc.h"\
  -	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
  @@ -452,17 +321,17 @@
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
   	
  +NODEP_CPP_AP_SN=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
   
   "$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
   SOURCE=.\htpasswd.c
  -
  -!IF  "$(CFG)" == "htpasswd - Win32 Release"
  -
   DEP_CPP_HTPAS=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -474,28 +343,12 @@
   	"..\os\win32\getopt.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  -
  -DEP_CPP_HTPAS=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_md5.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\getopt.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_HTPAS=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +4 -4      apache-1.3/src/support/logresolve.dsp
  
  Index: logresolve.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/logresolve.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- logresolve.dsp	2000/06/08 14:18:42	1.3
  +++ logresolve.dsp	2000/06/23 00:18:31	1.4
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
  +# ADD LINK32 wsock32.lib /nologo /subsystem:console /map /machine:I386
   # SUBTRACT LINK32 /pdb:none /nodefaultlib
   
   !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
  @@ -67,7 +67,7 @@
   # 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" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\os\win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -75,7 +75,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
  +# ADD LINK32 wsock32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
   # SUBTRACT LINK32 /pdb:none /nodefaultlib
   
   !ENDIF 
  
  
  
  1.3       +13 -28    apache-1.3/src/support/logresolve.mak
  
  Index: logresolve.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/logresolve.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- logresolve.mak	2000/05/10 20:43:55	1.2
  +++ logresolve.mak	2000/06/23 00:18:32	1.3
  @@ -58,8 +58,8 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
  - "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
    /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  @@ -68,9 +68,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console\
  - /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map"\
  - /machine:I386 /out:"$(OUTDIR)\logresolve.exe" 
  +LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no\
  + /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map" /machine:I386\
  + /out:"$(OUTDIR)\logresolve.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\logresolve.obj"
   
  @@ -108,9 +108,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I\
  - "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
  - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -118,9 +118,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console\
  - /incremental:no /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map"\
  - /debug /machine:I386 /out:"$(OUTDIR)\logresolve.exe" 
  +LINK32_FLAGS=wsock32.lib /nologo /subsystem:console /incremental:no\
  + /pdb:"$(OUTDIR)\logresolve.pdb" /map:"$(INTDIR)\logresolve.map" /debug\
  + /machine:I386 /out:"$(OUTDIR)\logresolve.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\logresolve.obj"
   
  @@ -165,9 +165,6 @@
   !IF "$(CFG)" == "logresolve - Win32 Release" || "$(CFG)" ==\
    "logresolve - Win32 Debug"
   SOURCE=.\logresolve.c
  -
  -!IF  "$(CFG)" == "logresolve - Win32 Release"
  -
   DEP_CPP_LOGRE=\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -175,24 +172,12 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
  -
  -DEP_CPP_LOGRE=\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_LOGRE=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +4 -4      apache-1.3/src/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/rotatelogs.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rotatelogs.dsp	2000/06/08 14:18:42	1.3
  +++ rotatelogs.dsp	2000/06/23 00:18:32	1.4
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
  +# ADD LINK32 /nologo /subsystem:console /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
   
  @@ -66,7 +66,7 @@
   # 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" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -74,7 +74,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
   
   !ENDIF 
   
  
  
  
  1.3       +10 -12    apache-1.3/src/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/rotatelogs.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- rotatelogs.mak	2000/05/10 20:43:55	1.2
  +++ rotatelogs.mak	2000/06/23 00:18:33	1.3
  @@ -58,9 +58,8 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
  - "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  - /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -68,9 +67,7 @@
   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:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /machine:I386\
    /out:"$(OUTDIR)\rotatelogs.exe" 
   LINK32_OBJS= \
  @@ -110,9 +107,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I\
  - "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -120,9 +117,7 @@
   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:no\
  +LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /debug\
    /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept 
   LINK32_OBJS= \
  @@ -175,6 +170,9 @@
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_ROTAT=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  
  
  

Mime
View raw message