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.mak htpasswd.mak logresolve.mak rotatelogs.mak
Date Wed, 20 Dec 2000 00:30:21 GMT
wrowe       00/12/19 16:30:19

  Modified:    src      Apache.mak ApacheCore.mak
               src/ap   ap.mak
               src/lib/expat-lite xmlparse.mak xmltok.mak
               src/lib/sdbm sdbm.mak
               src/main gen_test_char.mak gen_uri_delims.mak
               src/os/win32 ApacheModuleAuthAnon.mak
                        ApacheModuleAuthDBM.mak ApacheModuleAuthDigest.mak
                        ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
                        ApacheModuleExpires.mak ApacheModuleHeaders.mak
                        ApacheModuleInfo.mak ApacheModuleProxy.mak
                        ApacheModuleRewrite.mak ApacheModuleSpeling.mak
                        ApacheModuleStatus.mak ApacheModuleUserTrack.mak
                        ApacheOS.mak
               src/os/win32/installer/installdll install.mak
               src/os/win32/win9xconhook Win9xConHook.mak
               src/regex regex.mak
               src/support htdigest.mak htpasswd.mak logresolve.mak
                        rotatelogs.mak
  Log:
    As always, dirty .mak file update.
  
  Revision  Changes    Path
  1.12      +16 -17    apache-1.3/src/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Apache.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Apache.mak	2000/09/21 13:57:09	1.11
  +++ Apache.mak	2000/12/20 00:29:39	1.12
  @@ -27,10 +27,10 @@
   
   !IF  "$(CFG)" == "Apache - Win32 Release"
   
  -OUTDIR=.\ApacheR
  -INTDIR=.\ApacheR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -48,9 +48,9 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\Apache.idb"
   	-@erase "$(INTDIR)\apache.res"
   	-@erase "$(INTDIR)\main_win32.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\Apache.exe"
   	-@erase "$(OUTDIR)\Apache.map"
   
  @@ -58,9 +58,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\ApacheR/
  +CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -106,7 +106,7 @@
   LINK32_OBJS= \
   	"$(INTDIR)\apache.res" \
   	"$(INTDIR)\main_win32.obj" \
  -	".\CoreR\ApacheCore.lib"
  +	"$(OUTDIR)\ApacheCore.lib"
   
   "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -115,10 +115,10 @@
   
   !ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
   
  -OUTDIR=.\ApacheD
  -INTDIR=.\ApacheD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -136,10 +136,9 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\Apache.idb"
   	-@erase "$(INTDIR)\apache.res"
   	-@erase "$(INTDIR)\main_win32.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\Apache.exe"
   	-@erase "$(OUTDIR)\Apache.map"
   	-@erase "$(OUTDIR)\Apache.pdb"
  @@ -148,9 +147,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\ApacheD/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -196,7 +195,7 @@
   LINK32_OBJS= \
   	"$(INTDIR)\apache.res" \
   	"$(INTDIR)\main_win32.obj" \
  -	".\CoreD\ApacheCore.lib"
  +	"$(OUTDIR)\ApacheCore.lib"
   
   "$(OUTDIR)\Apache.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  
  
  
  1.48      +389 -1340 apache-1.3/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- ApacheCore.mak	2000/12/11 02:24:17	1.47
  +++ ApacheCore.mak	2000/12/20 00:29:40	1.48
  @@ -30,10 +30,10 @@
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -OUTDIR=.\CoreR
  -INTDIR=.\CoreR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\CoreR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -56,6 +56,7 @@
   CLEAN :
   !ENDIF 
   	-@erase "$(INTDIR)\alloc.obj"
  +	-@erase "$(INTDIR)\ApacheCore.idb"
   	-@erase "$(INTDIR)\buff.obj"
   	-@erase "$(INTDIR)\buildmark.obj"
   	-@erase "$(INTDIR)\getopt.obj"
  @@ -96,7 +97,6 @@
   	-@erase "$(INTDIR)\util_script.obj"
   	-@erase "$(INTDIR)\util_uri.obj"
   	-@erase "$(INTDIR)\util_win32.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheCore.dll"
   	-@erase "$(OUTDIR)\ApacheCore.exp"
   	-@erase "$(OUTDIR)\ApacheCore.lib"
  @@ -106,10 +106,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\include" /I ".\os\win32" /I\
  +CPP_PROJ=/nologo /MD /W3 /O2 /I ".\include" /I ".\os\win32" /I\
    ".\os\win32\win9xconhook" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\CoreR/
  + "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -199,10 +199,10 @@
   	"$(INTDIR)\util_script.obj" \
   	"$(INTDIR)\util_uri.obj" \
   	"$(INTDIR)\util_win32.obj" \
  -	".\ap\Release\ap.lib" \
  -	".\os\win32\ApacheOSR\ApacheOS.lib" \
  +	".\ap\LibR\ap.lib" \
  +	".\os\win32\LibR\ApacheOS.lib" \
   	".\os\win32\win9xconhook\Release\Win9xConHook.lib" \
  -	".\regex\Release\regex.lib"
  +	".\regex\LibR\regex.lib"
   
   "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -211,10 +211,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -OUTDIR=.\CoreD
  -INTDIR=.\CoreD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\CoreD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -237,6 +237,7 @@
   CLEAN :
   !ENDIF 
   	-@erase "$(INTDIR)\alloc.obj"
  +	-@erase "$(INTDIR)\ApacheCore.idb"
   	-@erase "$(INTDIR)\buff.obj"
   	-@erase "$(INTDIR)\buildmark.obj"
   	-@erase "$(INTDIR)\getopt.obj"
  @@ -277,11 +278,8 @@
   	-@erase "$(INTDIR)\util_script.obj"
   	-@erase "$(INTDIR)\util_uri.obj"
   	-@erase "$(INTDIR)\util_win32.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheCore.dll"
   	-@erase "$(OUTDIR)\ApacheCore.exp"
  -	-@erase "$(OUTDIR)\ApacheCore.ilk"
   	-@erase "$(OUTDIR)\ApacheCore.lib"
   	-@erase "$(OUTDIR)\ApacheCore.map"
   	-@erase "$(OUTDIR)\ApacheCore.pdb"
  @@ -290,10 +288,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I ".\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\os\win32" /I\
    ".\os\win32\win9xconhook" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\CoreD/
  + "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheCore" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -335,7 +333,7 @@
   	
   LINK32=link.exe
   LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo\
  - /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb"\
  + /subsystem:windows /dll /incremental:no /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 
  @@ -383,10 +381,10 @@
   	"$(INTDIR)\util_script.obj" \
   	"$(INTDIR)\util_uri.obj" \
   	"$(INTDIR)\util_win32.obj" \
  -	".\ap\Debug\ap.lib" \
  -	".\os\win32\ApacheOSD\ApacheOS.lib" \
  +	".\ap\LibD\ap.lib" \
  +	".\os\win32\LibD\ApacheOS.lib" \
   	".\os\win32\win9xconhook\Debug\Win9xConHook.lib" \
  -	".\regex\Debug\regex.lib"
  +	".\regex\LibD\regex.lib"
   
   "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -399,9 +397,6 @@
   !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
    "ApacheCore - Win32 Debug"
   SOURCE=.\main\alloc.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_ALLOC=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
  @@ -417,39 +412,17 @@
   	".\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.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_log.h"\
  -	".\include\httpd.h"\
  -	".\include\multithread.h"\
  -	".\include\util_uri.h"\
  -	".\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.h"\
   	".\include\ap_alloc.h"\
  @@ -465,39 +438,17 @@
   	".\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.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_log.h"\
  -	".\include\http_main.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\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.h"\
   	".\include\ap_alloc.h"\
  @@ -511,31 +462,15 @@
   	".\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.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"\
  -	".\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)"
  @@ -543,9 +478,6 @@
   
   
   SOURCE=.\main\http_config.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
   DEP_CPP_HTTP_=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
  @@ -566,86 +498,91 @@
   	".\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)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_HTTP_=\
  +SOURCE=.\main\http_core.c
  +DEP_CPP_HTTP_C=\
   	".\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\explain.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_C=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
  +"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_core.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_C=\
  +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)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_C=\
  +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_md5.h"\
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
  -	".\include\fnmatch.h"\
  +	".\include\explain.h"\
   	".\include\hsregex.h"\
   	".\include\http_conf_globals.h"\
   	".\include\http_config.h"\
  @@ -656,25 +593,29 @@
   	".\include\http_request.h"\
   	".\include\http_vhost.h"\
   	".\include\httpd.h"\
  -	".\include\rfc1413.h"\
  +	".\include\multithread.h"\
   	".\include\scoreboard.h"\
  -	".\include\util_md5.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_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
  +"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_log.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_L=\
  +SOURCE=.\main\http_protocol.c
  +DEP_CPP_HTTP_P=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -687,122 +628,117 @@
   	".\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)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_HTTP_L=\
  +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\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"\
   	
  +NODEP_CPP_HTTP_R=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
  +"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_main.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_M=\
  +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)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_M=\
  +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\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_MOD_A=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
   	
   
  -"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
  +"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_protocol.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_P=\
  +SOURCE=.\modules\standard\mod_actions.c
  +DEP_CPP_MOD_AC=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -810,28 +746,30 @@
   	".\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_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_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
  +"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_P=\
  +SOURCE=.\modules\standard\mod_alias.c
  +DEP_CPP_MOD_AL=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -839,119 +777,114 @@
   	".\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_AL=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
  +"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\main\http_request.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_HTTP_R=\
  +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\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_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_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
  +"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_R=\
  +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"\
   	".\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"\
   	
  +NODEP_CPP_MOD_AU=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
  +"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
  -SOURCE=.\main\http_vhost.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_HTTP_V=\
  +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_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_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_AUT=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
  +"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_HTTP_V=\
  +SOURCE=.\modules\standard\mod_cgi.c
  +DEP_CPP_MOD_C=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -961,26 +894,29 @@
   	".\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_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_C=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\http_vhost.obj" : $(SOURCE) $(DEP_CPP_HTTP_V) "$(INTDIR)"
  +"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_access.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_A=\
  +SOURCE=.\modules\standard\mod_dir.c
  +DEP_CPP_MOD_D=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -991,20 +927,27 @@
   	".\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_D=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  +"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_A=\
  +SOURCE=.\modules\standard\mod_env.c
  +DEP_CPP_MOD_E=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1013,26 +956,23 @@
   	".\include\buff.h"\
   	".\include\hsregex.h"\
   	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_request.h"\
   	".\include\httpd.h"\
   	".\include\util_uri.h"\
   	".\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_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  +"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_actions.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_AC=\
  +SOURCE=.\modules\standard\mod_imap.c
  +DEP_CPP_MOD_I=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1052,14 +992,18 @@
   	".\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_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
  +"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AC=\
  +SOURCE=.\modules\standard\mod_include.c
  +DEP_CPP_MOD_IN=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1079,18 +1023,20 @@
   	".\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_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
  +"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_alias.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AL=\
  +SOURCE=.\os\win32\mod_isapi.c
  +DEP_CPP_MOD_IS=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1099,19 +1045,28 @@
   	".\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"\
   	
  +NODEP_CPP_MOD_IS=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
  +"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AL=\
  +SOURCE=.\modules\standard\mod_log_config.c
  +DEP_CPP_MOD_L=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1120,23 +1075,25 @@
   	".\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"\
   	
  +NODEP_CPP_MOD_L=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
  +"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_asis.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AS=\
  +SOURCE=.\modules\standard\mod_mime.c
  +DEP_CPP_MOD_M=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1146,23 +1103,23 @@
   	".\include\hsregex.h"\
   	".\include\http_config.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_M=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
  +"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_AS=\
  +SOURCE=.\modules\standard\mod_negotiation.c
  +DEP_CPP_MOD_N=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1171,8 +1128,8 @@
   	".\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"\
  @@ -1181,18 +1138,18 @@
   	".\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_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
  +"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_auth.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AU=\
  +SOURCE=.\modules\standard\mod_setenvif.c
  +DEP_CPP_MOD_S=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1203,20 +1160,23 @@
   	".\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_S=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
  +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AU=\
  +SOURCE=.\modules\standard\mod_so.c
  +DEP_CPP_MOD_SO=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1225,114 +1185,100 @@
   	".\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_SO=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
  +"$(INTDIR)\mod_so.obj" : $(SOURCE) $(DEP_CPP_MOD_SO) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_autoindex.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_AUT=\
  +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\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_U=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_AUT=\
  +SOURCE=.\os\win32\modules.c
  +DEP_CPP_MODUL=\
   	".\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_MODUL=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  +"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_cgi.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_C=\
  -	".\include\ap.h"\
  -	".\include\ap_alloc.h"\
  +SOURCE=.\os\win32\multithread.c
  +DEP_CPP_MULTI=\
   	".\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"\
  +	".\include\multithread.h"\
   	".\os\win32\os.h"\
  -	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_MULTI=\
  +	".\include\ap_config_auto.h"\
  +	
   
  -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  +"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +SOURCE=.\os\win32\readdir.c
  +DEP_CPP_READD=\
  +	".\os\win32\readdir.h"\
  +	
   
  -DEP_CPP_MOD_C=\
  +"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +SOURCE=.\os\win32\registry.c
  +DEP_CPP_REGIS=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1340,31 +1286,24 @@
   	".\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_REGIS=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  +"$(INTDIR)\registry.obj" : $(SOURCE) $(DEP_CPP_REGIS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
  -
  -SOURCE=.\modules\standard\mod_dir.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_D=\
  +SOURCE=.\main\rfc1413.c
  +DEP_CPP_RFC14=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1372,26 +1311,26 @@
   	".\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\rfc1413.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
   	".\os\win32\readdir.h"\
   	
  +NODEP_CPP_RFC14=\
  +	".\include\ap_config_auto.h"\
  +	".\include\ebcdic.h"\
  +	".\include\sfio.h"\
  +	
   
  -"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  +"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  -DEP_CPP_MOD_D=\
  +SOURCE=.\os\win32\service.c
  +DEP_CPP_SERVI=\
   	".\include\ap.h"\
   	".\include\ap_alloc.h"\
   	".\include\ap_config.h"\
  @@ -1399,768 +1338,10 @@
   	".\include\ap_mmn.h"\
   	".\include\buff.h"\
   	".\include\hsregex.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  +	".\include\http_conf_globals.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.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\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.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\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.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"\
  -	
  -
  -"$(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.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"\
  -	
  -
  -"$(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.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"\
  -	
  -
  -"$(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.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"\
  -	
  -
  -"$(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.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\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.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\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.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\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.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\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.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_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.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_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.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\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.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\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.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\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.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\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.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_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.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_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.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\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.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\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.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\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.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\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"\
  -	
  -
  -"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -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"\
  -	
  -
  -"$(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"\
  -	
  -
  -"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -SOURCE=.\os\win32\registry.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_REGIS=\
  -	".\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_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.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_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)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\main\rfc1413.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_RFC14=\
  -	".\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_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.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_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)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\os\win32\service.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_SERVI=\
  -	".\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_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.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_log.h"\
  -	".\include\http_main.h"\
  -	".\include\httpd.h"\
   	".\include\multithread.h"\
   	".\include\util_uri.h"\
   	".\os\win32\os.h"\
  @@ -2169,17 +1350,17 @@
   	".\os\win32\service.h"\
   	".\os\win32\win9xconhook\Win9xConHook.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.h"\
   	".\include\ap_alloc.h"\
  @@ -2196,40 +1377,17 @@
   	".\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.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_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\main\test_char.h"\
  -	".\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"\
  @@ -2238,32 +1396,15 @@
   	".\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.h"\
   	".\include\ap_alloc.h"\
  @@ -2279,39 +1420,17 @@
   	".\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.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\hsregex.h"\
  -	".\include\httpd.h"\
  -	".\include\util_md5.h"\
  -	".\include\util_uri.h"\
  -	".\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.h"\
   	".\include\ap_alloc.h"\
  @@ -2334,46 +1453,17 @@
   	".\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.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_date.h"\
  -	".\include\util_script.h"\
  -	".\include\util_uri.h"\
  -	".\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.h"\
   	".\include\ap_alloc.h"\
  @@ -2390,40 +1480,17 @@
   	".\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.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_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\main\uri_delims.h"\
  -	".\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.h"\
   	".\include\ap_alloc.h"\
  @@ -2438,33 +1505,15 @@
   	".\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.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_log.h"\
  -	".\include\httpd.h"\
  -	".\include\util_uri.h"\
  -	".\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.14      +44 -201   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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ap.mak	2000/12/11 02:24:18	1.13
  +++ ap.mak	2000/12/20 00:29:43	1.14
  @@ -27,10 +27,10 @@
   
   !IF  "$(CFG)" == "ap - Win32 Release"
   
  -OUTDIR=.\Release
  -INTDIR=.\Release
  +OUTDIR=.\LibR
  +INTDIR=.\LibR
   # Begin Custom Macros
  -OutDir=.\Release
  +OutDir=.\LibR
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -44,6 +44,7 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ap.idb"
   	-@erase "$(INTDIR)\ap_base64.obj"
   	-@erase "$(INTDIR)\ap_checkpass.obj"
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
  @@ -53,7 +54,6 @@
   	-@erase "$(INTDIR)\ap_signal.obj"
   	-@erase "$(INTDIR)\ap_slack.obj"
   	-@erase "$(INTDIR)\ap_snprintf.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ap.lib"
   
   "$(OUTDIR)" :
  @@ -61,9 +61,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  - "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\Release/
  +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c 
  +CPP_OBJS=.\LibR/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -120,10 +120,10 @@
   
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
   
  -OUTDIR=.\Debug
  -INTDIR=.\Debug
  +OUTDIR=.\LibD
  +INTDIR=.\LibD
   # Begin Custom Macros
  -OutDir=.\Debug
  +OutDir=.\LibD
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -137,6 +137,8 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ap.idb"
  +	-@erase "$(INTDIR)\ap.pdb"
   	-@erase "$(INTDIR)\ap_base64.obj"
   	-@erase "$(INTDIR)\ap_checkpass.obj"
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
  @@ -146,7 +148,6 @@
   	-@erase "$(INTDIR)\ap_signal.obj"
   	-@erase "$(INTDIR)\ap_slack.obj"
   	-@erase "$(INTDIR)\ap_snprintf.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ap.lib"
   
   "$(OUTDIR)" :
  @@ -154,9 +155,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /I "..\os\win32" /D\
  - "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\Debug/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ap" /FD /c 
  +CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -216,9 +217,6 @@
   
   !IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
   SOURCE=.\ap_base64.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_BA=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -227,30 +225,15 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - 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=\
  +	"..\include\ap_config_auto.h"\
  +	".\ebcdic.h"\
   	
   
   "$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_checkpass.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_CH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -261,32 +244,14 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - 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)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_cpystrn.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_CP=\
   	"..\include\ap.h"\
   	"..\include\ap_alloc.h"\
  @@ -300,35 +265,16 @@
   	"..\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.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"\
  -	"..\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)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_fnmatch.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_FN=\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -337,30 +283,14 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -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"\
  +NODEP_CPP_AP_FN=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_md5c.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_MD=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -370,31 +300,15 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - 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=\
  +	"..\include\ap_config_auto.h"\
  +	".\ebcdic.h"\
   	
   
   "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_sha1.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_SH=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -404,31 +318,15 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -DEP_CPP_AP_SH=\
  -	"..\include\ap.h"\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\include\ap_mmn.h"\
  -	"..\include\ap_sha1.h"\
  -	"..\include\hsregex.h"\
  -	"..\os\win32\os.h"\
  +NODEP_CPP_AP_SH=\
  +	"..\include\ap_config_auto.h"\
  +	".\ebcdic.h"\
   	
   
   "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_signal.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_SI=\
   	"..\include\ap.h"\
   	"..\include\ap_alloc.h"\
  @@ -442,35 +340,16 @@
   	"..\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.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"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  +NODEP_CPP_AP_SI=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.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.h"\
   	"..\include\ap_alloc.h"\
  @@ -485,36 +364,16 @@
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
   	
  -
  -"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  -
  -DEP_CPP_AP_SL=\
  -	"..\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_log.h"\
  -	"..\include\httpd.h"\
  -	"..\include\util_uri.h"\
  -	"..\os\win32\os.h"\
  -	"..\os\win32\readdir.h"\
  +NODEP_CPP_AP_SL=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
   	
   
   "$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\ap_snprintf.c
  -
  -!IF  "$(CFG)" == "ap - Win32 Release"
  -
   DEP_CPP_AP_SN=\
   	"..\include\ap.h"\
   	"..\include\ap_alloc.h"\
  @@ -528,30 +387,14 @@
   	"..\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.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"\
  -	"..\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)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.6       +21 -43    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- xmlparse.mak	2000/12/11 02:24:18	1.5
  +++ xmlparse.mak	2000/12/20 00:29:44	1.6
  @@ -51,19 +51,21 @@
   CLEAN :
   !ENDIF 
   	-@erase "$(INTDIR)\hashtable.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  +	-@erase "$(INTDIR)\xmlparse.idb"
   	-@erase "$(INTDIR)\xmlparse.obj"
   	-@erase "$(OUTDIR)\xmlparse.dll"
   	-@erase "$(OUTDIR)\xmlparse.exp"
   	-@erase "$(OUTDIR)\xmlparse.lib"
  +	-@erase "$(OUTDIR)\xmlparse.map"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\xmltok" /I "..\xmlwf" /D "NDEBUG" /D\
  +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\xmltok" /I "..\xmlwf" /D "NDEBUG" /D\
    "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D\
  - XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse" /FD\
  + /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -106,9 +108,9 @@
   	
   LINK32=link.exe
   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 
  + /pdb:"$(OUTDIR)\xmlparse.pdb" /map:"$(INTDIR)\xmlparse.map" /machine:I386\
  + /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll"\
  + /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse 
   DEF_FILE= \
   	".\xmlparse.def"
   LINK32_OBJS= \
  @@ -145,12 +147,12 @@
   CLEAN :
   !ENDIF 
   	-@erase "$(INTDIR)\hashtable.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
  +	-@erase "$(INTDIR)\xmlparse.idb"
   	-@erase "$(INTDIR)\xmlparse.obj"
   	-@erase "$(OUTDIR)\xmlparse.dll"
   	-@erase "$(OUTDIR)\xmlparse.exp"
   	-@erase "$(OUTDIR)\xmlparse.lib"
  +	-@erase "$(OUTDIR)\xmlparse.map"
   	-@erase "$(OUTDIR)\xmlparse.pdb"
   
   "$(OUTDIR)" :
  @@ -159,7 +161,8 @@
   CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\xmltok" /I "..\xmlwf" /D "_DEBUG"\
    /D "WIN32" /D "_WINDOWS" /D XMLTOKAPI=__declspec(dllimport) /D\
  - XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + XMLPARSEAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmlparse" /FD\
  + /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -202,9 +205,9 @@
   	
   LINK32=link.exe
   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 
  + /pdb:"$(OUTDIR)\xmlparse.pdb" /map:"$(INTDIR)\xmlparse.map" /debug\
  + /machine:I386 /def:".\xmlparse.def" /out:"$(OUTDIR)\xmlparse.dll"\
  + /implib:"$(OUTDIR)\xmlparse.lib" /base:@"..\..\os\win32\BaseAddr.ref",xmlparse 
   DEF_FILE= \
   	".\xmlparse.def"
   LINK32_OBJS= \
  @@ -223,33 +226,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"\
  @@ -257,24 +246,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.6       +19 -33    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- xmltok.mak	2000/12/11 02:24:18	1.5
  +++ xmltok.mak	2000/12/20 00:29:44	1.6
  @@ -45,19 +45,20 @@
   
   CLEAN :
   	-@erase "$(INTDIR)\dllmain.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\xmlrole.obj"
  +	-@erase "$(INTDIR)\xmltok.idb"
   	-@erase "$(INTDIR)\xmltok.obj"
   	-@erase "$(OUTDIR)\xmltok.dll"
   	-@erase "$(OUTDIR)\xmltok.exp"
   	-@erase "$(OUTDIR)\xmltok.lib"
  +	-@erase "$(OUTDIR)\xmltok.map"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  + XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -99,9 +100,9 @@
   BSC32_SBRS= \
   	
   LINK32=link.exe
  -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"\
  +LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no\
  + /pdb:"$(OUTDIR)\xmltok.pdb" /map:"$(INTDIR)\xmltok.map" /machine:I386\
  + /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\
    /base:@"..\..\os\win32\BaseAddr.ref",xmltok 
   DEF_FILE= \
   	".\xmltok.def"
  @@ -135,13 +136,13 @@
   
   CLEAN :
   	-@erase "$(INTDIR)\dllmain.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(INTDIR)\xmlrole.obj"
  +	-@erase "$(INTDIR)\xmltok.idb"
   	-@erase "$(INTDIR)\xmltok.obj"
   	-@erase "$(OUTDIR)\xmltok.dll"
   	-@erase "$(OUTDIR)\xmltok.exp"
   	-@erase "$(OUTDIR)\xmltok.lib"
  +	-@erase "$(OUTDIR)\xmltok.map"
   	-@erase "$(OUTDIR)\xmltok.pdb"
   
   "$(OUTDIR)" :
  @@ -149,7 +150,7 @@
   
   CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + XMLTOKAPI=__declspec(dllexport) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\xmltok" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -192,8 +193,8 @@
   	
   LINK32=link.exe
   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"\
  + /pdb:"$(OUTDIR)\xmltok.pdb" /map:"$(INTDIR)\xmltok.map" /debug /machine:I386\
  + /def:".\xmltok.def" /out:"$(OUTDIR)\xmltok.dll" /implib:"$(OUTDIR)\xmltok.lib"\
    /base:@"..\..\os\win32\BaseAddr.ref",xmltok 
   DEF_FILE= \
   	".\xmltok.def"
  @@ -222,14 +223,15 @@
   	".\xmlrole.h"\
   	".\xmltok.h"\
   	
  +NODEP_CPP_XMLRO=\
  +	".\ap_config.h"\
  +	".\nspr.h"\
  +	
   
   "$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)"
   
   
   SOURCE=.\xmltok.c
  -
  -!IF  "$(CFG)" == "xmltok - Win32 Release"
  -
   DEP_CPP_XMLTO=\
   	".\asciitab.h"\
   	".\iasciitab.h"\
  @@ -242,29 +244,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       +18 -49    apache-1.3/src/lib/sdbm/sdbm.mak
  
  Index: sdbm.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/lib/sdbm/sdbm.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sdbm.mak	2000/12/11 02:24:19	1.3
  +++ sdbm.mak	2000/12/20 00:29:46	1.4
  @@ -27,10 +27,10 @@
   
   !IF  "$(CFG)" == "sdbm - Win32 Release"
   
  -OUTDIR=.\Release
  -INTDIR=.\Release
  +OUTDIR=.\LibR
  +INTDIR=.\LibR
   # Begin Custom Macros
  -OutDir=.\Release
  +OutDir=.\LibR
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -44,11 +44,11 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\sdbm.idb"
   	-@erase "$(INTDIR)\sdbm.obj"
   	-@erase "$(INTDIR)\sdbm_hash.obj"
   	-@erase "$(INTDIR)\sdbm_lock.obj"
   	-@erase "$(INTDIR)\sdbm_pair.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\sdbm.lib"
   
   "$(OUTDIR)" :
  @@ -56,9 +56,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  - "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\Release/
  +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "WIN32"\
  + /D "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\sdbm" /FD /c 
  +CPP_OBJS=.\LibR/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -110,10 +110,10 @@
   
   !ELSEIF  "$(CFG)" == "sdbm - Win32 Debug"
   
  -OUTDIR=.\Debug
  -INTDIR=.\Debug
  +OUTDIR=.\LibD
  +INTDIR=.\LibD
   # Begin Custom Macros
  -OutDir=.\Debug
  +OutDir=.\LibD
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -127,12 +127,12 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\sdbm.idb"
   	-@erase "$(INTDIR)\sdbm.obj"
  +	-@erase "$(INTDIR)\sdbm.pdb"
   	-@erase "$(INTDIR)\sdbm_hash.obj"
   	-@erase "$(INTDIR)\sdbm_lock.obj"
   	-@erase "$(INTDIR)\sdbm_pair.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\sdbm.lib"
   
   "$(OUTDIR)" :
  @@ -140,10 +140,10 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  - "..\..\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\Debug/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\sdbm" /FD /c 
  +CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -216,9 +216,6 @@
   
   
   SOURCE=.\sdbm_lock.c
  -
  -!IF  "$(CFG)" == "sdbm - Win32 Release"
  -
   DEP_CPP_SDBM_L=\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -226,29 +223,14 @@
   	"..\..\include\hsregex.h"\
   	"..\..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "sdbm - Win32 Debug"
  -
  -DEP_CPP_SDBM_L=\
  -	"..\..\include\ap_config.h"\
  -	"..\..\include\ap_ctype.h"\
  -	"..\..\include\ap_mmn.h"\
  -	"..\..\include\hsregex.h"\
  -	"..\..\os\win32\os.h"\
  +NODEP_CPP_SDBM_L=\
  +	"..\..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\sdbm_pair.c
  -
  -!IF  "$(CFG)" == "sdbm - Win32 Release"
  -
   DEP_CPP_SDBM_P=\
   	".\sdbm.h"\
   	".\sdbm_pair.h"\
  @@ -257,19 +239,6 @@
   
   "$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"
   
  -
  -!ELSEIF  "$(CFG)" == "sdbm - Win32 Debug"
  -
  -DEP_CPP_SDBM_P=\
  -	".\sdbm.h"\
  -	".\sdbm_pair.h"\
  -	".\sdbm_tune.h"\
  -	
  -
  -"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"
  -
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.9       +17 -35    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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- gen_test_char.mak	2000/12/11 02:24:20	1.8
  +++ gen_test_char.mak	2000/12/20 00:29:49	1.9
  @@ -31,7 +31,7 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   OUTDIR=.
  -INTDIR=.\gen_test_char_R
  +INTDIR=.\Release
   # Begin Custom Macros
   OutDir=.
   # End Custom Macros
  @@ -47,17 +47,18 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\gen_test_char.idb"
   	-@erase "$(INTDIR)\gen_test_char.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\gen_test_char.exe"
   
   "$(INTDIR)" :
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char"\
  + /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -124,7 +125,7 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   OUTDIR=.
  -INTDIR=.\gen_test_char_D
  +INTDIR=.\Debug
   # Begin Custom Macros
   OutDir=.
   # End Custom Macros
  @@ -140,9 +141,9 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\gen_test_char.idb"
   	-@erase "$(INTDIR)\gen_test_char.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
  +	-@erase "$(INTDIR)\gen_test_char.pdb"
   	-@erase "$(OUTDIR)\gen_test_char.exe"
   	-@erase "$(OUTDIR)\gen_test_char.pdb"
   
  @@ -150,10 +151,10 @@
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
   CPP=cl.exe
  -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=.\gen_test_char_D/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\gen_test_char" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -223,9 +224,6 @@
   !IF "$(CFG)" == "gen_test_char - Win32 Release" || "$(CFG)" ==\
    "gen_test_char - Win32 Debug"
   SOURCE=.\gen_test_char.c
  -
  -!IF  "$(CFG)" == "gen_test_char - Win32 Release"
  -
   DEP_CPP_GEN_T=\
   	"..\include\ap.h"\
   	"..\include\ap_alloc.h"\
  @@ -239,30 +237,14 @@
   	"..\os\win32\os.h"\
   	"..\os\win32\readdir.h"\
   	
  -
  -"$(INTDIR)\gen_test_char.obj" : $(SOURCE) $(DEP_CPP_GEN_T) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
  -
  -DEP_CPP_GEN_T=\
  -	"..\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"\
  -	"..\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)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.5       +11 -11    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gen_uri_delims.mak	2000/09/21 13:57:25	1.4
  +++ gen_uri_delims.mak	2000/12/20 00:29:50	1.5
  @@ -32,7 +32,7 @@
   !IF  "$(CFG)" == "gen_uri_delims - Win32 Release"
   
   OUTDIR=.
  -INTDIR=.\gen_uri_delims_R
  +INTDIR=.\Release
   # Begin Custom Macros
   OutDir=.
   # End Custom Macros
  @@ -48,17 +48,17 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\gen_uri_delims.idb"
   	-@erase "$(INTDIR)\gen_uri_delims.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\gen_uri_delims.exe"
   
   "$(INTDIR)" :
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
  - "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\gen_uri_delims_R/
  +CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -125,7 +125,7 @@
   !ELSEIF  "$(CFG)" == "gen_uri_delims - Win32 Debug"
   
   OUTDIR=.
  -INTDIR=.\gen_uri_delims_D
  +INTDIR=.\Debug
   # Begin Custom Macros
   OutDir=.
   # End Custom Macros
  @@ -141,9 +141,9 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\gen_uri_delims.idb"
   	-@erase "$(INTDIR)\gen_uri_delims.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
  +	-@erase "$(INTDIR)\gen_uri_delims.pdb"
   	-@erase "$(OUTDIR)\gen_uri_delims.exe"
   	-@erase "$(OUTDIR)\gen_uri_delims.pdb"
   
  @@ -151,9 +151,9 @@
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
  - /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\gen_uri_delims_D/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\
  + "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  
  
  
  1.18      +26 -52    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApacheModuleAuthAnon.mak	2000/12/11 02:24:21	1.17
  +++ ApacheModuleAuthAnon.mak	2000/12/20 00:29:52	1.18
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
   
  -OUTDIR=.\ApacheModuleAuthAnonR
  -INTDIR=.\ApacheModuleAuthAnonR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleAuthAnonR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleAuthAnon.idb"
   	-@erase "$(INTDIR)\mod_auth_anon.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.dll"
   	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.exp"
   	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleAuthAnon" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -116,7 +116,7 @@
    /base:@"BaseAddr.ref",mod_auth_anon 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_auth_anon.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleAuthAnon.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -125,10 +125,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleAuthAnonD
  -INTDIR=.\ApacheModuleAuthAnonD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleAuthAnonD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -146,9 +146,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleAuthAnon.idb"
   	-@erase "$(INTDIR)\mod_auth_anon.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.dll"
   	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.exp"
   	-@erase "$(OUTDIR)\ApacheModuleAuthAnon.lib"
  @@ -159,10 +158,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleAuthAnon" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -211,7 +210,7 @@
    /base:@"BaseAddr.ref",mod_auth_anon 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_auth_anon.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleAuthAnon.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -227,13 +226,13 @@
   !IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -241,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -254,9 +253,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_auth_anon.c
  -
  -!IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
  -
   DEP_CPP_MOD_A=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -275,37 +271,15 @@
   	".\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.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\http_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.4       +31 -57    apache-1.3/src/os/win32/ApacheModuleAuthDBM.mak
  
  Index: ApacheModuleAuthDBM.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthDBM.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleAuthDBM.mak	2000/12/11 02:24:21	1.3
  +++ ApacheModuleAuthDBM.mak	2000/12/20 00:29:52	1.4
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
   
  -OUTDIR=.\ApacheModuleAuthDBMR
  -INTDIR=.\ApacheModuleAuthDBMR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleAuthDBMR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -54,8 +54,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleAuthDBM.idb"
   	-@erase "$(INTDIR)\mod_auth_dbm.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.dll"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.exp"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.lib"
  @@ -65,10 +65,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\lib\sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\ApacheModuleAuthDBMR/
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheModuleAuthDBM" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -116,8 +116,8 @@
    /implib:"$(OUTDIR)\ApacheModuleAuthDBM.lib" /base:@"BaseAddr.ref",mod_auth_dbm 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_auth_dbm.obj" \
  -	"..\..\CoreR\ApacheCore.lib" \
  -	"..\..\lib\sdbm\Release\sdbm.lib"
  +	"..\..\lib\sdbm\LibR\sdbm.lib" \
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleAuthDBM.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -126,10 +126,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleAuthDBMD
  -INTDIR=.\ApacheModuleAuthDBMD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleAuthDBMD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -148,9 +148,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleAuthDBM.idb"
   	-@erase "$(INTDIR)\mod_auth_dbm.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.dll"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.exp"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDBM.lib"
  @@ -161,10 +160,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I\
  - "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\ApacheModuleAuthDBMD/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
  + "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheModuleAuthDBM" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -212,8 +211,8 @@
    /implib:"$(OUTDIR)\ApacheModuleAuthDBM.lib" /base:@"BaseAddr.ref",mod_auth_dbm 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_auth_dbm.obj" \
  -	"..\..\CoreD\ApacheCore.lib" \
  -	"..\..\lib\sdbm\Debug\sdbm.lib"
  +	"..\..\Debug\ApacheCore.lib" \
  +	"..\..\lib\sdbm\LibD\sdbm.lib"
   
   "$(OUTDIR)\ApacheModuleAuthDBM.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -229,13 +228,13 @@
   !IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -243,12 +242,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -258,12 +257,12 @@
   !IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
   
   "sdbm - Win32 Release" : 
  -   cd "\live\apache-1.3\src\lib\sdbm"
  +   cd "\live\apache-1.3.15\src\lib\sdbm"
      $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Release" 
      cd "..\..\os\win32"
   
   "sdbm - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src\lib\sdbm"
  +   cd "\live\apache-1.3.15\src\lib\sdbm"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Release"\
    RECURSE=1 
      cd "..\..\os\win32"
  @@ -271,12 +270,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
   
   "sdbm - Win32 Debug" : 
  -   cd "\live\apache-1.3\src\lib\sdbm"
  +   cd "\live\apache-1.3.15\src\lib\sdbm"
      $(MAKE) /$(MAKEFLAGS) /F ".\sdbm.mak" CFG="sdbm - Win32 Debug" 
      cd "..\..\os\win32"
   
   "sdbm - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src\lib\sdbm"
  +   cd "\live\apache-1.3.15\src\lib\sdbm"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\sdbm.mak" CFG="sdbm - Win32 Debug"\
    RECURSE=1 
      cd "..\..\os\win32"
  @@ -284,9 +283,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_auth_dbm.c
  -
  -!IF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Release"
  -
   DEP_CPP_MOD_A=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -305,37 +301,15 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  -
  -"$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleAuthDBM - Win32 Debug"
  -
  -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_config.h"\
  -	"..\..\include\http_core.h"\
  -	"..\..\include\http_log.h"\
  -	"..\..\include\http_protocol.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\lib\sdbm\sdbm.h"\
  -	".\os.h"\
  -	".\readdir.h"\
  +NODEP_CPP_MOD_A=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\mod_auth_dbm.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.7       +28 -57    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleAuthDigest.mak	2000/12/11 02:24:21	1.6
  +++ ApacheModuleAuthDigest.mak	2000/12/20 00:29:53	1.7
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
   
  -OUTDIR=.\ApacheModuleAuthDigestR
  -INTDIR=.\ApacheModuleAuthDigestR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleAuthDigestR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleAuthDigest.idb"
   	-@erase "$(INTDIR)\mod_auth_digest.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.dll"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.exp"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleAuthDigest" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -116,7 +116,7 @@
    /base:@"BaseAddr.ref",mod_auth_digest 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_auth_digest.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleAuthDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -125,10 +125,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleAuthDigestD
  -INTDIR=.\ApacheModuleAuthDigestD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleAuthDigestD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -146,9 +146,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleAuthDigest.idb"
   	-@erase "$(INTDIR)\mod_auth_digest.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.dll"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.exp"
   	-@erase "$(OUTDIR)\ApacheModuleAuthDigest.lib"
  @@ -159,10 +158,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleAuthDigest" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -207,11 +206,11 @@
    /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthDigest.pdb"\
    /map:"$(INTDIR)\ApacheModuleAuthDigest.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleAuthDigest.dll"\
  - /implib:"$(OUTDIR)\ApacheModuleAuthDigest.lib" /pdbtype:sept\
  + /implib:"$(OUTDIR)\ApacheModuleAuthDigest.lib"\
    /base:@"BaseAddr.ref",mod_auth_digest 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_auth_digest.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleAuthDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -227,13 +226,13 @@
   !IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -241,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -254,9 +253,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\experimental\mod_auth_digest.c
  -
  -!IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
  -
   DEP_CPP_MOD_A=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -279,41 +275,16 @@
   	".\os.h"\
   	".\readdir.h"\
   	
  -
  -"$(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.h"\
  -	"..\..\include\ap_alloc.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"\
  +NODEP_CPP_MOD_A=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\sfio.h"\
  +	"..\..\modules\experimental\mm.h"\
   	
   
   "$(INTDIR)\mod_auth_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.18      +26 -51    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApacheModuleCERNMeta.mak	2000/12/11 02:24:21	1.17
  +++ ApacheModuleCERNMeta.mak	2000/12/20 00:29:53	1.18
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
   
  -OUTDIR=.\ApacheModuleCERNMetaR
  -INTDIR=.\ApacheModuleCERNMetaR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleCERNMetaR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleCERNMeta.idb"
   	-@erase "$(INTDIR)\mod_cern_meta.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.dll"
   	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.exp"
   	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleCERNMeta" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -116,7 +116,7 @@
    /base:@"BaseAddr.ref",mod_cern_meta 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_cern_meta.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleCERNMeta.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -125,10 +125,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleCERNMetaD
  -INTDIR=.\ApacheModuleCERNMetaD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleCERNMetaD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -146,9 +146,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleCERNMeta.idb"
   	-@erase "$(INTDIR)\mod_cern_meta.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.dll"
   	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.exp"
   	-@erase "$(OUTDIR)\ApacheModuleCERNMeta.lib"
  @@ -159,10 +158,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleCERNMeta" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -211,7 +210,7 @@
    /base:@"BaseAddr.ref",mod_cern_meta 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_cern_meta.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleCERNMeta.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -227,13 +226,13 @@
   !IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -241,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -254,9 +253,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_cern_meta.c
  -
  -!IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
  -
   DEP_CPP_MOD_C=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -274,36 +270,15 @@
   	".\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.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_log.h"\
  -	"..\..\include\http_request.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.19      +26 -53    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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ApacheModuleDigest.mak	2000/12/11 02:24:21	1.18
  +++ ApacheModuleDigest.mak	2000/12/20 00:29:54	1.19
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
   
  -OUTDIR=.\ApacheModuleDigestR
  -INTDIR=.\ApacheModuleDigestR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleDigestR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleDigest.idb"
   	-@erase "$(INTDIR)\mod_digest.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleDigest.dll"
   	-@erase "$(OUTDIR)\ApacheModuleDigest.exp"
   	-@erase "$(OUTDIR)\ApacheModuleDigest.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleDigest" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -114,7 +114,7 @@
    /implib:"$(OUTDIR)\ApacheModuleDigest.lib" /base:@"BaseAddr.ref",mod_digest 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_digest.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -123,10 +123,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleDigestD
  -INTDIR=.\ApacheModuleDigestD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleDigestD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -144,9 +144,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleDigest.idb"
   	-@erase "$(INTDIR)\mod_digest.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleDigest.dll"
   	-@erase "$(OUTDIR)\ApacheModuleDigest.exp"
   	-@erase "$(OUTDIR)\ApacheModuleDigest.lib"
  @@ -157,10 +156,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleDigest" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -207,7 +206,7 @@
    /implib:"$(OUTDIR)\ApacheModuleDigest.lib" /base:@"BaseAddr.ref",mod_digest 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_digest.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleDigest.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -223,13 +222,13 @@
   !IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -237,12 +236,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -250,9 +249,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_digest.c
  -
  -!IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
  -
   DEP_CPP_MOD_D=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -272,38 +268,15 @@
   	".\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.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\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"\
  +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 
   
   
   !ENDIF 
  
  
  
  1.18      +26 -49    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApacheModuleExpires.mak	2000/12/11 02:24:21	1.17
  +++ ApacheModuleExpires.mak	2000/12/20 00:29:54	1.18
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
   
  -OUTDIR=.\ApacheModuleExpiresR
  -INTDIR=.\ApacheModuleExpiresR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleExpiresR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleExpires.idb"
   	-@erase "$(INTDIR)\mod_expires.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleExpires.dll"
   	-@erase "$(OUTDIR)\ApacheModuleExpires.exp"
   	-@erase "$(OUTDIR)\ApacheModuleExpires.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleExpires" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -115,7 +115,7 @@
    /implib:"$(OUTDIR)\ApacheModuleExpires.lib" /base:@"BaseAddr.ref",mod_expires 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_expires.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleExpires.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -124,10 +124,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleExpiresD
  -INTDIR=.\ApacheModuleExpiresD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleExpiresD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -145,9 +145,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleExpires.idb"
   	-@erase "$(INTDIR)\mod_expires.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleExpires.dll"
   	-@erase "$(OUTDIR)\ApacheModuleExpires.exp"
   	-@erase "$(OUTDIR)\ApacheModuleExpires.lib"
  @@ -158,10 +157,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleExpires" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -209,7 +208,7 @@
    /implib:"$(OUTDIR)\ApacheModuleExpires.lib" /base:@"BaseAddr.ref",mod_expires 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_expires.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleExpires.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -225,13 +224,13 @@
   !IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -239,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -252,9 +251,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_expires.c
  -
  -!IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
  -
   DEP_CPP_MOD_E=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -270,34 +266,15 @@
   	".\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.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_log.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.18      +26 -48    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApacheModuleHeaders.mak	2000/12/11 02:24:21	1.17
  +++ ApacheModuleHeaders.mak	2000/12/20 00:29:54	1.18
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
   
  -OUTDIR=.\ApacheModuleHeadersR
  -INTDIR=.\ApacheModuleHeadersR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleHeadersR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleHeaders.idb"
   	-@erase "$(INTDIR)\mod_headers.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleHeaders.dll"
   	-@erase "$(OUTDIR)\ApacheModuleHeaders.exp"
   	-@erase "$(OUTDIR)\ApacheModuleHeaders.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleHeaders" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -115,7 +115,7 @@
    /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" /base:@"BaseAddr.ref",mod_headers 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_headers.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleHeaders.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -124,10 +124,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleHeadersD
  -INTDIR=.\ApacheModuleHeadersD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleHeadersD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -145,9 +145,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleHeaders.idb"
   	-@erase "$(INTDIR)\mod_headers.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleHeaders.dll"
   	-@erase "$(OUTDIR)\ApacheModuleHeaders.exp"
   	-@erase "$(OUTDIR)\ApacheModuleHeaders.lib"
  @@ -158,10 +157,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleHeaders" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -209,7 +208,7 @@
    /implib:"$(OUTDIR)\ApacheModuleHeaders.lib" /base:@"BaseAddr.ref",mod_headers 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_headers.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleHeaders.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -225,13 +224,13 @@
   !IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -239,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -252,9 +251,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_headers.c
  -
  -!IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
  -
   DEP_CPP_MOD_H=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -269,33 +265,15 @@
   	".\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.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\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.15      +26 -54    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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleInfo.mak	2000/12/11 02:24:22	1.14
  +++ ApacheModuleInfo.mak	2000/12/20 00:29:54	1.15
  @@ -31,10 +31,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
   
  -OUTDIR=.\ApacheModuleInfoR
  -INTDIR=.\ApacheModuleInfoR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleInfoR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -52,8 +52,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleInfo.idb"
   	-@erase "$(INTDIR)\mod_info.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleInfo.dll"
   	-@erase "$(OUTDIR)\ApacheModuleInfo.exp"
   	-@erase "$(OUTDIR)\ApacheModuleInfo.lib"
  @@ -63,10 +63,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleInfo" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -113,7 +113,7 @@
    /implib:"$(OUTDIR)\ApacheModuleInfo.lib" /base:@"BaseAddr.ref",mod_info 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_info.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleInfo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -122,10 +122,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleInfoD
  -INTDIR=.\ApacheModuleInfoD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleInfoD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -143,9 +143,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleInfo.idb"
   	-@erase "$(INTDIR)\mod_info.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleInfo.dll"
   	-@erase "$(OUTDIR)\ApacheModuleInfo.exp"
   	-@erase "$(OUTDIR)\ApacheModuleInfo.lib"
  @@ -156,10 +155,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleInfo" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -206,7 +205,7 @@
    /implib:"$(OUTDIR)\ApacheModuleInfo.lib" /base:@"BaseAddr.ref",mod_info 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_info.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleInfo.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -222,13 +221,13 @@
   !IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -236,12 +235,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -249,9 +248,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_info.c
  -
  -!IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
  -
   DEP_CPP_MOD_I=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -272,39 +268,15 @@
   	".\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.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\httpd.h"\
  -	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.22      +87 -237   apache-1.3/src/os/win32/ApacheModuleProxy.mak
  
  Index: ApacheModuleProxy.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleProxy.mak,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ApacheModuleProxy.mak	2000/12/11 02:24:20	1.21
  +++ ApacheModuleProxy.mak	2000/12/20 00:29:54	1.22
  @@ -53,13 +53,13 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleProxy.idb"
   	-@erase "$(INTDIR)\mod_proxy.obj"
   	-@erase "$(INTDIR)\proxy_cache.obj"
   	-@erase "$(INTDIR)\proxy_connect.obj"
   	-@erase "$(INTDIR)\proxy_ftp.obj"
   	-@erase "$(INTDIR)\proxy_http.obj"
   	-@erase "$(INTDIR)\proxy_util.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleProxy.dll"
   	-@erase "$(OUTDIR)\ApacheModuleProxy.exp"
   	-@erase "$(OUTDIR)\ApacheModuleProxy.lib"
  @@ -69,9 +69,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /D\
  +CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\modules\proxy" /D\
    "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheModuleProxy" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -117,8 +117,7 @@
    /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
    /map:"$(INTDIR)\ApacheModuleProxy.map" /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
  - /implib:"$(OUTDIR)\ApacheModuleProxy.lib"\
  - /base:@"../../os/win32/BaseAddr.ref",mod_proxy 
  + /implib:"$(OUTDIR)\ApacheModuleProxy.lib" /base:@"BaseAddr.ref",mod_proxy 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_proxy.obj" \
   	"$(INTDIR)\proxy_cache.obj" \
  @@ -126,7 +125,7 @@
   	"$(INTDIR)\proxy_ftp.obj" \
   	"$(INTDIR)\proxy_http.obj" \
   	"$(INTDIR)\proxy_util.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -156,14 +155,13 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleProxy.idb"
   	-@erase "$(INTDIR)\mod_proxy.obj"
   	-@erase "$(INTDIR)\proxy_cache.obj"
   	-@erase "$(INTDIR)\proxy_connect.obj"
   	-@erase "$(INTDIR)\proxy_ftp.obj"
   	-@erase "$(INTDIR)\proxy_http.obj"
   	-@erase "$(INTDIR)\proxy_util.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleProxy.dll"
   	-@erase "$(OUTDIR)\ApacheModuleProxy.exp"
   	-@erase "$(OUTDIR)\ApacheModuleProxy.lib"
  @@ -174,9 +172,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I\
  + "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  + /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheModuleProxy" /FD\
  + /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -222,8 +221,7 @@
    /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
    /map:"$(INTDIR)\ApacheModuleProxy.map" /debug /machine:I386\
    /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
  - /implib:"$(OUTDIR)\ApacheModuleProxy.lib"\
  - /base:@"../../os/win32/BaseAddr.ref",mod_proxy 
  + /implib:"$(OUTDIR)\ApacheModuleProxy.lib" /base:@"BaseAddr.ref",mod_proxy 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_proxy.obj" \
   	"$(INTDIR)\proxy_cache.obj" \
  @@ -231,7 +229,7 @@
   	"$(INTDIR)\proxy_ftp.obj" \
   	"$(INTDIR)\proxy_http.obj" \
   	"$(INTDIR)\proxy_util.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleProxy.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -243,36 +241,7 @@
   
   !IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleProxy - Win32 Debug"
  -SOURCE=.\mod_proxy.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
  -DEP_CPP_MOD_P=\
  -	"..\..\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_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"
  -
  +SOURCE=..\..\modules\proxy\mod_proxy.c
   DEP_CPP_MOD_P=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -289,20 +258,22 @@
   	"..\..\include\http_vhost.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  +	"..\..\modules\proxy\mod_proxy.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +NODEP_CPP_MOD_P=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ENDIF 
   
  -SOURCE=.\proxy_cache.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
  +SOURCE=..\..\modules\proxy\proxy_cache.c
   DEP_CPP_PROXY=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -322,49 +293,23 @@
   	"..\..\include\multithread.h"\
   	"..\..\include\util_date.h"\
   	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  +	"..\..\modules\proxy\mod_proxy.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +NODEP_CPP_PROXY=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
  +	"..\..\modules\proxy\os.h"\
   	
   
   "$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
  -DEP_CPP_PROXY=\
  -	"..\..\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\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)"
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\proxy_connect.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
  +SOURCE=..\..\modules\proxy\proxy_connect.c
   DEP_CPP_PROXY_=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -380,45 +325,22 @@
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  +	"..\..\modules\proxy\mod_proxy.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +NODEP_CPP_PROXY_=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_=\
  -	"..\..\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_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)"
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\proxy_ftp.c
   
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
  +SOURCE=..\..\modules\proxy\proxy_ftp.c
   DEP_CPP_PROXY_F=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -435,73 +357,22 @@
   	"..\..\include\http_protocol.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  +	"..\..\modules\proxy\mod_proxy.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +NODEP_CPP_PROXY_F=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
   
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_F=\
  -	"..\..\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_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)"
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\proxy_http.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
  -DEP_CPP_PROXY_H=\
  -	"..\..\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_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"
   
  +SOURCE=..\..\modules\proxy\proxy_http.c
   DEP_CPP_PROXY_H=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -519,20 +390,22 @@
   	"..\..\include\httpd.h"\
   	"..\..\include\util_date.h"\
   	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  +	"..\..\modules\proxy\mod_proxy.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +NODEP_CPP_PROXY_H=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ENDIF 
  -
  -SOURCE=.\proxy_util.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
  +SOURCE=..\..\modules\proxy\proxy_util.c
   DEP_CPP_PROXY_U=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -551,70 +424,47 @@
   	"..\..\include\multithread.h"\
   	"..\..\include\util_date.h"\
   	"..\..\include\util_uri.h"\
  -	"..\..\os\win32\os.h"\
  -	"..\..\os\win32\readdir.h"\
  -	".\mod_proxy.h"\
  +	"..\..\modules\proxy\mod_proxy.h"\
  +	".\os.h"\
  +	".\readdir.h"\
  +	
  +NODEP_CPP_PROXY_U=\
  +	"..\..\include\ap_config_auto.h"\
  +	"..\..\include\ebcdic.h"\
  +	"..\..\include\os.h"\
  +	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_PROXY_U=\
  -	"..\..\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\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)"
  -
  -
  -!ENDIF 
  -
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
  -   cd ".\modules\proxy"
  +   cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
  -   cd ".\modules\proxy"
  +   cd ".\os\win32"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
  -   cd ".\modules\proxy"
  +   cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
  -   cd ".\modules\proxy"
  +   cd ".\os\win32"
   
   !ENDIF 
   
  
  
  
  1.19      +27 -54    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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ApacheModuleRewrite.mak	2000/12/11 02:24:22	1.18
  +++ ApacheModuleRewrite.mak	2000/12/20 00:29:55	1.19
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
   
  -OUTDIR=.\ApacheModuleRewriteR
  -INTDIR=.\ApacheModuleRewriteR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleRewriteR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,9 +53,9 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleRewrite.idb"
   	-@erase "$(INTDIR)\mod_rewrite.obj"
   	-@erase "$(INTDIR)\passwd.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleRewrite.dll"
   	-@erase "$(OUTDIR)\ApacheModuleRewrite.exp"
   	-@erase "$(OUTDIR)\ApacheModuleRewrite.lib"
  @@ -65,10 +65,11 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /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)\ApacheModuleRewrite" /FD\
  + /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -117,7 +118,7 @@
   LINK32_OBJS= \
   	"$(INTDIR)\mod_rewrite.obj" \
   	"$(INTDIR)\passwd.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleRewrite.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -126,10 +127,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleRewriteD
  -INTDIR=.\ApacheModuleRewriteD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleRewriteD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -147,10 +148,9 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleRewrite.idb"
   	-@erase "$(INTDIR)\mod_rewrite.obj"
   	-@erase "$(INTDIR)\passwd.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleRewrite.dll"
   	-@erase "$(OUTDIR)\ApacheModuleRewrite.exp"
   	-@erase "$(OUTDIR)\ApacheModuleRewrite.lib"
  @@ -161,11 +161,11 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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\
  +CPP_PROJ=/nologo /MDd /W3 /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)\ApacheModuleRewrite" /FD\
    /c 
  -CPP_OBJS=.\ApacheModuleRewriteD/
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -214,7 +214,7 @@
   LINK32_OBJS= \
   	"$(INTDIR)\mod_rewrite.obj" \
   	"$(INTDIR)\passwd.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleRewrite.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -230,13 +230,13 @@
   !IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -244,12 +244,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -257,9 +257,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_rewrite.c
  -
  -!IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
  -
   DEP_CPP_MOD_R=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -280,39 +277,15 @@
   	".\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.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_request.h"\
  -	"..\..\include\http_vhost.h"\
  -	"..\..\include\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	"..\..\modules\standard\mod_rewrite.h"\
  -	".\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.12      +26 -50    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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApacheModuleSpeling.mak	2000/12/11 02:24:22	1.11
  +++ ApacheModuleSpeling.mak	2000/12/20 00:29:55	1.12
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
   
  -OUTDIR=.\ApacheModuleSpelingR
  -INTDIR=.\ApacheModuleSpelingR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleSpelingR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleSpeling.idb"
   	-@erase "$(INTDIR)\mod_speling.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleSpeling.dll"
   	-@erase "$(OUTDIR)\ApacheModuleSpeling.exp"
   	-@erase "$(OUTDIR)\ApacheModuleSpeling.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleSpeling" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -115,7 +115,7 @@
    /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" /base:@"BaseAddr.ref",mod_speling 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_speling.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -124,10 +124,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleSpelingD
  -INTDIR=.\ApacheModuleSpelingD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleSpelingD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -145,9 +145,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleSpeling.idb"
   	-@erase "$(INTDIR)\mod_speling.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleSpeling.dll"
   	-@erase "$(OUTDIR)\ApacheModuleSpeling.exp"
   	-@erase "$(OUTDIR)\ApacheModuleSpeling.lib"
  @@ -158,10 +157,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleSpeling" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -209,7 +208,7 @@
    /implib:"$(OUTDIR)\ApacheModuleSpeling.lib" /base:@"BaseAddr.ref",mod_speling 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_speling.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -225,13 +224,13 @@
   !IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -239,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -252,9 +251,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_speling.c
  -
  -!IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
  -
   DEP_CPP_MOD_S=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -271,35 +267,15 @@
   	".\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.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\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.20      +26 -55    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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ApacheModuleStatus.mak	2000/12/11 02:24:22	1.19
  +++ ApacheModuleStatus.mak	2000/12/20 00:29:55	1.20
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
   
  -OUTDIR=.\ApacheModuleStatusR
  -INTDIR=.\ApacheModuleStatusR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleStatusR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleStatus.idb"
   	-@erase "$(INTDIR)\mod_status.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleStatus.dll"
   	-@erase "$(OUTDIR)\ApacheModuleStatus.exp"
   	-@erase "$(OUTDIR)\ApacheModuleStatus.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleStatus" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -114,7 +114,7 @@
    /implib:"$(OUTDIR)\ApacheModuleStatus.lib" /base:@"BaseAddr.ref",mod_status 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_status.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -123,10 +123,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleStatusD
  -INTDIR=.\ApacheModuleStatusD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleStatusD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -144,9 +144,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleStatus.idb"
   	-@erase "$(INTDIR)\mod_status.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleStatus.dll"
   	-@erase "$(OUTDIR)\ApacheModuleStatus.exp"
   	-@erase "$(OUTDIR)\ApacheModuleStatus.lib"
  @@ -157,10 +156,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleStatus" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -207,7 +206,7 @@
    /implib:"$(OUTDIR)\ApacheModuleStatus.lib" /base:@"BaseAddr.ref",mod_status 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_status.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -223,13 +222,13 @@
   !IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -237,12 +236,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -250,9 +249,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_status.c
  -
  -!IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
  -
   DEP_CPP_MOD_S=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -274,40 +270,15 @@
   	".\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.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\httpd.h"\
  -	"..\..\include\scoreboard.h"\
  -	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.18      +26 -49    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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ApacheModuleUserTrack.mak	2000/12/11 02:24:22	1.17
  +++ ApacheModuleUserTrack.mak	2000/12/20 00:29:56	1.18
  @@ -32,10 +32,10 @@
   
   !IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
   
  -OUTDIR=.\ApacheModuleUserTrackR
  -INTDIR=.\ApacheModuleUserTrackR
  +OUTDIR=.\Release
  +INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\ApacheModuleUserTrackR
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -53,8 +53,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleUserTrack.idb"
   	-@erase "$(INTDIR)\mod_usertrack.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheModuleUserTrack.dll"
   	-@erase "$(OUTDIR)\ApacheModuleUserTrack.exp"
   	-@erase "$(OUTDIR)\ApacheModuleUserTrack.lib"
  @@ -64,10 +64,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG"\
  + /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleUserTrack" /FD /c 
  +CPP_OBJS=.\Release/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -116,7 +116,7 @@
    /base:@"BaseAddr.ref",mod_usertrack 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_usertrack.obj" \
  -	"..\..\CoreR\ApacheCore.lib"
  +	"..\..\Release\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleUserTrack.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -125,10 +125,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
   
  -OUTDIR=.\ApacheModuleUserTrackD
  -INTDIR=.\ApacheModuleUserTrackD
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\ApacheModuleUserTrackD
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -146,9 +146,8 @@
   !ELSE 
   CLEAN :
   !ENDIF 
  +	-@erase "$(INTDIR)\ApacheModuleUserTrack.idb"
   	-@erase "$(INTDIR)\mod_usertrack.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\ApacheModuleUserTrack.dll"
   	-@erase "$(OUTDIR)\ApacheModuleUserTrack.exp"
   	-@erase "$(OUTDIR)\ApacheModuleUserTrack.lib"
  @@ -159,10 +158,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /D\
  + "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\ApacheModuleUserTrack" /FD /c 
  +CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -211,7 +210,7 @@
    /base:@"BaseAddr.ref",mod_usertrack 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_usertrack.obj" \
  -	"..\..\CoreD\ApacheCore.lib"
  +	"..\..\Debug\ApacheCore.lib"
   
   "$(OUTDIR)\ApacheModuleUserTrack.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -227,13 +226,13 @@
   !IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
   
   "ApacheCore - Win32 Release" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Release"\
    
      cd ".\os\win32"
   
   "ApacheCore - Win32 ReleaseCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Release" RECURSE=1 
      cd ".\os\win32"
  @@ -241,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
   
   "ApacheCore - Win32 Debug" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) /F ".\ApacheCore.mak" CFG="ApacheCore - Win32 Debug" 
      cd ".\os\win32"
   
   "ApacheCore - Win32 DebugCLEAN" : 
  -   cd "\live\apache-1.3\src"
  +   cd "\live\apache-1.3.15\src"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ApacheCore.mak"\
    CFG="ApacheCore - Win32 Debug" RECURSE=1 
      cd ".\os\win32"
  @@ -254,9 +253,6 @@
   !ENDIF 
   
   SOURCE=..\..\modules\standard\mod_usertrack.c
  -
  -!IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
  -
   DEP_CPP_MOD_U=\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_alloc.h"\
  @@ -272,34 +268,15 @@
   	".\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.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\httpd.h"\
  -	"..\..\include\util_uri.h"\
  -	".\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 
   
   
   !ENDIF 
  
  
  
  1.8       +15 -14    apache-1.3/src/os/win32/ApacheOS.mak
  
  Index: ApacheOS.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheOS.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ApacheOS.mak	2000/09/21 13:57:40	1.7
  +++ ApacheOS.mak	2000/12/20 00:29:56	1.8
  @@ -28,10 +28,10 @@
   
   !IF  "$(CFG)" == "ApacheOS - Win32 Release"
   
  -OUTDIR=.\ApacheOSR
  -INTDIR=.\ApacheOSR
  +OUTDIR=.\LibR
  +INTDIR=.\LibR
   # Begin Custom Macros
  -OutDir=.\ApacheOSR
  +OutDir=.\LibR
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -45,8 +45,8 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ApacheOS.idb"
   	-@erase "$(INTDIR)\os.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheOS.lib"
   
   "$(OUTDIR)" :
  @@ -54,9 +54,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\ApacheOSR/
  +CPP_PROJ=/nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c 
  +CPP_OBJS=.\LibR/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -105,10 +105,10 @@
   
   !ELSEIF  "$(CFG)" == "ApacheOS - Win32 Debug"
   
  -OUTDIR=.\ApacheOSD
  -INTDIR=.\ApacheOSD
  +OUTDIR=.\LibD
  +INTDIR=.\LibD
   # Begin Custom Macros
  -OutDir=.\ApacheOSD
  +OutDir=.\LibD
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -122,8 +122,9 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\ApacheOS.idb"
  +	-@erase "$(INTDIR)\ApacheOS.pdb"
   	-@erase "$(INTDIR)\os.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\ApacheOS.lib"
   
   "$(OUTDIR)" :
  @@ -131,9 +132,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  -CPP_OBJS=.\ApacheOSD/
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ApacheOS" /FD /c 
  +CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  
  
  
  1.9       +0 -8      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- install.mak	2000/12/11 02:24:25	1.8
  +++ install.mak	2000/12/20 00:30:06	1.9
  @@ -232,8 +232,6 @@
   	"..\..\..\..\include\util_uri.h"\
   	"..\..\os.h"\
   	"..\..\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_SN=\
   	"..\..\..\..\include\ap_config_auto.h"\
  @@ -259,8 +257,6 @@
   	"..\..\..\..\include\util_uri.h"\
   	"..\..\os.h"\
   	"..\..\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_AP_SN=\
   	"..\..\..\..\include\ap_config_auto.h"\
  @@ -287,8 +283,6 @@
   	"..\..\..\..\include\conf.h"\
   	"..\..\..\..\include\hsregex.h"\
   	"..\..\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_INSTA=\
   	"..\..\..\..\include\ap_config_auto.h"\
  @@ -307,8 +301,6 @@
   	"..\..\..\..\include\conf.h"\
   	"..\..\..\..\include\hsregex.h"\
   	"..\..\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_INSTA=\
   	"..\..\..\..\include\ap_config_auto.h"\
  
  
  
  1.2       +6 -7      apache-1.3/src/os/win32/win9xconhook/Win9xConHook.mak
  
  Index: Win9xConHook.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/win9xconhook/Win9xConHook.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Win9xConHook.mak	2000/12/11 02:24:26	1.1
  +++ Win9xConHook.mak	2000/12/20 00:30:10	1.2
  @@ -48,7 +48,7 @@
   !ENDIF 
   
   CLEAN :
  -	-@erase "$(INTDIR)\vc50.idb"
  +	-@erase "$(INTDIR)\Win9xConHook.idb"
   	-@erase "$(INTDIR)\Win9xConHook.obj"
   	-@erase "$(OUTDIR)\Win9xConHook.dll"
   	-@erase "$(OUTDIR)\Win9xConHook.exp"
  @@ -59,8 +59,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  + "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -135,8 +135,7 @@
   !ENDIF 
   
   CLEAN :
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
  +	-@erase "$(INTDIR)\Win9xConHook.idb"
   	-@erase "$(INTDIR)\Win9xConHook.obj"
   	-@erase "$(OUTDIR)\Win9xConHook.dll"
   	-@erase "$(OUTDIR)\Win9xConHook.exp"
  @@ -148,8 +147,8 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
  - /D "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  + "SHARED_MODULE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Win9xConHook" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  
  
  
  1.8       +15 -65    apache-1.3/src/regex/regex.mak
  
  Index: regex.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/regex/regex.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- regex.mak	2000/12/11 02:24:26	1.7
  +++ regex.mak	2000/12/20 00:30:12	1.8
  @@ -27,10 +27,10 @@
   
   !IF  "$(CFG)" == "regex - Win32 Release"
   
  -OUTDIR=.\Release
  -INTDIR=.\Release
  +OUTDIR=.\LibR
  +INTDIR=.\LibR
   # Begin Custom Macros
  -OutDir=.\Release
  +OutDir=.\LibR
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -46,9 +46,9 @@
   CLEAN :
   	-@erase "$(INTDIR)\regcomp.obj"
   	-@erase "$(INTDIR)\regerror.obj"
  +	-@erase "$(INTDIR)\regex.idb"
   	-@erase "$(INTDIR)\regexec.obj"
   	-@erase "$(INTDIR)\regfree.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\regex.lib"
   
   "$(OUTDIR)" :
  @@ -56,9 +56,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  + "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c 
  +CPP_OBJS=.\LibR/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -110,10 +110,10 @@
   
   !ELSEIF  "$(CFG)" == "regex - Win32 Debug"
   
  -OUTDIR=.\Debug
  -INTDIR=.\Debug
  +OUTDIR=.\LibD
  +INTDIR=.\LibD
   # Begin Custom Macros
  -OutDir=.\Debug
  +OutDir=.\LibD
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -129,9 +129,10 @@
   CLEAN :
   	-@erase "$(INTDIR)\regcomp.obj"
   	-@erase "$(INTDIR)\regerror.obj"
  +	-@erase "$(INTDIR)\regex.idb"
  +	-@erase "$(INTDIR)\regex.pdb"
   	-@erase "$(INTDIR)\regexec.obj"
   	-@erase "$(INTDIR)\regfree.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\regex.lib"
   
   "$(OUTDIR)" :
  @@ -139,9 +140,9 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D\
  + "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\regex" /FD /c 
  +CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
   .c{$(CPP_OBJS)}.obj::
  @@ -210,20 +211,6 @@
   
   
   SOURCE=.\regerror.c
  -
  -!IF  "$(CFG)" == "regex - Win32 Release"
  -
  -DEP_CPP_REGER=\
  -	"..\include\hsregex.h"\
  -	".\regerror.ih"\
  -	".\utils.h"\
  -	
  -
  -"$(INTDIR)\regerror.obj" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "regex - Win32 Debug"
  -
   DEP_CPP_REGER=\
   	"..\include\hsregex.h"\
   	".\regerror.ih"\
  @@ -233,26 +220,7 @@
   "$(INTDIR)\regerror.obj" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\regexec.c
  -
  -!IF  "$(CFG)" == "regex - Win32 Release"
  -
  -DEP_CPP_REGEX=\
  -	"..\include\ap_ctype.h"\
  -	"..\include\hsregex.h"\
  -	".\engine.c"\
  -	".\engine.ih"\
  -	".\regex2.h"\
  -	".\utils.h"\
  -	
  -
  -"$(INTDIR)\regexec.obj" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "regex - Win32 Debug"
  -
   DEP_CPP_REGEX=\
   	"..\include\ap_ctype.h"\
   	"..\include\hsregex.h"\
  @@ -265,23 +233,7 @@
   "$(INTDIR)\regexec.obj" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)"
   
   
  -!ENDIF 
  -
   SOURCE=.\regfree.c
  -
  -!IF  "$(CFG)" == "regex - Win32 Release"
  -
  -DEP_CPP_REGFR=\
  -	"..\include\hsregex.h"\
  -	".\regex2.h"\
  -	".\utils.h"\
  -	
  -
  -"$(INTDIR)\regfree.obj" : $(SOURCE) $(DEP_CPP_REGFR) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "regex - Win32 Debug"
  -
   DEP_CPP_REGFR=\
   	"..\include\hsregex.h"\
   	".\regex2.h"\
  @@ -290,8 +242,6 @@
   
   "$(INTDIR)\regfree.obj" : $(SOURCE) $(DEP_CPP_REGFR) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.8       +20 -91    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- htdigest.mak	2000/12/11 02:24:27	1.7
  +++ htdigest.mak	2000/12/20 00:30:16	1.8
  @@ -49,8 +49,8 @@
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
   	-@erase "$(INTDIR)\ap_getpass.obj"
   	-@erase "$(INTDIR)\ap_md5c.obj"
  +	-@erase "$(INTDIR)\htdigest.idb"
   	-@erase "$(INTDIR)\htdigest.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\htdigest.exe"
   	-@erase "$(OUTDIR)\htdigest.map"
   
  @@ -58,8 +58,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htdigest" /FD\
  + /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -135,9 +136,8 @@
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
   	-@erase "$(INTDIR)\ap_getpass.obj"
   	-@erase "$(INTDIR)\ap_md5c.obj"
  +	-@erase "$(INTDIR)\htdigest.idb"
   	-@erase "$(INTDIR)\htdigest.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\htdigest.exe"
   	-@erase "$(OUTDIR)\htdigest.map"
   	-@erase "$(OUTDIR)\htdigest.pdb"
  @@ -146,9 +146,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\htdigest" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -190,7 +190,7 @@
   LINK32=link.exe
   LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\htdigest.pdb" /map:"$(INTDIR)\htdigest.map" /debug\
  - /machine:I386 /out:"$(OUTDIR)\htdigest.exe" /pdbtype:sept 
  + /machine:I386 /out:"$(OUTDIR)\htdigest.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\ap_cpystrn.obj" \
   	"$(INTDIR)\ap_getpass.obj" \
  @@ -208,9 +208,6 @@
   !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.h"\
   	"..\include\ap_alloc.h"\
  @@ -224,37 +221,17 @@
   	"..\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.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"\
  -	"..\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"\
  @@ -263,32 +240,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"\
  @@ -298,33 +258,16 @@
   	"..\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
  -
  -!IF  "$(CFG)" == "htdigest - Win32 Release"
  -
   DEP_CPP_HTDIG=\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
  @@ -334,26 +277,12 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  -
  -DEP_CPP_HTDIG=\
  -	"..\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_HTDIG=\
  +	"..\include\ap_config_auto.h"\
   	
   
   "$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.16      +31 -177   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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- htpasswd.mak	2000/12/11 02:24:27	1.15
  +++ htpasswd.mak	2000/12/20 00:30:16	1.16
  @@ -53,8 +53,8 @@
   	-@erase "$(INTDIR)\ap_md5c.obj"
   	-@erase "$(INTDIR)\ap_sha1.obj"
   	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\htpasswd.idb"
   	-@erase "$(INTDIR)\htpasswd.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\htpasswd.exe"
   	-@erase "$(OUTDIR)\htpasswd.map"
   
  @@ -62,9 +62,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D\
  + "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\htpasswd" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -148,9 +148,8 @@
   	-@erase "$(INTDIR)\ap_md5c.obj"
   	-@erase "$(INTDIR)\ap_sha1.obj"
   	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\htpasswd.idb"
   	-@erase "$(INTDIR)\htpasswd.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\htpasswd.exe"
   	-@erase "$(OUTDIR)\htpasswd.map"
   	-@erase "$(OUTDIR)\htpasswd.pdb"
  @@ -159,9 +158,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  +CPP_PROJ=/nologo /MDd /W3 /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 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\htpasswd" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -203,7 +202,7 @@
   LINK32=link.exe
   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 
  + /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\ap_base64.obj" \
   	"$(INTDIR)\ap_checkpass.obj" \
  @@ -225,9 +224,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"\
  @@ -236,32 +232,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"\
  @@ -272,34 +252,15 @@
   	"..\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.h"\
   	"..\include\ap_alloc.h"\
  @@ -313,37 +274,17 @@
   	"..\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.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"\
  -	"..\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"\
  @@ -352,32 +293,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"\
  @@ -387,33 +311,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"\
  @@ -423,33 +330,16 @@
   	"..\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.h"\
   	"..\include\ap_alloc.h"\
  @@ -463,37 +353,17 @@
   	"..\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.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"\
  -	"..\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"\
  @@ -505,28 +375,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.6       +9 -25     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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- logresolve.mak	2000/12/11 02:24:28	1.5
  +++ logresolve.mak	2000/12/20 00:30:16	1.6
  @@ -47,8 +47,8 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\logresolve.idb"
   	-@erase "$(INTDIR)\logresolve.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\logresolve.exe"
   	-@erase "$(OUTDIR)\logresolve.map"
   
  @@ -56,9 +56,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "NDEBUG" /D\
  + "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\logresolve" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -128,9 +128,8 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\logresolve.idb"
   	-@erase "$(INTDIR)\logresolve.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\logresolve.exe"
   	-@erase "$(OUTDIR)\logresolve.map"
   	-@erase "$(OUTDIR)\logresolve.pdb"
  @@ -139,9 +138,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  +CPP_PROJ=/nologo /MDd /W3 /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 
  + /Fd"$(INTDIR)\logresolve" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -198,9 +197,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"\
  @@ -208,24 +204,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.6       +11 -26    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rotatelogs.mak	2000/12/11 02:24:28	1.5
  +++ rotatelogs.mak	2000/12/20 00:30:17	1.6
  @@ -47,8 +47,8 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\rotatelogs.idb"
   	-@erase "$(INTDIR)\rotatelogs.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\rotatelogs.exe"
   	-@erase "$(OUTDIR)\rotatelogs.map"
   
  @@ -56,8 +56,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MD /W3 /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\rotatelogs"\
  + /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   
  @@ -127,9 +128,8 @@
   !ENDIF 
   
   CLEAN :
  +	-@erase "$(INTDIR)\rotatelogs.idb"
   	-@erase "$(INTDIR)\rotatelogs.obj"
  -	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(OUTDIR)\rotatelogs.exe"
   	-@erase "$(OUTDIR)\rotatelogs.map"
   	-@erase "$(OUTDIR)\rotatelogs.pdb"
  @@ -138,9 +138,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -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_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\"\
  + /Fd"$(INTDIR)\rotatelogs" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -182,7 +182,7 @@
   LINK32=link.exe
   LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
    /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /debug\
  - /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept 
  + /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
   LINK32_OBJS= \
   	"$(INTDIR)\rotatelogs.obj"
   
  @@ -197,9 +197,6 @@
   !IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\
    "rotatelogs - Win32 Debug"
   SOURCE=.\rotatelogs.c
  -
  -!IF  "$(CFG)" == "rotatelogs - Win32 Release"
  -
   DEP_CPP_ROTAT=\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -207,24 +204,12 @@
   	"..\include\hsregex.h"\
   	"..\os\win32\os.h"\
   	
  -
  -"$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
  -
  -DEP_CPP_ROTAT=\
  -	"..\include\ap_config.h"\
  -	"..\include\ap_ctype.h"\
  -	"..\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)"
   
  -
  -!ENDIF 
   
   
   !ENDIF 
  
  
  

Mime
View raw message