httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/support htdigest.mak htpasswd.mak rotatelogs.mak
Date Thu, 20 Apr 2000 19:28:12 GMT
stoddard    00/04/20 12:28:10

  Modified:    src      ApacheCore.dsp CHANGES Makefile.win
               src/lib/apr aprlib.def
               src/main gen_test_char.dsp gen_uri_delims.dsp
               src/modules/proxy ApacheModuleProxy.dsp
               src/os/win32 ApacheModuleAuthAnon.dsp
                        ApacheModuleCERNMeta.dsp ApacheModuleDigest.dsp
                        ApacheModuleExpires.dsp ApacheModuleHeaders.dsp
                        ApacheModuleInfo.dsp ApacheModuleRewrite.dsp
                        ApacheModuleSpeling.dsp ApacheModuleStatus.dsp
                        ApacheModuleUserTrack.dsp
               src/os/win32/installer/installdll install.mak
               src/support htdigest.mak htpasswd.mak rotatelogs.mak
  Added:       src      Apache.dsw InstallBin.dsp
               src/lib/apr aprlibdll.dsp
               src/os/win32 BaseAddr.ref
  Removed:     src      Apache.mak ApacheCore.mak
               src/ap   ap.mak
               src/lib/apr aprlib.mak
               src/main gen_test_char.mak gen_uri_delims.mak
               src/modules/proxy ApacheModuleProxy.mak
               src/os/win32 ApacheModuleAuthAnon.mak
                        ApacheModuleCERNMeta.mak ApacheModuleDigest.mak
                        ApacheModuleExpires.mak ApacheModuleHeaders.mak
                        ApacheModuleInfo.mak ApacheModuleRewrite.mak
                        ApacheModuleSpeling.mak ApacheModuleStatus.mak
                        ApacheModuleUserTrack.mak
               src/regex regex.mak
  Log:
  Revamp the Win32 make environment. Makefiles have been removed and
  Apache.dsw created to bring together all the pieces. Create new file
  os/win32/BaseAddr.ref to define module base addresses (to prevent
  dll relocation at start-up).
  
  Submitted by:	William Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.16      +56 -6     apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApacheCore.dsp	2000/04/17 13:56:38	1.15
  +++ ApacheCore.dsp	2000/04/20 19:28:02	1.16
  @@ -54,8 +54,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
  -# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
  +# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
  +# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  @@ -81,8 +81,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
  -# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x27800000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
  +# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
  +# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug"
   
   !ENDIF 
   
  @@ -415,11 +415,61 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\main\test_char.h
  +SOURCE=.\main\gen_test_char.exe
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +# Begin Custom Build - Generating test_char.h
  +InputPath=.\main\gen_test_char.exe
  +
  +".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\main\gen_test_char.exe >.\main\test_char.h 
  +	echo Generated test_char.h from gen_test_char.exe 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +# Begin Custom Build - Generating test_char.h
  +InputPath=.\main\gen_test_char.exe
  +
  +".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\main\gen_test_char.exe >.\main\test_char.h 
  +	echo Generated test_char.h from gen_test_char.exe 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
   # End Source File
   # Begin Source File
  +
  +SOURCE=.\main\gen_uri_delims.exe
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\main\gen_uri_delims.exe
  +
  +".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\main\gen_uri_delims.exe >.\main\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\main\gen_uri_delims.exe
  +
  +".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\main\gen_uri_delims.exe >.\main\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +# End Custom Build
  +
  +!ENDIF 
   
  -SOURCE=.\main\uri_delims.h
   # End Source File
   # End Group
   # End Target
  
  
  
  1.76      +5 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- CHANGES	2000/04/20 14:35:59	1.75
  +++ CHANGES	2000/04/20 19:28:03	1.76
  @@ -1,4 +1,9 @@
   Changes with Apache 2.0a3-dev
  +  *) Revamp the Win32 make environment. Makefiles have been removed and
  +     Apache.dsw created to bring together all the pieces. Create new file
  +     os/win32/BaseAddr.ref to define module base addresses (to prevent
  +     dll relocation at start-up).
  +     [William Rowe, Greg Marr, Tim Costello, Bill Stoddard]
   
     *) [EBCDIC] Port Paul Gilmartin's CRLF patch from 1.3.  This replaces most
        of the \015, \012, and \015\012 constants with macros.
  
  
  
  1.9       +2 -6      apache-2.0/src/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.win,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.win	2000/04/17 13:45:42	1.8
  +++ Makefile.win	2000/04/20 19:28:03	1.9
  @@ -45,10 +45,6 @@
   	$(MAKE) /f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
   	$(MAKE) /f Makefile.win SHORT=D LONG=Debug   CTARGET=CLEAN _build
   	$(MAKE) /f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _installdll
  -	cd main
  -	 del uri_delims.h
  -	 del test_char.h
  -	cd ..
   
   installdll:
   	$(MAKE) /f Makefile.win SHORT=R LONG=Release _installdll
  @@ -56,9 +52,9 @@
   _build:
   	echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
   	cd lib\apr
  -#	 apr.lib will be a static library for exe's requring a minimal subset of the apr
  -#	 nmake /nologo CFG="apr - Win32 $(LONG)" -f apr.mak RECURSE=0 $(CTARGET)
  +#	 aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp
   	 nmake /nologo CFG="aprlib - Win32 $(LONG)" -f aprlib.mak RECURSE=0 $(CTARGET)
  +	 nmake /nologo CFG="aprlibdll - Win32 $(LONG)" -f aprlibdll.mak RECURSE=0 $(CTARGET)
   	cd ..\..
   	cd regex
   	 nmake /nologo CFG="regex - Win32 $(LONG)" -f regex.mak RECURSE=0 $(CTARGET)
  
  
  
  1.1                  apache-2.0/src/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  Microsoft Developer Studio Workspace File, Format Version 5.00
  # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
  
  ###############################################################################
  
  Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheCore"=".\ApacheCore.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ap
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name regex
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name gen_test_char
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name gen_uri_delims
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleAuthAnon"=".\os\win32\ApacheModuleAuthAnon.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleCERNMeta"=".\os\win32\ApacheModuleCERNMeta.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleDigest"=".\os\win32\ApacheModuleDigest.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleExpires"=".\os\win32\ApacheModuleExpires.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleHeaders"=".\os\win32\ApacheModuleHeaders.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleInfo"=".\os\win32\ApacheModuleInfo.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleProxy"=".\modules\proxy\ApacheModuleProxy.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleRewrite"=".\os\win32\ApacheModuleRewrite.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleSpeling"=".\os\win32\ApacheModuleSpeling.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleStatus"=".\os\win32\ApacheModuleStatus.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ApacheModuleUserTrack"=".\os\win32\ApacheModuleUserTrack.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name Apache
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheCore
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleAuthAnon
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleCERNMeta
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleDigest
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleExpires
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleHeaders
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleRewrite
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleSpeling
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleStatus
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name ApacheModuleUserTrack
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlibdll
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name htpasswd
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name rotatelogs
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "ap"=".\ap\ap.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "aprlib"=".\lib\apr\aprlib.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "aprlibdll"=".\lib\apr\aprlibdll.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name aprlib
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "gen_uri_delims"=".\main\gen_uri_delims.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name aprlib
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name ap
      End Project Dependency
      Begin Project Dependency
      Project_Dep_Name aprlib
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "install"=".\os\win32\installer\installdll\install.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name aprlib
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "regex"=".\regex\regex.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Global:
  
  Package=<5>
  {{{
  }}}
  
  Package=<3>
  {{{
  }}}
  
  ###############################################################################
  
  
  
  1.1                  apache-2.0/src/InstallBin.dsp
  
  Index: InstallBin.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="InstallBin" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) External Target" 0x0106
  
  CFG=InstallBin - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "InstallBin.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "InstallBin.mak" CFG="InstallBin - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "InstallBin - Win32 Release" (based on "Win32 (x86) External Target")
  !MESSAGE "InstallBin - Win32 Debug" (based on "Win32 (x86) External Target")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  
  !IF  "$(CFG)" == "InstallBin - Win32 Release"
  
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
  # PROP BASE Rebuild_Opt "/a"
  # PROP BASE Target_File "InstallBin.exe"
  # PROP BASE Bsc_Name "InstallBin.bsc"
  # PROP BASE Target_Dir ""
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=D LONG=Debug _install"
  # PROP Rebuild_Opt ""
  # PROP Target_File "..\Apache.exe"
  # PROP Bsc_Name ""
  # PROP Target_Dir ""
  
  !ELSEIF  "$(CFG)" == "InstallBin - Win32 Debug"
  
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
  # PROP BASE Rebuild_Opt "/a"
  # PROP BASE Target_File "InstallBin.exe"
  # PROP BASE Bsc_Name "InstallBin.bsc"
  # PROP BASE Target_Dir ""
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Cmd_Line "NMAKE /f makefile.win INSTDIR=.. SHORT=D LONG=Debug _install"
  # PROP Rebuild_Opt ""
  # PROP Target_File "..\Apache.exe"
  # PROP Bsc_Name ".\apache.bsc"
  # PROP Target_Dir ""
  
  !ENDIF 
  
  # Begin Target
  
  # Name "InstallBin - Win32 Release"
  # Name "InstallBin - Win32 Debug"
  
  !IF  "$(CFG)" == "InstallBin - Win32 Release"
  
  !ELSEIF  "$(CFG)" == "InstallBin - Win32 Debug"
  
  !ENDIF 
  
  # Begin Source File
  
  SOURCE=..\logs\access.log
  # End Source File
  # Begin Source File
  
  SOURCE=..\logs\error.log
  # End Source File
  # Begin Source File
  
  SOURCE=..\conf\httpd.conf
  # End Source File
  # Begin Source File
  
  SOURCE=.\Makefile.win
  # End Source File
  # End Target
  # End Project
  
  
  
  1.21      +6 -2      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- aprlib.def	2000/04/15 17:48:15	1.20
  +++ aprlib.def	2000/04/20 19:28:04	1.21
  @@ -234,11 +234,15 @@
   	ap_set_local_port @213
   	ap_get_remote_port @214
   	ap_set_remote_port @215
  -      ap_open_stderr @216
  +	ap_open_stderr @216
           ap_set_pipe_timeout   @217
           ap_terminate @218
           ap_dso_load @219
           ap_dso_unload @220
           ap_dso_sym @221
           ap_dso_init @222
  -        ap_collapse_spaces @223
  \ No newline at end of file
  +        ap_collapse_spaces @223
  +	ap_month_snames @224
  +	ap_day_snames @225
  +	ap_canonical_error @226
  +	ap_strerror @227
  
  
  
  1.1                  apache-2.0/src/lib/apr/aprlibdll.dsp
  
  Index: aprlibdll.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="aprlibdll" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=aprlibdll - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "aprlibdll.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "aprlibdll.mak" CFG="aprlibdll - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "aprlibdll - Win32 Release" (based on\
   "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "aprlibdll - Win32 Debug" (based on\
   "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "aprlibdll - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MT /W3 /GX /O2 /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"..\..\os\win32\BaseAddr.ref",aprlib /subsystem:windows /dll /map /machine:I386 /def:".\aprlib.def" /out:"Release/aprlib.dll" /libpath:"LibR"
  # ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"..\..\os\win32\BaseAddr.ref",aprlib /subsystem:windows /dll /map /machine:I386 /def:".\aprlib.def" /out:"Release/aprlib.dll" /libpath:"LibR"
  
  !ELSEIF  "$(CFG)" == "aprlibdll - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "./include" /I "./inc" /I "./misc/win32" /I "./file_io/win32" /I "./time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 aprlib.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"..\..\os\win32\BaseAddr.ref",aprlib /subsystem:windows /dll /map /debug /machine:I386 /def:".\aprlib.def" /out:"Debug/aprlib.dll" /libpath:"LibD"
  # ADD LINK32 aprlib.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"..\..\os\win32\BaseAddr.ref",aprlib /subsystem:windows /dll /map /debug /machine:I386 /def:".\aprlib.def" /out:"Debug/aprlib.dll" /libpath:"LibD"
  
  !ENDIF 
  
  # Begin Target
  
  # Name "aprlibdll - Win32 Release"
  # Name "aprlibdll - Win32 Debug"
  # Begin Source File
  
  SOURCE=.\misc\win32\aprlib.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\aprlib.def
  # PROP Exclude_From_Build 1
  # End Source File
  # End Target
  # End Project
  
  
  
  1.4       +0 -10     apache-2.0/src/main/gen_test_char.dsp
  
  Index: gen_test_char.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen_test_char.dsp	2000/02/11 18:52:30	1.3
  +++ gen_test_char.dsp	2000/04/20 19:28:04	1.4
  @@ -52,11 +52,6 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
   # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386
  -# Begin Special Build Tool
  -SOURCE=$(InputPath)
  -PostBuild_Desc=Create test_char.h
  -PostBuild_Cmds=.\gen_test_char > test_char.h
  -# End Special Build Tool
   
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
  @@ -81,11 +76,6 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# Begin Special Build Tool
  -SOURCE=$(InputPath)
  -PostBuild_Desc=Create test_char.h
  -PostBuild_Cmds=.\gen_test_char > test_char.h
  -# End Special Build Tool
   
   !ENDIF 
   
  
  
  
  1.2       +0 -10     apache-2.0/src/main/gen_uri_delims.dsp
  
  Index: gen_uri_delims.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_uri_delims.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gen_uri_delims.dsp	1999/08/24 06:45:19	1.1
  +++ gen_uri_delims.dsp	2000/04/20 19:28:05	1.2
  @@ -52,11 +52,6 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
   # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386
  -# Begin Special Build Tool
  -SOURCE=$(InputPath)
  -PostBuild_Desc=Create uri_delims.h
  -PostBuild_Cmds=.\gen_uri_delims > uri_delims.h
  -# End Special Build Tool
   
   !ELSEIF  "$(CFG)" == "gen_uri_delims - Win32 Debug"
   
  @@ -81,11 +76,6 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# Begin Special Build Tool
  -SOURCE=$(InputPath)
  -PostBuild_Desc=Create uri_delims.h
  -PostBuild_Cmds=.\gen_uri_delims > uri_delims.h
  -# End Special Build Tool
   
   !ENDIF 
   
  
  
  
  1.3       +4 -4      apache-2.0/src/modules/proxy/ApacheModuleProxy.dsp
  
  Index: ApacheModuleProxy.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/ApacheModuleProxy.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleProxy.dsp	2000/04/17 13:56:39	1.2
  +++ ApacheModuleProxy.dsp	2000/04/20 19:28:06	1.3
  @@ -54,8 +54,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib /nologo /base:"0x279B0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:"0x279B0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:"0x279B0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:"0x279B0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /base:@BaseAddr.ref,mod_proxy /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleAuthAnon.dsp
  
  Index: ApacheModuleAuthAnon.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthAnon.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleAuthAnon.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleAuthAnon.dsp	2000/04/20 19:28:06	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27900000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleCERNMeta.dsp
  
  Index: ApacheModuleCERNMeta.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleCERNMeta.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleCERNMeta.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleCERNMeta.dsp	2000/04/20 19:28:06	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_cern_meta /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_cern_meta /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27910000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_cern_meta /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_cern_meta /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleDigest.dsp
  
  Index: ApacheModuleDigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleDigest.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleDigest.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleDigest.dsp	2000/04/20 19:28:07	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27920000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27920000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_digest /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_digest /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27920000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27920000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_digest /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_digest /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleExpires.dsp
  
  Index: ApacheModuleExpires.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleExpires.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleExpires.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleExpires.dsp	2000/04/20 19:28:07	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_expires /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_expires /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27930000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_expires /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_expires /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleHeaders.dsp
  
  Index: ApacheModuleHeaders.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleHeaders.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleHeaders.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleHeaders.dsp	2000/04/20 19:28:07	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27940000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_headers /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleInfo.dsp
  
  Index: ApacheModuleInfo.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleInfo.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleInfo.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleInfo.dsp	2000/04/20 19:28:07	1.5
  @@ -54,8 +54,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_info /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_info /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
   
  @@ -81,8 +81,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27950000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_info /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_info /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleRewrite.dsp
  
  Index: ApacheModuleRewrite.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleRewrite.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleRewrite.dsp	2000/04/17 13:56:40	1.4
  +++ ApacheModuleRewrite.dsp	2000/04/20 19:28:07	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_rewrite /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_rewrite /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27960000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_rewrite /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_rewrite /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleSpeling.dsp
  
  Index: ApacheModuleSpeling.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleSpeling.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleSpeling.dsp	2000/04/17 13:56:41	1.4
  +++ ApacheModuleSpeling.dsp	2000/04/20 19:28:07	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_speling /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_speling /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27980000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_speling /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_speling /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleStatus.dsp
  
  Index: ApacheModuleStatus.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleStatus.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleStatus.dsp	2000/04/17 13:56:41	1.4
  +++ ApacheModuleStatus.dsp	2000/04/20 19:28:07	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_status /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_status /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x27990000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_status /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_status /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +4 -4      apache-2.0/src/os/win32/ApacheModuleUserTrack.dsp
  
  Index: ApacheModuleUserTrack.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleUserTrack.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleUserTrack.dsp	2000/04/17 13:56:41	1.4
  +++ ApacheModuleUserTrack.dsp	2000/04/20 19:28:08	1.5
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_usertrack /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_usertrack /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
   
  @@ -82,8 +82,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:"0x279A0000" /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_usertrack /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_usertrack /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
   
   !ENDIF 
   
  
  
  
  1.1                  apache-2.0/src/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  -- Begin New BaseAddr.ref --
  ; os/win32/BaseAddr.ref contains the central repository
  ;                       of all module base addresses
  ;                       to avoid relocation
  
  ; WARNING: Update this file by reviewing the image size
  ;          of the debug-generated dll files; release images
  ;          should fit in the larger debug-sized space.
  
  ; module name      base-address      max-size
  
  aprlib               0x6FFA0000    0x00060000
  ApacheCore           0x6FF00000    0x000A0000
  mod_auth_anon        0x6FEF0000    0x00010000
  mod_cern_meta        0x6FEE0000    0x00010000
  mod_digest           0x6FED0000    0x00010000
  mod_expires          0x6FEC0000    0x00010000
  mod_headers          0x6FEB0000    0x00010000
  mod_info             0x6FEA0000    0x00010000
  mod_rewrite          0x6FE80000    0x00020000
  mod_speling          0x6FE70000    0x00010000
  mod_status           0x6FE60000    0x00010000
  mod_usertrack        0x6FE50000    0x00010000
  mod_proxy            0x6FE30000    0x00020000
  
  
  
  1.4       +110 -34   apache-2.0/src/os/win32/installer/installdll/install.mak
  
  Index: install.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- install.mak	2000/04/03 18:40:47	1.3
  +++ install.mak	2000/04/20 19:28:09	1.4
  @@ -27,10 +27,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "install - Win32 Release"
   
   OUTDIR=.\Release
  @@ -45,11 +41,15 @@
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\install.dll"
  +ALL : "aprlib - Win32 Release" "$(OUTDIR)\install.dll"
   
   !ENDIF 
   
  +!IF "$(RECURSE)" == "1" 
  +CLEAN :"aprlib - Win32 ReleaseCLEAN" 
  +!ELSE 
   CLEAN :
  +!ENDIF 
   	-@erase "$(INTDIR)\apr_snprintf.obj"
   	-@erase "$(INTDIR)\install.obj"
   	-@erase "$(INTDIR)\vc50.idb"
  @@ -60,11 +60,45 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D\
    "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" 
   BSC32_SBRS= \
  @@ -78,7 +112,8 @@
   	".\install.def"
   LINK32_OBJS= \
   	"$(INTDIR)\apr_snprintf.obj" \
  -	"$(INTDIR)\install.obj"
  +	"$(INTDIR)\install.obj" \
  +	"..\..\..\..\lib\apr\Release\aprlib.lib"
   
   "$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -99,11 +134,15 @@
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\install.dll"
  +ALL : "aprlib - Win32 Debug" "$(OUTDIR)\install.dll"
   
   !ENDIF 
   
  +!IF "$(RECURSE)" == "1" 
  +CLEAN :"aprlib - Win32 DebugCLEAN" 
  +!ELSE 
   CLEAN :
  +!ENDIF 
   	-@erase "$(INTDIR)\apr_snprintf.obj"
   	-@erase "$(INTDIR)\install.obj"
   	-@erase "$(INTDIR)\vc50.idb"
  @@ -117,34 +156,12 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D\
    "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\
  - /incremental:yes /pdb:"$(OUTDIR)\install.pdb" /debug /machine:I386\
  - /def:".\install.def" /out:"$(OUTDIR)\install.dll"\
  - /implib:"$(OUTDIR)\install.lib" /pdbtype:sept 
  -DEF_FILE= \
  -	".\install.def"
  -LINK32_OBJS= \
  -	"$(INTDIR)\apr_snprintf.obj" \
  -	"$(INTDIR)\install.obj"
  -
  -"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
   
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -175,13 +192,38 @@
      $(CPP_PROJ) $< 
   <<
   
  +MTL=midl.exe
  +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
  +RSC=rc.exe
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\install.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  + advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\
  + /incremental:yes /pdb:"$(OUTDIR)\install.pdb" /debug /machine:I386\
  + /def:".\install.def" /out:"$(OUTDIR)\install.dll"\
  + /implib:"$(OUTDIR)\install.lib" /pdbtype:sept 
  +DEF_FILE= \
  +	".\install.def"
  +LINK32_OBJS= \
  +	"$(INTDIR)\apr_snprintf.obj" \
  +	"$(INTDIR)\install.obj" \
  +	"..\..\..\..\lib\apr\Debug\aprlib.lib"
  +
  +"$(OUTDIR)\install.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   
   !IF "$(CFG)" == "install - Win32 Release" || "$(CFG)" ==\
    "install - Win32 Debug"
   SOURCE=..\..\..\..\lib\apr\lib\apr_snprintf.c
   DEP_CPP_APR_S=\
  -	"..\..\..\..\lib\apr\include\apr.h"\
  -	"..\..\..\..\lib\apr\include\apr_config.h"\
   	"..\..\..\..\lib\apr\include\apr_errno.h"\
   	"..\..\..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\..\..\lib\apr\include\apr_general.h"\
  @@ -190,6 +232,10 @@
   	"..\..\..\..\lib\apr\include\apr_time.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_APR_S=\
  +	"..\..\..\..\lib\apr\include\apr.h"\
  +	"..\..\..\..\lib\apr\include\apr_config.h"\
  +	
   
   "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
  @@ -197,8 +243,6 @@
   
   SOURCE=.\install.c
   DEP_CPP_INSTA=\
  -	"..\..\..\..\lib\apr\include\apr.h"\
  -	"..\..\..\..\lib\apr\include\apr_config.h"\
   	"..\..\..\..\lib\apr\include\apr_errno.h"\
   	"..\..\..\..\lib\apr\include\apr_file_io.h"\
   	"..\..\..\..\lib\apr\include\apr_general.h"\
  @@ -207,9 +251,41 @@
   	"..\..\..\..\lib\apr\include\apr_time.h"\
   	{$(INCLUDE)}"sys\types.h"\
   	
  +NODEP_CPP_INSTA=\
  +	"..\..\..\..\lib\apr\include\apr.h"\
  +	"..\..\..\..\lib\apr\include\apr_config.h"\
  +	
   
   "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTA) "$(INTDIR)"
   
  +
  +!IF  "$(CFG)" == "install - Win32 Release"
  +
  +"aprlib - Win32 Release" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\aprlib.mak" CFG="aprlib - Win32 Release" 
  +   cd "..\..\os\win32\installer\installdll"
  +
  +"aprlib - Win32 ReleaseCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprlib.mak" CFG="aprlib - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\os\win32\installer\installdll"
  +
  +!ELSEIF  "$(CFG)" == "install - Win32 Debug"
  +
  +"aprlib - Win32 Debug" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\aprlib.mak" CFG="aprlib - Win32 Debug" 
  +   cd "..\..\os\win32\installer\installdll"
  +
  +"aprlib - Win32 DebugCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprlib.mak" CFG="aprlib - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\os\win32\installer\installdll"
  +
  +!ENDIF 
   
   
   !ENDIF 
  
  
  
  1.4       +100 -28   apache-2.0/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- htdigest.mak	2000/04/03 18:40:47	1.3
  +++ htdigest.mak	2000/04/20 19:28:10	1.4
  @@ -27,9 +27,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   OUTDIR=.
  @@ -44,11 +41,15 @@
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\release\htdigest.exe"
  +ALL : "aprlib - Win32 Release" "$(OUTDIR)\release\htdigest.exe"
   
   !ENDIF 
   
  +!IF "$(RECURSE)" == "1" 
  +CLEAN :"aprlib - Win32 ReleaseCLEAN" 
  +!ELSE 
   CLEAN :
  +!ENDIF 
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
   	-@erase "$(INTDIR)\ap_getpass.obj"
   	-@erase "$(INTDIR)\ap_md5c.obj"
  @@ -56,10 +57,43 @@
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\release\htdigest.exe"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
    "_CONSOLE" /D "_MBCS" /FD /c 
   CPP_OBJS=.
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
   BSC32_SBRS= \
  @@ -74,7 +108,8 @@
   	"$(INTDIR)\ap_cpystrn.obj" \
   	"$(INTDIR)\ap_getpass.obj" \
   	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\htdigest.obj"
  +	"$(INTDIR)\htdigest.obj" \
  +	"..\lib\apr\Release\aprlib.lib"
   
   "$(OUTDIR)\release\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -95,11 +130,15 @@
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\debug\htdigest.exe"
  +ALL : "aprlib - Win32 Debug" "$(OUTDIR)\debug\htdigest.exe"
   
   !ENDIF 
   
  +!IF "$(RECURSE)" == "1" 
  +CLEAN :"aprlib - Win32 DebugCLEAN" 
  +!ELSE 
   CLEAN :
  +!ENDIF 
   	-@erase "$(INTDIR)\ap_cpystrn.obj"
   	-@erase "$(INTDIR)\ap_getpass.obj"
   	-@erase "$(INTDIR)\ap_md5c.obj"
  @@ -110,32 +149,11 @@
   	-@erase "$(OUTDIR)\debug\htdigest.ilk"
   	-@erase "$(OUTDIR)\htdigest.pdb"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D\
    "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c 
   CPP_OBJS=.
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  - odbccp32.lib /nologo /subsystem:console /incremental:yes\
  - /pdb:"$(OUTDIR)\htdigest.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\debug\htdigest.exe" /pdbtype:sept 
  -LINK32_OBJS= \
  -	"$(INTDIR)\ap_cpystrn.obj" \
  -	"$(INTDIR)\ap_getpass.obj" \
  -	"$(INTDIR)\ap_md5c.obj" \
  -	"$(INTDIR)\htdigest.obj"
  -
  -"$(OUTDIR)\debug\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
   
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
  @@ -167,9 +185,63 @@
      $(CPP_PROJ) $< 
   <<
   
  +RSC=rc.exe
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htdigest.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  + advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  + odbccp32.lib /nologo /subsystem:console /incremental:yes\
  + /pdb:"$(OUTDIR)\htdigest.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\debug\htdigest.exe" /pdbtype:sept 
  +LINK32_OBJS= \
  +	"$(INTDIR)\ap_cpystrn.obj" \
  +	"$(INTDIR)\ap_getpass.obj" \
  +	"$(INTDIR)\ap_md5c.obj" \
  +	"$(INTDIR)\htdigest.obj" \
  +	"..\lib\apr\Debug\aprlib.lib"
  +
  +"$(OUTDIR)\debug\htdigest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   
   !IF "$(CFG)" == "htdigest - Win32 Release" || "$(CFG)" ==\
    "htdigest - Win32 Debug"
  +
  +!IF  "$(CFG)" == "htdigest - Win32 Release"
  +
  +"aprlib - Win32 Release" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\aprlib.mak" CFG="aprlib - Win32 Release" 
  +   cd "..\..\support"
  +
  +"aprlib - Win32 ReleaseCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprlib.mak" CFG="aprlib - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\support"
  +
  +!ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  +
  +"aprlib - Win32 Debug" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\aprlib.mak" CFG="aprlib - Win32 Debug" 
  +   cd "..\..\support"
  +
  +"aprlib - Win32 DebugCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprlib.mak" CFG="aprlib - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\support"
  +
  +!ENDIF 
  +
   SOURCE=..\ap\ap_cpystrn.c
   
   "$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) "$(INTDIR)"
  
  
  
  1.5       +130 -34   apache-2.0/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htpasswd.mak	2000/04/03 18:40:47	1.4
  +++ htpasswd.mak	2000/04/20 19:28:10	1.5
  @@ -27,9 +27,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   OUTDIR=.\Release
  @@ -44,11 +41,15 @@
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\htpasswd.exe"
  +ALL : "aprlib - Win32 Release" "ap - Win32 Release" "$(OUTDIR)\htpasswd.exe"
   
   !ENDIF 
   
  +!IF "$(RECURSE)" == "1" 
  +CLEAN :"ap - Win32 ReleaseCLEAN" "aprlib - Win32 ReleaseCLEAN" 
  +!ELSE 
   CLEAN :
  +!ENDIF 
   	-@erase "$(INTDIR)\htpasswd.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(OUTDIR)\htpasswd.exe"
  @@ -56,11 +57,44 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /D\
    "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN"\
    /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
   BSC32_SBRS= \
  @@ -72,7 +106,9 @@
    /out:"$(OUTDIR)\htpasswd.exe" /libpath:"../lib/apr/release"\
    /libpath:"../ap/release" 
   LINK32_OBJS= \
  -	"$(INTDIR)\htpasswd.obj"
  +	"$(INTDIR)\htpasswd.obj" \
  +	"..\ap\Release\ap.lib" \
  +	"..\lib\apr\Release\aprlib.lib"
   
   "$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -93,11 +129,15 @@
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\htpasswd.exe"
  +ALL : "aprlib - Win32 Debug" "ap - Win32 Debug" "$(OUTDIR)\htpasswd.exe"
   
   !ENDIF 
   
  +!IF "$(RECURSE)" == "1" 
  +CLEAN :"ap - Win32 DebugCLEAN" "aprlib - Win32 DebugCLEAN" 
  +!ELSE 
   CLEAN :
  +!ENDIF 
   	-@erase "$(INTDIR)\htpasswd.obj"
   	-@erase "$(INTDIR)\vc50.idb"
   	-@erase "$(INTDIR)\vc50.pdb"
  @@ -108,31 +148,13 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "..\include" /I\
    "..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D\
    "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
  - comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console\
  - /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept /libpath:"../lib/apr/debug"\
  - /libpath:"../ap/debug" 
  -LINK32_OBJS= \
  -	"$(INTDIR)\htpasswd.obj"
  -
  -"$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
   
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -163,23 +185,100 @@
      $(CPP_PROJ) $< 
   <<
   
  +RSC=rc.exe
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
  + comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console\
  + /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept /libpath:"../lib/apr/debug"\
  + /libpath:"../ap/debug" 
  +LINK32_OBJS= \
  +	"$(INTDIR)\htpasswd.obj" \
  +	"..\ap\Debug\ap.lib" \
  +	"..\lib\apr\Debug\aprlib.lib"
  +
  +"$(OUTDIR)\htpasswd.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
  +
   
   !IF "$(CFG)" == "htpasswd - Win32 Release" || "$(CFG)" ==\
    "htpasswd - Win32 Debug"
  +
  +!IF  "$(CFG)" == "htpasswd - Win32 Release"
  +
  +"ap - Win32 Release" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\ap"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\ap.mak" CFG="ap - Win32 Release" 
  +   cd "..\support"
  +
  +"ap - Win32 ReleaseCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\ap"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ap.mak" CFG="ap - Win32 Release" RECURSE=1\
  + 
  +   cd "..\support"
  +
  +!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  +
  +"ap - Win32 Debug" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\ap"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\ap.mak" CFG="ap - Win32 Debug" 
  +   cd "..\support"
  +
  +"ap - Win32 DebugCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\ap"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\ap.mak" CFG="ap - Win32 Debug" RECURSE=1 
  +   cd "..\support"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "htpasswd - Win32 Release"
  +
  +"aprlib - Win32 Release" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\aprlib.mak" CFG="aprlib - Win32 Release" 
  +   cd "..\..\support"
  +
  +"aprlib - Win32 ReleaseCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprlib.mak" CFG="aprlib - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\support"
  +
  +!ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
  +
  +"aprlib - Win32 Debug" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\aprlib.mak" CFG="aprlib - Win32 Debug" 
  +   cd "..\..\support"
  +
  +"aprlib - Win32 DebugCLEAN" : 
  +   cd "\home\apache\apache-2.0\apache-2.0\src\lib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprlib.mak" CFG="aprlib - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\support"
  +
  +!ENDIF 
  +
   SOURCE=.\htpasswd.c
   
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   DEP_CPP_HTPAS=\
   	"..\include\ap.h"\
  -	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_md5.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
  -	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -187,14 +286,9 @@
   	"..\lib\apr\include\apr_thread_proc.h"\
   	"..\lib\apr\include\apr_time.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_HTPAS=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ap_config_path.h"\
  -	"..\include\ap_config_win32.h"\
  -	"..\include\os.h"\
  +	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
  @@ -210,7 +304,6 @@
   	"..\include\ap_mmn.h"\
   	"..\include\ap_sha1.h"\
   	"..\include\hsregex.h"\
  -	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_file_io.h"\
   	"..\lib\apr\include\apr_general.h"\
  @@ -218,6 +311,9 @@
   	"..\lib\apr\include\apr_thread_proc.h"\
   	"..\lib\apr\include\apr_time.h"\
   	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_HTPAS=\
  +	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
  
  
  
  1.4       +59 -31    apache-2.0/src/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rotatelogs.mak	2000/04/03 18:40:47	1.3
  +++ rotatelogs.mak	2000/04/20 19:28:10	1.4
  @@ -28,9 +28,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "rotatelogs - Win32 Release"
   
   OUTDIR=.\Release
  @@ -57,11 +54,44 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
    "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
    /FD /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" 
   BSC32_SBRS= \
  @@ -108,31 +138,13 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "../include" /I\
    "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
    /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  - advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  - odbccp32.lib /nologo /subsystem:console /incremental:yes\
  - /pdb:"$(OUTDIR)\rotatelogs.pdb" /debug /machine:I386\
  - /out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept 
  -LINK32_OBJS= \
  -	"$(INTDIR)\rotatelogs.obj"
   
  -"$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -163,7 +175,28 @@
      $(CPP_PROJ) $< 
   <<
   
  +RSC=rc.exe
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
  + advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
  + odbccp32.lib /nologo /subsystem:console /incremental:yes\
  + /pdb:"$(OUTDIR)\rotatelogs.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept 
  +LINK32_OBJS= \
  +	"$(INTDIR)\rotatelogs.obj"
  +
  +"$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
   
  +
   !IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\
    "rotatelogs - Win32 Debug"
   SOURCE=.\rotatelogs.c
  @@ -171,23 +204,16 @@
   !IF  "$(CFG)" == "rotatelogs - Win32 Release"
   
   DEP_CPP_ROTAT=\
  -	"..\include\ap_ac_config.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  -	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_general.h"\
   	"..\os\win32\os.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   NODEP_CPP_ROTAT=\
  -	"..\include\ap_config_auto.h"\
  -	"..\include\ap_config_path.h"\
  -	"..\include\ap_config_win32.h"\
  -	"..\include\os.h"\
  +	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  @@ -200,10 +226,12 @@
   	"..\include\ap_ctype.h"\
   	"..\include\ap_mmn.h"\
   	"..\include\hsregex.h"\
  -	"..\lib\apr\include\apr.h"\
   	"..\lib\apr\include\apr_errno.h"\
   	"..\lib\apr\include\apr_general.h"\
   	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_ROTAT=\
  +	"..\lib\apr\include\apr.h"\
   	
   
   "$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
  
  
  

Mime
View raw message