httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/support ab.mak htdigest.mak htpasswd.mak logresolve.mak rotatelogs.mak
Date Thu, 05 Apr 2001 09:21:48 GMT
wrowe       01/04/05 02:21:48

  Modified:    .        Apache.mak libhttpd.mak
               modules/aaa mod_auth_anon.mak mod_auth_dbm.mak
                        mod_auth_digest.mak
               modules/cache mod_file_cache.mak
               modules/dav/fs mod_dav_fs.mak
               modules/dav/main mod_dav.mak
               modules/generators mod_status.mak
               modules/mappers mod_rewrite.mak mod_speling.mak
               modules/metadata mod_cern_meta.mak mod_expires.mak
                        mod_headers.mak mod_usertrack.mak
               server   gen_test_char.mak gen_uri_delims.mak
               .        apr.mak libapr.mak
               .        aprutil.mak libaprutil.mak
               xml/expat/lib xml.mak
               srclib/pcre pcre.mak pcreposix.mak
               support  ab.mak htdigest.mak htpasswd.mak logresolve.mak
                        rotatelogs.mak
  Log:
    Time to refresh mak on Win32
  
  Revision  Changes    Path
  1.5       +43 -43    httpd-2.0/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Apache.mak	2001/03/22 05:56:37	1.4
  +++ Apache.mak	2001/04/05 09:21:37	1.5
  @@ -39,14 +39,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  - "libaprutil - Win32 Release" "$(OUTDIR)\Apache.exe"
  +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\Apache.exe"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
  - "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
  + "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -132,14 +132,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  - "libaprutil - Win32 Debug" "$(OUTDIR)\Apache.exe"
  +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
  + "libapr - Win32 Debug" "$(OUTDIR)\Apache.exe"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
  - "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
  + "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -154,9 +154,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "./os/win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./os/win32" /I\
    "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D\
  - "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /ZI /c 
  + "_CONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\Apache" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -219,6 +219,34 @@
   
   !IF  "$(CFG)" == "Apache - Win32 Release"
   
  +"libapr - Win32 Release" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\.."
  +
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\.."
  +
  +!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  +
  +"libapr - Win32 Debug" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\.."
  +
  +"libapr - Win32 DebugCLEAN" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\.."
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "Apache - Win32 Release"
  +
   "libaprutil - Win32 Release" : 
      cd ".\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
  @@ -250,55 +278,27 @@
   
   "libhttpd - Win32 Release" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
      cd "."
   
   "libhttpd - Win32 ReleaseCLEAN" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  + RECURSE=1 
      cd "."
   
   !ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
      cd "."
   
   "libhttpd - Win32 DebugCLEAN" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd "."
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "Apache - Win32 Release"
  -
  -"libapr - Win32 Release" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\.."
  -
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  - RECURSE=1 
  -   cd "..\.."
  -
  -!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  -
  -"libapr - Win32 Debug" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\.."
  -
  -"libapr - Win32 DebugCLEAN" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\.."
   
   !ENDIF 
   
  
  
  
  1.9       +62 -62    httpd-2.0/libhttpd.mak
  
  Index: libhttpd.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.mak,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- libhttpd.mak	2001/03/22 05:56:37	1.8
  +++ libhttpd.mak	2001/04/05 09:21:38	1.9
  @@ -41,16 +41,16 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "gen_uri_delims - Win32 Release"\
  - "gen_test_char - Win32 Release" "pcreposix - Win32 Release"\
  - "pcre - Win32 Release" "libaprutil - Win32 Release" "$(OUTDIR)\libhttpd.dll"
  +ALL : "gen_uri_delims - Win32 Release" "gen_test_char - Win32 Release"\
  + "pcreposix - Win32 Release" "pcre - Win32 Release" "libaprutil - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\libhttpd.dll"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 ReleaseCLEAN" "pcre - Win32 ReleaseCLEAN"\
  - "pcreposix - Win32 ReleaseCLEAN" "gen_test_char - Win32 ReleaseCLEAN"\
  - "gen_uri_delims - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
  + "pcre - Win32 ReleaseCLEAN" "pcreposix - Win32 ReleaseCLEAN"\
  + "gen_test_char - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -230,16 +230,16 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "gen_uri_delims - Win32 Debug"\
  - "gen_test_char - Win32 Debug" "pcreposix - Win32 Debug" "pcre - Win32 Debug"\
  - "libaprutil - Win32 Debug" "$(OUTDIR)\libhttpd.dll"
  +ALL : "gen_uri_delims - Win32 Debug" "gen_test_char - Win32 Debug"\
  + "pcreposix - Win32 Debug" "pcre - Win32 Debug" "libaprutil - Win32 Debug"\
  + "libapr - Win32 Debug" "$(OUTDIR)\libhttpd.dll"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 DebugCLEAN" "pcre - Win32 DebugCLEAN"\
  - "pcreposix - Win32 DebugCLEAN" "gen_test_char - Win32 DebugCLEAN"\
  - "gen_uri_delims - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
  + "pcre - Win32 DebugCLEAN" "pcreposix - Win32 DebugCLEAN"\
  + "gen_test_char - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -300,10 +300,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I ".\include" /I ".\srclib\apr\include" /I\
  - ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I\
  - "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /ZI /c 
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\srclib\apr\include"\
  + /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite"\
  + /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  + "AP_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libhttpd" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -2497,6 +2497,34 @@
   
   !IF  "$(CFG)" == "libhttpd - Win32 Release"
   
  +"libapr - Win32 Release" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\.."
  +
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\.."
  +
  +!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
  +
  +"libapr - Win32 Debug" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\.."
  +
  +"libapr - Win32 DebugCLEAN" : 
  +   cd ".\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\.."
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "libhttpd - Win32 Release"
  +
   "libaprutil - Win32 Release" : 
      cd ".\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
  @@ -2528,12 +2556,12 @@
   
   "pcre - Win32 Release" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\pcre.mak CFG="pcre - Win32 Release" 
      cd "..\.."
   
   "pcre - Win32 ReleaseCLEAN" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\pcre.mak" CFG="pcre - Win32 Release"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\pcre.mak CFG="pcre - Win32 Release"\
    RECURSE=1 
      cd "..\.."
   
  @@ -2541,13 +2569,13 @@
   
   "pcre - Win32 Debug" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\pcre.mak CFG="pcre - Win32 Debug" 
      cd "..\.."
   
   "pcre - Win32 DebugCLEAN" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\pcre.mak" CFG="pcre - Win32 Debug"\
  - RECURSE=1 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\pcre.mak CFG="pcre - Win32 Debug" RECURSE=1\
  + 
      cd "..\.."
   
   !ENDIF 
  @@ -2556,12 +2584,12 @@
   
   "pcreposix - Win32 Release" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\pcreposix.mak" CFG="pcreposix - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\pcreposix.mak CFG="pcreposix - Win32 Release" 
      cd "..\.."
   
   "pcreposix - Win32 ReleaseCLEAN" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\pcreposix.mak"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\pcreposix.mak\
    CFG="pcreposix - Win32 Release" RECURSE=1 
      cd "..\.."
   
  @@ -2569,13 +2597,13 @@
   
   "pcreposix - Win32 Debug" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\pcreposix.mak" CFG="pcreposix - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\pcreposix.mak CFG="pcreposix - Win32 Debug" 
      cd "..\.."
   
   "pcreposix - Win32 DebugCLEAN" : 
      cd ".\srclib\pcre"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\pcreposix.mak"\
  - CFG="pcreposix - Win32 Debug" RECURSE=1 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\pcreposix.mak CFG="pcreposix - Win32 Debug"\
  + RECURSE=1 
      cd "..\.."
   
   !ENDIF 
  @@ -2584,13 +2612,13 @@
   
   "gen_test_char - Win32 Release" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak"\
  +   $(MAKE) /$(MAKEFLAGS) /F .\gen_test_char.mak\
    CFG="gen_test_char - Win32 Release" 
      cd ".."
   
   "gen_test_char - Win32 ReleaseCLEAN" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_test_char.mak"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\gen_test_char.mak\
    CFG="gen_test_char - Win32 Release" RECURSE=1 
      cd ".."
   
  @@ -2598,13 +2626,13 @@
   
   "gen_test_char - Win32 Debug" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\gen_test_char.mak"\
  +   $(MAKE) /$(MAKEFLAGS) /F .\gen_test_char.mak\
    CFG="gen_test_char - Win32 Debug" 
      cd ".."
   
   "gen_test_char - Win32 DebugCLEAN" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_test_char.mak"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\gen_test_char.mak\
    CFG="gen_test_char - Win32 Debug" RECURSE=1 
      cd ".."
   
  @@ -2614,13 +2642,13 @@
   
   "gen_uri_delims - Win32 Release" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\
  +   $(MAKE) /$(MAKEFLAGS) /F .\gen_uri_delims.mak\
    CFG="gen_uri_delims - Win32 Release" 
      cd ".."
   
   "gen_uri_delims - Win32 ReleaseCLEAN" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\gen_uri_delims.mak\
    CFG="gen_uri_delims - Win32 Release" RECURSE=1 
      cd ".."
   
  @@ -2628,43 +2656,15 @@
   
   "gen_uri_delims - Win32 Debug" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\
  +   $(MAKE) /$(MAKEFLAGS) /F .\gen_uri_delims.mak\
    CFG="gen_uri_delims - Win32 Debug" 
      cd ".."
   
   "gen_uri_delims - Win32 DebugCLEAN" : 
      cd ".\server"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\gen_uri_delims.mak\
    CFG="gen_uri_delims - Win32 Debug" RECURSE=1 
      cd ".."
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "libhttpd - Win32 Release"
  -
  -"libapr - Win32 Release" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\.."
  -
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  - RECURSE=1 
  -   cd "..\.."
  -
  -!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
  -
  -"libapr - Win32 Debug" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\.."
  -
  -"libapr - Win32 DebugCLEAN" : 
  -   cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\.."
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/aaa/mod_auth_anon.mak
  
  Index: mod_auth_anon.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_anon.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_auth_anon.mak	2001/03/22 05:56:41	1.4
  +++ mod_auth_anon.mak	2001/04/05 09:21:38	1.5
  @@ -43,13 +43,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_auth_anon.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -137,13 +137,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_auth_anon.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -159,9 +159,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_anon" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -226,57 +226,57 @@
   
   !IF  "$(CFG)" == "mod_auth_anon - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\aaa"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\aaa"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\aaa"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\aaa"
   
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\aaa"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\aaa"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\aaa"
  +   cd "..\..\modules\aaa"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_auth_anon - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\aaa"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\aaa"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\aaa"
  +   cd ".\modules\aaa"
   
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\aaa"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\aaa"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\aaa"
  +   cd ".\modules\aaa"
   
   !ENDIF 
   
  
  
  
  1.5       +51 -51    httpd-2.0/modules/aaa/mod_auth_dbm.mak
  
  Index: mod_auth_dbm.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_auth_dbm.mak	2001/03/22 05:56:41	1.4
  +++ mod_auth_dbm.mak	2001/04/05 09:21:39	1.5
  @@ -43,14 +43,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  - "libaprutil - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so"
  +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\mod_auth_dbm.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
  - "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
  + "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -140,14 +140,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  - "libaprutil - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so"
  +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
  + "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_dbm.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
  - "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
  + "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -163,10 +163,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I\
    "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D\
  - "AP_AUTH_DBM_USE_APR" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /ZI /c 
  + "AP_AUTH_DBM_USE_APR" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_dbm" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -232,14 +232,42 @@
   
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\aaa"
  +
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\aaa"
  +
  +!ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
  +
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\aaa"
  +
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\modules\aaa"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
  +
   "libaprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -247,12 +275,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -262,56 +290,28 @@
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  + RECURSE=1 
      cd ".\modules\aaa"
   
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
  -
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\aaa"
  -
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  - RECURSE=1 
  -   cd "..\..\modules\aaa"
  -
  -!ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
  -
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\aaa"
  -
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\..\modules\aaa"
   
   !ENDIF 
   
  
  
  
  1.6       +51 -52    httpd-2.0/modules/aaa/mod_auth_digest.mak
  
  Index: mod_auth_digest.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_auth_digest.mak	2001/03/22 05:56:41	1.5
  +++ mod_auth_digest.mak	2001/04/05 09:21:39	1.6
  @@ -43,14 +43,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  - "libaprutil - Win32 Release" "$(OUTDIR)\mod_auth_digest.so"
  +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\mod_auth_digest.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
  - "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
  + "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -139,14 +139,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  - "libaprutil - Win32 Debug" "$(OUTDIR)\mod_auth_digest.so"
  +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
  + "libapr - Win32 Debug" "$(OUTDIR)\mod_auth_digest.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
  - "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
  + "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -162,10 +162,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest" /FD /ZI\
  - /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_auth_digest" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -231,14 +230,42 @@
   
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\aaa"
  +
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\aaa"
  +
  +!ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
  +
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\aaa"
  +
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\modules\aaa"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
  +
   "libaprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -246,12 +273,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -261,56 +288,28 @@
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  + RECURSE=1 
      cd ".\modules\aaa"
   
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
  -
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\aaa"
  -
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  - RECURSE=1 
  -   cd "..\..\modules\aaa"
  -
  -!ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
  -
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\aaa"
  -
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\..\modules\aaa"
   
   !ENDIF 
   
  
  
  
  1.5       +40 -40    httpd-2.0/modules/cache/mod_file_cache.mak
  
  Index: mod_file_cache.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_file_cache.mak	2001/03/22 05:56:43	1.4
  +++ mod_file_cache.mak	2001/04/05 09:21:39	1.5
  @@ -43,13 +43,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_file_cache.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -137,13 +137,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_file_cache.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -159,10 +159,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_file_cache" /FD /ZI /c\
  - 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_file_cache" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -227,57 +226,57 @@
   
   !IF  "$(CFG)" == "mod_file_cache - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\cache"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\cache"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\cache"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\cache"
   
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\cache"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\cache"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\cache"
  +   cd "..\..\modules\cache"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_file_cache - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\cache"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\cache"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\cache"
  +   cd ".\modules\cache"
   
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\cache"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\cache"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\cache"
  +   cd ".\modules\cache"
   
   !ENDIF 
   
  @@ -307,6 +306,7 @@
   	"..\..\srclib\apr\include\apr_file_info.h"\
   	"..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\srclib\apr\include\apr_general.h"\
  +	"..\..\srclib\apr\include\apr_hash.h"\
   	"..\..\srclib\apr\include\apr_lock.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\srclib\apr\include\apr_network_io.h"\
  
  
  
  1.5       +60 -61    httpd-2.0/modules/dav/fs/mod_dav_fs.mak
  
  Index: mod_dav_fs.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/mod_dav_fs.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_dav_fs.mak	2001/03/22 05:56:45	1.4
  +++ mod_dav_fs.mak	2001/04/05 09:21:40	1.5
  @@ -42,15 +42,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "mod_dav - Win32 Release"\
  - "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
  - "$(OUTDIR)\mod_dav_fs.so"
  +ALL : "mod_dav - Win32 Release" "libhttpd - Win32 Release"\
  + "libaprutil - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\mod_dav_fs.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
  - "mod_dav - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
  + "libhttpd - Win32 ReleaseCLEAN" "mod_dav - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -148,14 +147,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "mod_dav - Win32 Debug" "libhttpd - Win32 Debug"\
  - "libaprutil - Win32 Debug" "$(OUTDIR)\mod_dav_fs.so"
  +ALL : "mod_dav - Win32 Debug" "libhttpd - Win32 Debug"\
  + "libaprutil - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_dav_fs.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
  - "mod_dav - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
  + "libhttpd - Win32 DebugCLEAN" "mod_dav - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -174,11 +173,11 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\main" /I "..\..\..\srclib\aputil" /I\
  - "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\main" /I "..\..\..\srclib\aputil"\
  + /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I\
    "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I\
    "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav_fs" /FD /ZI /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav_fs" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -418,14 +417,42 @@
   
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
  +"libapr - Win32 Release" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\dav\fs"
  +
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\dav\fs"
  +
  +!ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
  +
  +"libapr - Win32 Debug" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\dav\fs"
  +
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\modules\dav\fs"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
  +
   "libaprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\dav\fs"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -433,12 +460,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\dav\fs"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -448,26 +475,26 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
      cd ".\modules\dav\fs"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  + RECURSE=1 
      cd ".\modules\dav\fs"
   
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
      cd ".\modules\dav\fs"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\dav\fs"
   
  @@ -476,56 +503,28 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "mod_dav - Win32 Release" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release" 
  +   cd "..\../..\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) /F .\mod_dav.mak CFG="mod_dav - Win32 Release" 
      cd "..\fs"
   
   "mod_dav - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release"\
  +   cd "..\../..\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\mod_dav.mak CFG="mod_dav - Win32 Release"\
    RECURSE=1 
      cd "..\fs"
   
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "mod_dav - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug" 
  +   cd "..\../..\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) /F .\mod_dav.mak CFG="mod_dav - Win32 Debug" 
      cd "..\fs"
   
   "mod_dav - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug"\
  +   cd "..\../..\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\mod_dav.mak CFG="mod_dav - Win32 Debug"\
    RECURSE=1 
      cd "..\fs"
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
  -
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\dav\fs"
  -
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  - RECURSE=1 
  -   cd "..\..\modules\dav\fs"
  -
  -!ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
  -
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\dav\fs"
  -
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\..\modules\dav\fs"
   
   !ENDIF 
   
  
  
  
  1.6       +51 -51    httpd-2.0/modules/dav/main/mod_dav.mak
  
  Index: mod_dav.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_dav.mak	2001/03/22 05:56:47	1.5
  +++ mod_dav.mak	2001/04/05 09:21:40	1.6
  @@ -41,14 +41,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  - "libaprutil - Win32 Release" "$(OUTDIR)\mod_dav.so"
  +ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\mod_dav.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
  - "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
  + "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -150,14 +150,14 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  - "libaprutil - Win32 Debug" "$(OUTDIR)\mod_dav.so"
  +ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
  + "libapr - Win32 Debug" "$(OUTDIR)\mod_dav.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libaprutil - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
  - "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
  + "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -180,11 +180,11 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\..\srclib\aputil" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\srclib\aputil" /I\
    "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I\
    "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I\
    "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
  - /D "DAV_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav" /FD /ZI /c 
  + /D "DAV_DECLARE_EXPORT" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_dav" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -571,14 +571,42 @@
   
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
  +"libapr - Win32 Release" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\dav\main"
  +
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\dav\main"
  +
  +!ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
  +
  +"libapr - Win32 Debug" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\dav\main"
  +
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\../..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\..\modules\dav\main"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "mod_dav - Win32 Release"
  +
   "libaprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\dav\main"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -586,12 +614,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\dav\main"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -601,56 +629,28 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
      cd ".\modules\dav\main"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  + RECURSE=1 
      cd ".\modules\dav\main"
   
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
      cd ".\modules\dav\main"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +   cd "..\../.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\dav\main"
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "mod_dav - Win32 Release"
  -
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\dav\main"
  -
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  - RECURSE=1 
  -   cd "..\..\modules\dav\main"
  -
  -!ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
  -
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\dav\main"
  -
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\..\modules\dav\main"
   
   !ENDIF 
   
  
  
  
  1.6       +39 -39    httpd-2.0/modules/generators/mod_status.mak
  
  Index: mod_status.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_status.mak	2001/03/22 05:56:50	1.5
  +++ mod_status.mak	2001/04/05 09:21:41	1.6
  @@ -42,13 +42,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_status.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -136,12 +136,12 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug" "$(OUTDIR)\mod_status.so"
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_status.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -157,10 +157,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I\
    "../../server/mpm/winnt" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\mod_status" /FD /ZI /c 
  + /Fd"$(INTDIR)\mod_status" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -224,57 +224,57 @@
   
   !IF  "$(CFG)" == "mod_status - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\generators"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\generators"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\generators"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\generators"
   
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\generators"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\generators"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\generators"
  +   cd "..\..\modules\generators"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_status - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\generators"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\generators"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\generators"
  +   cd ".\modules\generators"
   
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\generators"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\generators"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\generators"
  +   cd ".\modules\generators"
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/mappers/mod_rewrite.mak
  
  Index: mod_rewrite.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_rewrite.mak	2001/03/22 05:56:52	1.4
  +++ mod_rewrite.mak	2001/04/05 09:21:41	1.5
  @@ -42,13 +42,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_rewrite.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -136,13 +136,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_rewrite.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -158,10 +158,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
    "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\mod_rewrite" /FD /ZI /c 
  + /Fd"$(INTDIR)\mod_rewrite" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -226,57 +226,57 @@
   
   !IF  "$(CFG)" == "mod_rewrite - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\mappers"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\mappers"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\mappers"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\mappers"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\mappers"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\mappers"
  +   cd "..\..\modules\mappers"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_rewrite - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\mappers"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\mappers"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\mappers"
  +   cd ".\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\mappers"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\mappers"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\mappers"
  +   cd ".\modules\mappers"
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/mappers/mod_speling.mak
  
  Index: mod_speling.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_speling.mak	2001/03/22 05:56:52	1.4
  +++ mod_speling.mak	2001/04/05 09:21:42	1.5
  @@ -42,13 +42,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_speling.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -135,13 +135,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_speling.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -157,9 +157,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_speling" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -224,57 +224,57 @@
   
   !IF  "$(CFG)" == "mod_speling - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\mappers"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\mappers"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\mappers"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\mappers"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\mappers"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\mappers"
  +   cd "..\..\modules\mappers"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_speling - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\mappers"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\mappers"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\mappers"
  +   cd ".\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\mappers"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\mappers"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\mappers"
  +   cd ".\modules\mappers"
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/metadata/mod_cern_meta.mak
  
  Index: mod_cern_meta.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_cern_meta.mak	2001/03/22 05:56:55	1.4
  +++ mod_cern_meta.mak	2001/04/05 09:21:42	1.5
  @@ -43,13 +43,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_cern_meta.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -137,13 +137,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_cern_meta.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -159,9 +159,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_cern_meta" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -226,57 +226,57 @@
   
   !IF  "$(CFG)" == "mod_cern_meta - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\metadata"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\metadata"
  +   cd "..\..\modules\metadata"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_cern_meta - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/metadata/mod_expires.mak
  
  Index: mod_expires.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_expires.mak	2001/03/22 05:56:55	1.4
  +++ mod_expires.mak	2001/04/05 09:21:42	1.5
  @@ -42,13 +42,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_expires.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -135,13 +135,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_expires.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -157,9 +157,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_expires" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -224,57 +224,57 @@
   
   !IF  "$(CFG)" == "mod_expires - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\metadata"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\metadata"
  +   cd "..\..\modules\metadata"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_expires - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/metadata/mod_headers.mak
  
  Index: mod_headers.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_headers.mak	2001/03/22 05:56:56	1.4
  +++ mod_headers.mak	2001/04/05 09:21:42	1.5
  @@ -42,13 +42,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_headers.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -135,13 +135,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_headers.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -157,9 +157,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_headers" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -224,57 +224,57 @@
   
   !IF  "$(CFG)" == "mod_headers - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\metadata"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\metadata"
  +   cd "..\..\modules\metadata"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_headers - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ENDIF 
   
  
  
  
  1.5       +39 -39    httpd-2.0/modules/metadata/mod_usertrack.mak
  
  Index: mod_usertrack.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_usertrack.mak	2001/03/22 05:56:56	1.4
  +++ mod_usertrack.mak	2001/04/05 09:21:42	1.5
  @@ -43,13 +43,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_usertrack.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -137,13 +137,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug"\
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
    "$(OUTDIR)\mod_usertrack.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -159,9 +159,9 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\..\include" /I "..\..\os\win32" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
    "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D\
  - "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_usertrack" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -226,57 +226,57 @@
   
   !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Release" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  - CFG="libhttpd - Win32 Release" RECURSE=1 
  -   cd ".\modules\metadata"
  +"libapr - Win32 ReleaseCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\metadata"
  +"libapr - Win32 Debug" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\modules\metadata"
   
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  +"libapr - Win32 DebugCLEAN" : 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
  -   cd ".\modules\metadata"
  +   cd "..\..\modules\metadata"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
   
  -"libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Release" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
  -"libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  -   cd "..\..\modules\metadata"
  +"libhttpd - Win32 Debug" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\metadata"
   
  -"libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\.."
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
  -   cd "..\..\modules\metadata"
  +   cd ".\modules\metadata"
   
   !ENDIF 
   
  
  
  
  1.5       +17 -17    httpd-2.0/server/gen_test_char.mak
  
  Index: gen_test_char.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/gen_test_char.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gen_test_char.mak	2001/03/22 05:56:39	1.4
  +++ gen_test_char.mak	2001/04/05 09:21:43	1.5
  @@ -147,9 +147,10 @@
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "..\include" /I "..\srclib\apr\include" /I\
  - "..\srclib\apr-util\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D\
  - "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_test_char" /FD /ZI /c 
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\include" /I\
  + "..\srclib\apr\include" /I "..\srclib\apr-util\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=.
   
  @@ -211,27 +212,26 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
      cd "..\..\server"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  - RECURSE=1 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  + 
      cd "..\..\server"
   
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
      cd "..\..\server"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  - 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
      cd "..\..\server"
   
   !ENDIF 
  @@ -239,12 +239,12 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\server"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\server"
  @@ -252,12 +252,12 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\server"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\server"
  
  
  
  1.4       +2 -2      httpd-2.0/server/gen_uri_delims.mak
  
  Index: gen_uri_delims.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/gen_uri_delims.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen_uri_delims.mak	2001/03/22 05:56:39	1.3
  +++ gen_uri_delims.mak	2001/04/05 09:21:43	1.4
  @@ -136,8 +136,8 @@
       if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D\
  - "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\gen_uri_delims" /FD /ZI /c 
  +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=.
   
  
  
  
  1.9       +3 -2      apr/apr.mak
  
  Index: apr.mak
  ===================================================================
  RCS file: /home/cvs/apr/apr.mak,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr.mak	2001/03/22 05:29:00	1.8
  +++ apr.mak	2001/04/05 09:21:44	1.9
  @@ -223,6 +223,7 @@
   CLEAN :
   	-@erase "$(INTDIR)\access.obj"
   	-@erase "$(INTDIR)\apr.idb"
  +	-@erase "$(INTDIR)\apr.pdb"
   	-@erase "$(INTDIR)\apr_cpystrn.obj"
   	-@erase "$(INTDIR)\apr_fnmatch.obj"
   	-@erase "$(INTDIR)\apr_getpass.obj"
  @@ -279,10 +280,10 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "./include/arch" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I\
    "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D\
    "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\apr" /FD /ZI /c 
  + /Fd"$(INTDIR)\apr" /FD /c 
   CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
  
  
  
  1.8       +3 -2      apr/libapr.mak
  
  Index: libapr.mak
  ===================================================================
  RCS file: /home/cvs/apr/libapr.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- libapr.mak	2001/03/22 05:29:00	1.7
  +++ libapr.mak	2001/04/05 09:21:44	1.8
  @@ -231,6 +231,7 @@
   CLEAN :
   	-@erase "$(INTDIR)\access.obj"
   	-@erase "$(INTDIR)\apr.idb"
  +	-@erase "$(INTDIR)\apr.pdb"
   	-@erase "$(INTDIR)\apr_cpystrn.obj"
   	-@erase "$(INTDIR)\apr_fnmatch.obj"
   	-@erase "$(INTDIR)\apr_getpass.obj"
  @@ -290,10 +291,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "./include/arch" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I\
    "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D\
    "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\apr" /FD /ZI /c 
  + /Fd"$(INTDIR)\apr" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  
  
  
  1.11      +8 -8      apr-util/aprutil.mak
  
  Index: aprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- aprutil.mak	2001/03/22 05:45:48	1.10
  +++ aprutil.mak	2001/04/05 09:21:44	1.11
  @@ -192,6 +192,7 @@
   	-@erase "$(INTDIR)\apr_sha1.obj"
   	-@erase "$(INTDIR)\apr_xml.obj"
   	-@erase "$(INTDIR)\aprutil.idb"
  +	-@erase "$(INTDIR)\aprutil.pdb"
   	-@erase "$(INTDIR)\sdbm.obj"
   	-@erase "$(INTDIR)\sdbm_hash.obj"
   	-@erase "$(INTDIR)\sdbm_lock.obj"
  @@ -203,10 +204,10 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "../apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I\
    "./include/private" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "WIN32"\
    /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "APU_USE_SDBM"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /ZI /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /c 
   CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
  @@ -804,26 +805,25 @@
   
   "apr - Win32 Release" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
      cd "..\apr-util"
   
   "apr - Win32 ReleaseCLEAN" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  - RECURSE=1 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  + 
      cd "..\apr-util"
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
   "apr - Win32 Debug" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
      cd "..\apr-util"
   
   "apr - Win32 DebugCLEAN" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  - 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
      cd "..\apr-util"
   
   !ENDIF 
  
  
  
  1.10      +7 -6      apr-util/libaprutil.mak
  
  Index: libaprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- libaprutil.mak	2001/03/22 05:45:48	1.9
  +++ libaprutil.mak	2001/04/05 09:21:45	1.10
  @@ -202,6 +202,7 @@
   	-@erase "$(INTDIR)\apr_sha1.obj"
   	-@erase "$(INTDIR)\apr_xml.obj"
   	-@erase "$(INTDIR)\aprutil.idb"
  +	-@erase "$(INTDIR)\aprutil.pdb"
   	-@erase "$(INTDIR)\sdbm.obj"
   	-@erase "$(INTDIR)\sdbm_hash.obj"
   	-@erase "$(INTDIR)\sdbm_lock.obj"
  @@ -216,10 +217,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "../apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I\
    "./include/private" /I "./dbm/sdbm" /I "./xml/expat/lib" /I "./expat/lib" /D\
    "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"\
  - /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /ZI /c 
  + /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -824,12 +825,12 @@
   
   "libapr - Win32 Release" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
      cd "..\apr-util"
   
   "libapr - Win32 ReleaseCLEAN" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
   
  @@ -837,12 +838,12 @@
   
   "libapr - Win32 Debug" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
      cd "..\apr-util"
   
   "libapr - Win32 DebugCLEAN" : 
      cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\apr-util"
   
  
  
  
  1.4       +4 -3      apr-util/xml/expat/lib/xml.mak
  
  Index: xml.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/lib/xml.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- xml.mak	2001/03/22 05:38:46	1.3
  +++ xml.mak	2001/04/05 09:21:45	1.4
  @@ -128,6 +128,7 @@
   
   CLEAN :
   	-@erase "$(INTDIR)\vc50.idb"
  +	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(INTDIR)\xmlparse.obj"
   	-@erase "$(INTDIR)\xmlrole.obj"
   	-@erase "$(INTDIR)\xmltok.obj"
  @@ -138,10 +139,10 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  - /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D\
  + "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D\
    XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  - /FD /ZI /c 
  + /FD /c 
   CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
  
  
  
  1.2       +5 -5      httpd-2.0/srclib/pcre/pcre.mak
  
  Index: pcre.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/pcre/pcre.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pcre.mak	2000/12/21 01:46:22	1.1
  +++ pcre.mak	2001/04/05 09:21:45	1.2
  @@ -319,25 +319,25 @@
   
   "dftables - Win32 Release" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\dftables.mak CFG="dftables - Win32 Release" 
      cd "."
   
   "dftables - Win32 ReleaseCLEAN" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\dftables.mak"\
  - CFG="dftables - Win32 Release" RECURSE=1 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\dftables.mak CFG="dftables - Win32 Release"\
  + RECURSE=1 
      cd "."
   
   !ELSEIF  "$(CFG)" == "pcre - Win32 Debug"
   
   "dftables - Win32 Debug" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\dftables.mak CFG="dftables - Win32 Debug" 
      cd "."
   
   "dftables - Win32 DebugCLEAN" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\dftables.mak" CFG="dftables - Win32 Debug"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\dftables.mak CFG="dftables - Win32 Debug"\
    RECURSE=1 
      cd "."
   
  
  
  
  1.2       +5 -5      httpd-2.0/srclib/pcre/pcreposix.mak
  
  Index: pcreposix.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/pcre/pcreposix.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pcreposix.mak	2000/12/21 01:46:22	1.1
  +++ pcreposix.mak	2001/04/05 09:21:46	1.2
  @@ -256,12 +256,12 @@
   
   "pcre - Win32 Release" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Release" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\pcre.mak CFG="pcre - Win32 Release" 
      cd "."
   
   "pcre - Win32 ReleaseCLEAN" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\pcre.mak" CFG="pcre - Win32 Release"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\pcre.mak CFG="pcre - Win32 Release"\
    RECURSE=1 
      cd "."
   
  @@ -269,13 +269,13 @@
   
   "pcre - Win32 Debug" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) /F ".\pcre.mak" CFG="pcre - Win32 Debug" 
  +   $(MAKE) /$(MAKEFLAGS) /F .\pcre.mak CFG="pcre - Win32 Debug" 
      cd "."
   
   "pcre - Win32 DebugCLEAN" : 
      cd "."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\pcre.mak" CFG="pcre - Win32 Debug"\
  - RECURSE=1 
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\pcre.mak CFG="pcre - Win32 Debug" RECURSE=1\
  + 
      cd "."
   
   !ENDIF 
  
  
  
  1.5       +15 -16    httpd-2.0/support/ab.mak
  
  Index: ab.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ab.mak	2001/03/22 05:56:58	1.4
  +++ ab.mak	2001/04/05 09:21:46	1.5
  @@ -146,10 +146,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
    "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
    "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\ab"\
  - /FD /ZI /c 
  + /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -210,27 +210,26 @@
   !IF  "$(CFG)" == "ab - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  - RECURSE=1 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  + 
      cd "..\..\support"
   
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  - 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
      cd "..\..\support"
   
   !ENDIF 
  @@ -238,12 +237,12 @@
   !IF  "$(CFG)" == "ab - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -251,12 +250,12 @@
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  
  
  
  1.5       +15 -16    httpd-2.0/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htdigest.mak	2001/03/22 05:56:59	1.4
  +++ htdigest.mak	2001/04/05 09:21:46	1.5
  @@ -148,10 +148,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
    "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
    "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\htdigest" /FD /ZI /c 
  + /Fd"$(INTDIR)\htdigest" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -214,27 +214,26 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  - RECURSE=1 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  + 
      cd "..\..\support"
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  - 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
      cd "..\..\support"
   
   !ENDIF 
  @@ -242,12 +241,12 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -255,12 +254,12 @@
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  
  
  
  1.5       +15 -16    httpd-2.0/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- htpasswd.mak	2001/03/22 05:56:59	1.4
  +++ htpasswd.mak	2001/04/05 09:21:46	1.5
  @@ -148,10 +148,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
    "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
    "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\htpasswd" /FD /ZI /c 
  + /Fd"$(INTDIR)\htpasswd" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -214,27 +214,26 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  - RECURSE=1 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  + 
      cd "..\..\support"
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  - 
  +   cd "..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
      cd "..\..\support"
   
   !ENDIF 
  @@ -242,12 +241,12 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -255,12 +254,12 @@
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  
  
  
  1.5       +2 -2      httpd-2.0/support/logresolve.mak
  
  Index: logresolve.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/logresolve.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- logresolve.mak	2001/03/22 05:56:59	1.4
  +++ logresolve.mak	2001/04/05 09:21:46	1.5
  @@ -139,10 +139,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
    "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
    "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\logresolve" /FD /ZI /c 
  + /Fd"$(INTDIR)\logresolve" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  
  
  
  1.4       +2 -2      httpd-2.0/support/rotatelogs.mak
  
  Index: rotatelogs.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/rotatelogs.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rotatelogs.mak	2001/03/22 05:56:59	1.3
  +++ rotatelogs.mak	2001/04/05 09:21:46	1.4
  @@ -139,10 +139,10 @@
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "../srclib/apr/include" /I\
  +CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "../srclib/apr/include" /I\
    "../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D\
    "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\rotatelogs" /FD /ZI /c 
  + /Fd"$(INTDIR)\rotatelogs" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  
  
  

Mime
View raw message