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
Date Thu, 28 Jun 2001 00:31:07 GMT
wrowe       01/06/27 17:31:07

  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_info.mak 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
               srclib/pcre pcre.mak pcreposix.mak
               support  ab.mak htdigest.mak htpasswd.mak
  Added:       modules/tls mod_tls.mak
  Log:
    Refresh .mak files for tagging 2.0.19
  
  Revision  Changes    Path
  1.7       +10 -9     httpd-2.0/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.mak,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Apache.mak	2001/05/22 22:42:02	1.6
  +++ Apache.mak	2001/06/28 00:30:32	1.7
  @@ -221,12 +221,12 @@
   
   "libapr - Win32 Release" : 
      cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   $(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"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\.."
   
  @@ -234,12 +234,12 @@
   
   "libapr - Win32 Debug" : 
      cd ".\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   $(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"\
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\.."
   
  @@ -278,25 +278,25 @@
   
   "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 "."
   
  @@ -340,6 +340,7 @@
   	".\include\util_ebcdic.h"\
   	".\os\win32\os.h"\
   	".\srclib\apr-util\include\apr_hooks.h"\
  +	".\srclib\apr-util\include\apr_optional_hooks.h"\
   	".\srclib\apr-util\include\apr_uri.h"\
   	".\srclib\apr-util\include\apu.h"\
   	".\srclib\apr\include\apr.h"\
  
  
  
  1.11      +190 -198  httpd-2.0/libhttpd.mak
  
  Index: libhttpd.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- libhttpd.mak	2001/05/23 05:14:48	1.10
  +++ libhttpd.mak	2001/06/28 00:30:33	1.11
  @@ -93,7 +93,6 @@
   	-@erase "$(INTDIR)\service.obj"
   	-@erase "$(INTDIR)\util.obj"
   	-@erase "$(INTDIR)\util_cfgtree.obj"
  -	-@erase "$(INTDIR)\util_date.obj"
   	-@erase "$(INTDIR)\util_filter.obj"
   	-@erase "$(INTDIR)\util_md5.obj"
   	-@erase "$(INTDIR)\util_script.obj"
  @@ -197,7 +196,6 @@
   	"$(INTDIR)\service.obj" \
   	"$(INTDIR)\util.obj" \
   	"$(INTDIR)\util_cfgtree.obj" \
  -	"$(INTDIR)\util_date.obj" \
   	"$(INTDIR)\util_filter.obj" \
   	"$(INTDIR)\util_md5.obj" \
   	"$(INTDIR)\util_script.obj" \
  @@ -280,7 +278,6 @@
   	-@erase "$(INTDIR)\service.obj"
   	-@erase "$(INTDIR)\util.obj"
   	-@erase "$(INTDIR)\util_cfgtree.obj"
  -	-@erase "$(INTDIR)\util_date.obj"
   	-@erase "$(INTDIR)\util_filter.obj"
   	-@erase "$(INTDIR)\util_md5.obj"
   	-@erase "$(INTDIR)\util_script.obj"
  @@ -386,7 +383,6 @@
   	"$(INTDIR)\service.obj" \
   	"$(INTDIR)\util.obj" \
   	"$(INTDIR)\util_cfgtree.obj" \
  -	"$(INTDIR)\util_date.obj" \
   	"$(INTDIR)\util_filter.obj" \
   	"$(INTDIR)\util_md5.obj" \
   	"$(INTDIR)\util_script.obj" \
  @@ -470,6 +466,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"\
  @@ -541,6 +538,67 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +SOURCE=.\server\core.c
  +DEP_CPP_CORE_=\
  +	".\include\ap_config.h"\
  +	".\include\ap_mmn.h"\
  +	".\include\ap_release.h"\
  +	".\include\http_config.h"\
  +	".\include\http_connection.h"\
  +	".\include\http_core.h"\
  +	".\include\http_log.h"\
  +	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
  +	".\include\http_request.h"\
  +	".\include\http_vhost.h"\
  +	".\include\httpd.h"\
  +	".\include\pcreposix.h"\
  +	".\include\rfc1413.h"\
  +	".\include\util_cfgtree.h"\
  +	".\include\util_charset.h"\
  +	".\include\util_ebcdic.h"\
  +	".\include\util_filter.h"\
  +	".\include\util_md5.h"\
  +	".\modules\http\mod_core.h"\
  +	".\os\win32\os.h"\
  +	".\server\mpm\winnt\mpm.h"\
  +	".\srclib\apr-util\include\apr_buckets.h"\
  +	".\srclib\apr-util\include\apr_hooks.h"\
  +	".\srclib\apr-util\include\apr_optional_hooks.h"\
  +	".\srclib\apr-util\include\apr_ring.h"\
  +	".\srclib\apr-util\include\apr_uri.h"\
  +	".\srclib\apr-util\include\apu.h"\
  +	".\srclib\apr\include\apr.h"\
  +	".\srclib\apr\include\apr_dso.h"\
  +	".\srclib\apr\include\apr_errno.h"\
  +	".\srclib\apr\include\apr_file_info.h"\
  +	".\srclib\apr\include\apr_file_io.h"\
  +	".\srclib\apr\include\apr_fnmatch.h"\
  +	".\srclib\apr\include\apr_general.h"\
  +	".\srclib\apr\include\apr_hash.h"\
  +	".\srclib\apr\include\apr_lib.h"\
  +	".\srclib\apr\include\apr_lock.h"\
  +	".\srclib\apr\include\apr_md5.h"\
  +	".\srclib\apr\include\apr_mmap.h"\
  +	".\srclib\apr\include\apr_network_io.h"\
  +	".\srclib\apr\include\apr_pools.h"\
  +	".\srclib\apr\include\apr_portable.h"\
  +	".\srclib\apr\include\apr_strings.h"\
  +	".\srclib\apr\include\apr_tables.h"\
  +	".\srclib\apr\include\apr_thread_proc.h"\
  +	".\srclib\apr\include\apr_time.h"\
  +	".\srclib\apr\include\apr_user.h"\
  +	".\srclib\apr\include\apr_want.h"\
  +	".\srclib\apr\include\apr_xlate.h"\
  +	
  +NODEP_CPP_CORE_=\
  +	".\include\ap_config_auto.h"\
  +	
  +
  +"$(INTDIR)\core.obj" : $(SOURCE) $(DEP_CPP_CORE_) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=.\server\log.c
   DEP_CPP_LOG_C=\
   	".\include\ap_config.h"\
  @@ -563,6 +621,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_lib.h"\
   	".\srclib\apr\include\apr_network_io.h"\
   	".\srclib\apr\include\apr_pools.h"\
  @@ -616,6 +675,114 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +SOURCE=.\server\protocol.c
  +DEP_CPP_PROTO=\
  +	".\include\ap_config.h"\
  +	".\include\ap_mmn.h"\
  +	".\include\ap_release.h"\
  +	".\include\http_config.h"\
  +	".\include\http_core.h"\
  +	".\include\http_log.h"\
  +	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
  +	".\include\http_request.h"\
  +	".\include\http_vhost.h"\
  +	".\include\httpd.h"\
  +	".\include\pcreposix.h"\
  +	".\include\util_cfgtree.h"\
  +	".\include\util_charset.h"\
  +	".\include\util_ebcdic.h"\
  +	".\include\util_filter.h"\
  +	".\os\win32\os.h"\
  +	".\srclib\apr-util\include\apr_buckets.h"\
  +	".\srclib\apr-util\include\apr_hooks.h"\
  +	".\srclib\apr-util\include\apr_optional_hooks.h"\
  +	".\srclib\apr-util\include\apr_ring.h"\
  +	".\srclib\apr-util\include\apr_uri.h"\
  +	".\srclib\apr-util\include\apu.h"\
  +	".\srclib\apr\include\apr.h"\
  +	".\srclib\apr\include\apr_dso.h"\
  +	".\srclib\apr\include\apr_errno.h"\
  +	".\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_lib.h"\
  +	".\srclib\apr\include\apr_lock.h"\
  +	".\srclib\apr\include\apr_mmap.h"\
  +	".\srclib\apr\include\apr_network_io.h"\
  +	".\srclib\apr\include\apr_pools.h"\
  +	".\srclib\apr\include\apr_portable.h"\
  +	".\srclib\apr\include\apr_signal.h"\
  +	".\srclib\apr\include\apr_strings.h"\
  +	".\srclib\apr\include\apr_tables.h"\
  +	".\srclib\apr\include\apr_thread_proc.h"\
  +	".\srclib\apr\include\apr_time.h"\
  +	".\srclib\apr\include\apr_user.h"\
  +	".\srclib\apr\include\apr_want.h"\
  +	".\srclib\apr\include\apr_xlate.h"\
  +	
  +NODEP_CPP_PROTO=\
  +	".\include\ap_config_auto.h"\
  +	
  +
  +"$(INTDIR)\protocol.obj" : $(SOURCE) $(DEP_CPP_PROTO) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
  +SOURCE=.\server\request.c
  +DEP_CPP_REQUE=\
  +	".\include\ap_config.h"\
  +	".\include\ap_mmn.h"\
  +	".\include\ap_release.h"\
  +	".\include\http_config.h"\
  +	".\include\http_core.h"\
  +	".\include\http_log.h"\
  +	".\include\http_main.h"\
  +	".\include\http_protocol.h"\
  +	".\include\http_request.h"\
  +	".\include\httpd.h"\
  +	".\include\pcreposix.h"\
  +	".\include\util_cfgtree.h"\
  +	".\include\util_charset.h"\
  +	".\include\util_filter.h"\
  +	".\modules\http\mod_core.h"\
  +	".\os\win32\os.h"\
  +	".\srclib\apr-util\include\apr_buckets.h"\
  +	".\srclib\apr-util\include\apr_hooks.h"\
  +	".\srclib\apr-util\include\apr_optional_hooks.h"\
  +	".\srclib\apr-util\include\apr_ring.h"\
  +	".\srclib\apr-util\include\apr_uri.h"\
  +	".\srclib\apr-util\include\apu.h"\
  +	".\srclib\apr\include\apr.h"\
  +	".\srclib\apr\include\apr_dso.h"\
  +	".\srclib\apr\include\apr_errno.h"\
  +	".\srclib\apr\include\apr_file_info.h"\
  +	".\srclib\apr\include\apr_file_io.h"\
  +	".\srclib\apr\include\apr_fnmatch.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"\
  +	".\srclib\apr\include\apr_pools.h"\
  +	".\srclib\apr\include\apr_portable.h"\
  +	".\srclib\apr\include\apr_strings.h"\
  +	".\srclib\apr\include\apr_tables.h"\
  +	".\srclib\apr\include\apr_thread_proc.h"\
  +	".\srclib\apr\include\apr_time.h"\
  +	".\srclib\apr\include\apr_user.h"\
  +	".\srclib\apr\include\apr_want.h"\
  +	".\srclib\apr\include\apr_xlate.h"\
  +	
  +NODEP_CPP_REQUE=\
  +	".\include\ap_config_auto.h"\
  +	
  +
  +"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=.\server\scoreboard.c
   DEP_CPP_SCORE=\
   	".\include\ap_config.h"\
  @@ -643,6 +810,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_network_io.h"\
  @@ -691,6 +859,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -803,12 +972,12 @@
   	".\include\pcreposix.h"\
   	".\include\util_cfgtree.h"\
   	".\include\util_charset.h"\
  -	".\include\util_date.h"\
   	".\include\util_ebcdic.h"\
   	".\include\util_filter.h"\
   	".\modules\http\mod_core.h"\
   	".\os\win32\os.h"\
   	".\srclib\apr-util\include\apr_buckets.h"\
  +	".\srclib\apr-util\include\apr_date.h"\
   	".\srclib\apr-util\include\apr_hooks.h"\
   	".\srclib\apr-util\include\apr_optional_hooks.h"\
   	".\srclib\apr-util\include\apr_ring.h"\
  @@ -820,6 +989,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -874,6 +1044,7 @@
   	".\srclib\apr\include\apr_file_io.h"\
   	".\srclib\apr\include\apr_fnmatch.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"\
  @@ -920,6 +1091,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_lib.h"\
   	".\srclib\apr\include\apr_mmap.h"\
   	".\srclib\apr\include\apr_network_io.h"\
  @@ -968,6 +1140,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"\
  @@ -1105,6 +1278,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -1157,6 +1331,7 @@
   	".\srclib\apr\include\apr_file_io.h"\
   	".\srclib\apr\include\apr_fnmatch.h"\
   	".\srclib\apr\include\apr_general.h"\
  +	".\srclib\apr\include\apr_hash.h"\
   	".\srclib\apr\include\apr_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -1211,6 +1386,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"\
  @@ -1260,6 +1436,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"\
  @@ -1350,6 +1527,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -1456,6 +1634,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"\
  @@ -1597,6 +1776,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -1644,6 +1824,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"\
  @@ -1743,66 +1924,6 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\server\core.c
  -DEP_CPP_CORE_=\
  -	".\include\ap_config.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\ap_release.h"\
  -	".\include\http_config.h"\
  -	".\include\http_connection.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\http_vhost.h"\
  -	".\include\httpd.h"\
  -	".\include\pcreposix.h"\
  -	".\include\rfc1413.h"\
  -	".\include\util_cfgtree.h"\
  -	".\include\util_charset.h"\
  -	".\include\util_ebcdic.h"\
  -	".\include\util_filter.h"\
  -	".\include\util_md5.h"\
  -	".\modules\http\mod_core.h"\
  -	".\os\win32\os.h"\
  -	".\server\mpm\winnt\mpm.h"\
  -	".\srclib\apr-util\include\apr_buckets.h"\
  -	".\srclib\apr-util\include\apr_hooks.h"\
  -	".\srclib\apr-util\include\apr_optional_hooks.h"\
  -	".\srclib\apr-util\include\apr_ring.h"\
  -	".\srclib\apr-util\include\apr_uri.h"\
  -	".\srclib\apr-util\include\apu.h"\
  -	".\srclib\apr\include\apr.h"\
  -	".\srclib\apr\include\apr_dso.h"\
  -	".\srclib\apr\include\apr_errno.h"\
  -	".\srclib\apr\include\apr_file_info.h"\
  -	".\srclib\apr\include\apr_file_io.h"\
  -	".\srclib\apr\include\apr_fnmatch.h"\
  -	".\srclib\apr\include\apr_general.h"\
  -	".\srclib\apr\include\apr_lib.h"\
  -	".\srclib\apr\include\apr_lock.h"\
  -	".\srclib\apr\include\apr_md5.h"\
  -	".\srclib\apr\include\apr_mmap.h"\
  -	".\srclib\apr\include\apr_network_io.h"\
  -	".\srclib\apr\include\apr_pools.h"\
  -	".\srclib\apr\include\apr_portable.h"\
  -	".\srclib\apr\include\apr_strings.h"\
  -	".\srclib\apr\include\apr_tables.h"\
  -	".\srclib\apr\include\apr_thread_proc.h"\
  -	".\srclib\apr\include\apr_time.h"\
  -	".\srclib\apr\include\apr_user.h"\
  -	".\srclib\apr\include\apr_want.h"\
  -	".\srclib\apr\include\apr_xlate.h"\
  -	
  -NODEP_CPP_CORE_=\
  -	".\include\ap_config_auto.h"\
  -	
  -
  -"$(INTDIR)\core.obj" : $(SOURCE) $(DEP_CPP_CORE_) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
   SOURCE=.\server\error_bucket.c
   DEP_CPP_ERROR=\
   	".\include\ap_config.h"\
  @@ -1845,113 +1966,6 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\server\protocol.c
  -DEP_CPP_PROTO=\
  -	".\include\ap_config.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\ap_release.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\http_vhost.h"\
  -	".\include\httpd.h"\
  -	".\include\pcreposix.h"\
  -	".\include\util_cfgtree.h"\
  -	".\include\util_charset.h"\
  -	".\include\util_date.h"\
  -	".\include\util_ebcdic.h"\
  -	".\include\util_filter.h"\
  -	".\os\win32\os.h"\
  -	".\srclib\apr-util\include\apr_buckets.h"\
  -	".\srclib\apr-util\include\apr_hooks.h"\
  -	".\srclib\apr-util\include\apr_optional_hooks.h"\
  -	".\srclib\apr-util\include\apr_ring.h"\
  -	".\srclib\apr-util\include\apr_uri.h"\
  -	".\srclib\apr-util\include\apu.h"\
  -	".\srclib\apr\include\apr.h"\
  -	".\srclib\apr\include\apr_dso.h"\
  -	".\srclib\apr\include\apr_errno.h"\
  -	".\srclib\apr\include\apr_file_info.h"\
  -	".\srclib\apr\include\apr_file_io.h"\
  -	".\srclib\apr\include\apr_general.h"\
  -	".\srclib\apr\include\apr_lib.h"\
  -	".\srclib\apr\include\apr_lock.h"\
  -	".\srclib\apr\include\apr_mmap.h"\
  -	".\srclib\apr\include\apr_network_io.h"\
  -	".\srclib\apr\include\apr_pools.h"\
  -	".\srclib\apr\include\apr_portable.h"\
  -	".\srclib\apr\include\apr_signal.h"\
  -	".\srclib\apr\include\apr_strings.h"\
  -	".\srclib\apr\include\apr_tables.h"\
  -	".\srclib\apr\include\apr_thread_proc.h"\
  -	".\srclib\apr\include\apr_time.h"\
  -	".\srclib\apr\include\apr_user.h"\
  -	".\srclib\apr\include\apr_want.h"\
  -	".\srclib\apr\include\apr_xlate.h"\
  -	
  -NODEP_CPP_PROTO=\
  -	".\include\ap_config_auto.h"\
  -	
  -
  -"$(INTDIR)\protocol.obj" : $(SOURCE) $(DEP_CPP_PROTO) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -SOURCE=.\server\request.c
  -DEP_CPP_REQUE=\
  -	".\include\ap_config.h"\
  -	".\include\ap_mmn.h"\
  -	".\include\ap_release.h"\
  -	".\include\http_config.h"\
  -	".\include\http_core.h"\
  -	".\include\http_log.h"\
  -	".\include\http_main.h"\
  -	".\include\http_protocol.h"\
  -	".\include\http_request.h"\
  -	".\include\httpd.h"\
  -	".\include\pcreposix.h"\
  -	".\include\util_cfgtree.h"\
  -	".\include\util_charset.h"\
  -	".\include\util_filter.h"\
  -	".\modules\http\mod_core.h"\
  -	".\os\win32\os.h"\
  -	".\srclib\apr-util\include\apr_buckets.h"\
  -	".\srclib\apr-util\include\apr_hooks.h"\
  -	".\srclib\apr-util\include\apr_optional_hooks.h"\
  -	".\srclib\apr-util\include\apr_ring.h"\
  -	".\srclib\apr-util\include\apr_uri.h"\
  -	".\srclib\apr-util\include\apu.h"\
  -	".\srclib\apr\include\apr.h"\
  -	".\srclib\apr\include\apr_dso.h"\
  -	".\srclib\apr\include\apr_errno.h"\
  -	".\srclib\apr\include\apr_file_info.h"\
  -	".\srclib\apr\include\apr_file_io.h"\
  -	".\srclib\apr\include\apr_fnmatch.h"\
  -	".\srclib\apr\include\apr_general.h"\
  -	".\srclib\apr\include\apr_lock.h"\
  -	".\srclib\apr\include\apr_mmap.h"\
  -	".\srclib\apr\include\apr_network_io.h"\
  -	".\srclib\apr\include\apr_pools.h"\
  -	".\srclib\apr\include\apr_portable.h"\
  -	".\srclib\apr\include\apr_strings.h"\
  -	".\srclib\apr\include\apr_tables.h"\
  -	".\srclib\apr\include\apr_thread_proc.h"\
  -	".\srclib\apr\include\apr_time.h"\
  -	".\srclib\apr\include\apr_user.h"\
  -	".\srclib\apr\include\apr_want.h"\
  -	".\srclib\apr\include\apr_xlate.h"\
  -	
  -NODEP_CPP_REQUE=\
  -	".\include\ap_config_auto.h"\
  -	
  -
  -"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
   SOURCE=.\server\rfc1413.c
   DEP_CPP_RFC14=\
   	".\include\ap_config.h"\
  @@ -2068,31 +2082,6 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  -SOURCE=.\server\util_date.c
  -DEP_CPP_UTIL_D=\
  -	".\include\ap_config.h"\
  -	".\include\util_date.h"\
  -	".\os\win32\os.h"\
  -	".\srclib\apr-util\include\apr_hooks.h"\
  -	".\srclib\apr-util\include\apr_optional_hooks.h"\
  -	".\srclib\apr-util\include\apu.h"\
  -	".\srclib\apr\include\apr.h"\
  -	".\srclib\apr\include\apr_errno.h"\
  -	".\srclib\apr\include\apr_general.h"\
  -	".\srclib\apr\include\apr_lib.h"\
  -	".\srclib\apr\include\apr_pools.h"\
  -	".\srclib\apr\include\apr_tables.h"\
  -	".\srclib\apr\include\apr_time.h"\
  -	".\srclib\apr\include\apr_want.h"\
  -	
  -NODEP_CPP_UTIL_D=\
  -	".\include\ap_config_auto.h"\
  -	
  -
  -"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
   SOURCE=.\server\util_filter.c
   DEP_CPP_UTIL_F=\
   	".\include\ap_config.h"\
  @@ -2188,12 +2177,12 @@
   	".\include\pcreposix.h"\
   	".\include\util_cfgtree.h"\
   	".\include\util_charset.h"\
  -	".\include\util_date.h"\
   	".\include\util_ebcdic.h"\
   	".\include\util_filter.h"\
   	".\include\util_script.h"\
   	".\os\win32\os.h"\
   	".\srclib\apr-util\include\apr_buckets.h"\
  +	".\srclib\apr-util\include\apr_date.h"\
   	".\srclib\apr-util\include\apr_hooks.h"\
   	".\srclib\apr-util\include\apr_optional_hooks.h"\
   	".\srclib\apr-util\include\apr_ring.h"\
  @@ -2205,6 +2194,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_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_mmap.h"\
  @@ -2290,6 +2280,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"\
  @@ -2381,6 +2372,7 @@
   	".\srclib\apr\include\apr_file_io.h"\
   	".\srclib\apr\include\apr_general.h"\
   	".\srclib\apr\include\apr_getopt.h"\
  +	".\srclib\apr\include\apr_hash.h"\
   	".\srclib\apr\include\apr_lib.h"\
   	".\srclib\apr\include\apr_lock.h"\
   	".\srclib\apr\include\apr_network_io.h"\
  
  
  
  1.6       +20 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_auth_anon.mak	2001/04/05 09:21:38	1.5
  +++ mod_auth_anon.mak	2001/06/28 00:30:36	1.6
  @@ -227,26 +227,26 @@
   !IF  "$(CFG)" == "mod_auth_anon - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\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"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\aaa"
   
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\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"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\aaa"
   
  @@ -255,26 +255,26 @@
   !IF  "$(CFG)" == "mod_auth_anon - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\aaa"
   
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
   
  @@ -294,11 +294,12 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  @@ -306,6 +307,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.6       +24 -22    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_auth_dbm.mak	2001/04/05 09:21:39	1.5
  +++ mod_auth_dbm.mak	2001/06/28 00:30:37	1.6
  @@ -233,26 +233,26 @@
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\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"\
  +   cd "..\../..\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 "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\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"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\aaa"
   
  @@ -261,13 +261,13 @@
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
   "libaprutil - Win32 Release" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -275,12 +275,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -290,26 +290,26 @@
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(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 "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
   
  @@ -329,12 +329,13 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  @@ -342,6 +343,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_lib.h"\
   	"..\..\srclib\apr\include\apr_lock.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
  
  
  
  1.7       +24 -22    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_digest.mak	2001/04/05 09:21:39	1.6
  +++ mod_auth_digest.mak	2001/06/28 00:30:38	1.7
  @@ -231,26 +231,26 @@
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\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"\
  +   cd "..\../..\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 "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\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"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\aaa"
   
  @@ -259,13 +259,13 @@
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
   "libaprutil - Win32 Release" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -273,12 +273,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr-util"
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -288,26 +288,26 @@
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(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 "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
   
  @@ -328,13 +328,14 @@
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
   	"..\..\include\util_md5.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_base64.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
   	"..\..\srclib\apr-util\include\apr_sha1.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  @@ -342,6 +343,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_lib.h"\
   	"..\..\srclib\apr\include\apr_lock.h"\
   	"..\..\srclib\apr\include\apr_md5.h"\
  
  
  
  1.6       +58 -24    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_file_cache.mak	2001/04/05 09:21:39	1.5
  +++ mod_file_cache.mak	2001/06/28 00:30:41	1.6
  @@ -43,13 +43,14 @@
   
   !ELSE 
   
  -ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
  - "$(OUTDIR)\mod_file_cache.so"
  +ALL : "libaprutil - Win32 Release" "libhttpd - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\mod_file_cache.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN"\
  + "libaprutil - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -116,6 +117,7 @@
   LINK32_OBJS= \
   	"$(INTDIR)\mod_file_cache.obj" \
   	"..\..\Release\libhttpd.lib" \
  +	"..\..\srclib\apr-util\Release\libaprutil.lib" \
   	"..\..\srclib\apr\Release\libapr.lib"
   
   "$(OUTDIR)\mod_file_cache.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -137,13 +139,14 @@
   
   !ELSE 
   
  -ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug"\
  - "$(OUTDIR)\mod_file_cache.so"
  +ALL : "libaprutil - Win32 Debug" "libhttpd - Win32 Debug"\
  + "libapr - Win32 Debug" "$(OUTDIR)\mod_file_cache.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN"\
  + "libaprutil - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -211,6 +214,7 @@
   LINK32_OBJS= \
   	"$(INTDIR)\mod_file_cache.obj" \
   	"..\..\Debug\libhttpd.lib" \
  +	"..\..\srclib\apr-util\Debug\libaprutil.lib" \
   	"..\..\srclib\apr\Debug\libapr.lib"
   
   "$(OUTDIR)\mod_file_cache.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  @@ -227,26 +231,26 @@
   !IF  "$(CFG)" == "mod_file_cache - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\cache"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\cache"
   
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\cache"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\cache"
   
  @@ -255,31 +259,60 @@
   !IF  "$(CFG)" == "mod_file_cache - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\cache"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\cache"
   
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\cache"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\cache"
   
   !ENDIF 
   
  +!IF  "$(CFG)" == "mod_file_cache - Win32 Release"
  +
  +"libaprutil - Win32 Release" : 
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
  + 
  +   cd "..\..\modules\cache"
  +
  +"libaprutil - Win32 ReleaseCLEAN" : 
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
  + CFG="libaprutil - Win32 Release" RECURSE=1 
  +   cd "..\..\modules\cache"
  +
  +!ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
  +
  +"libaprutil - Win32 Debug" : 
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
  +   cd "..\..\modules\cache"
  +
  +"libaprutil - Win32 DebugCLEAN" : 
  +   cd "..\../..\httpd-2.0\srclib\apr-util"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
  + CFG="libaprutil - Win32 Debug" RECURSE=1 
  +   cd "..\..\modules\cache"
  +
  +!ENDIF 
  +
   SOURCE=.\mod_file_cache.c
   DEP_CPP_MOD_F=\
   	"..\..\include\ap_config.h"\
  @@ -294,11 +327,12 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  
  
  
  1.6       +49 -33    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_dav_fs.mak	2001/04/05 09:21:40	1.5
  +++ mod_dav_fs.mak	2001/06/28 00:30:43	1.6
  @@ -251,11 +251,15 @@
   	"..\..\..\include\ap_release.h"\
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
  -	"..\..\..\include\util_uri.h"\
  +	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
  +	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -266,6 +270,7 @@
   	"..\..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\..\srclib\apr\include\apr_general.h"\
   	"..\..\..\srclib\apr\include\apr_hash.h"\
  +	"..\..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\..\srclib\apr\include\apr_strings.h"\
  @@ -291,11 +296,15 @@
   	"..\..\..\include\http_log.h"\
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
  -	"..\..\..\include\util_uri.h"\
  +	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
  +	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -306,6 +315,7 @@
   	"..\..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\..\srclib\apr\include\apr_general.h"\
   	"..\..\..\srclib\apr\include\apr_hash.h"\
  +	"..\..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\..\srclib\apr\include\apr_strings.h"\
  @@ -334,11 +344,15 @@
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
   	"..\..\..\include\util_cfgtree.h"\
  -	"..\..\..\include\util_uri.h"\
  +	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
  +	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -349,6 +363,7 @@
   	"..\..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\..\srclib\apr\include\apr_general.h"\
   	"..\..\..\srclib\apr\include\apr_hash.h"\
  +	"..\..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\..\srclib\apr\include\apr_tables.h"\
  @@ -376,13 +391,14 @@
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
   	"..\..\..\include\util_filter.h"\
  -	"..\..\..\include\util_uri.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
   	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -418,26 +434,26 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\../..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../../..\httpd-2.0\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"\
  +   cd "..\../../..\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 "..\../..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../../..\httpd-2.0\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"\
  +   cd "..\../../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\dav\fs"
   
  @@ -446,13 +462,13 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libaprutil - Win32 Release" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\dav\fs"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -460,12 +476,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\dav\fs"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -475,26 +491,26 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\dav\fs"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../../..\httpd-2.0"
  +   $(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 "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\dav\fs"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\dav\fs"
   
  @@ -503,26 +519,26 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "mod_dav - Win32 Release" : 
  -   cd "..\../..\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) /F .\mod_dav.mak CFG="mod_dav - Win32 Release" 
  +   cd "..\../../..\httpd-2.0\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release" 
      cd "..\fs"
   
   "mod_dav - Win32 ReleaseCLEAN" : 
  -   cd "..\../..\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\mod_dav.mak CFG="mod_dav - Win32 Release"\
  +   cd "..\../../..\httpd-2.0\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 "..\../..\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) /F .\mod_dav.mak CFG="mod_dav - Win32 Debug" 
  +   cd "..\../../..\httpd-2.0\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug" 
      cd "..\fs"
   
   "mod_dav - Win32 DebugCLEAN" : 
  -   cd "..\../..\modules\dav\main"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\mod_dav.mak CFG="mod_dav - Win32 Debug"\
  +   cd "..\../../..\httpd-2.0\modules\dav\main"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug"\
    RECURSE=1 
      cd "..\fs"
   
  
  
  
  1.7       +47 -28    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_dav.mak	2001/04/05 09:21:40	1.6
  +++ mod_dav.mak	2001/06/28 00:30:44	1.7
  @@ -259,11 +259,15 @@
   	"..\..\..\include\ap_release.h"\
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
  -	"..\..\..\include\util_uri.h"\
  +	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
  +	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -274,6 +278,7 @@
   	"..\..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\..\srclib\apr\include\apr_general.h"\
   	"..\..\..\srclib\apr\include\apr_hash.h"\
  +	"..\..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\..\srclib\apr\include\apr_strings.h"\
  @@ -306,13 +311,14 @@
   	"..\..\..\include\util_cfgtree.h"\
   	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_script.h"\
  -	"..\..\..\include\util_uri.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
   	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -355,13 +361,14 @@
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
   	"..\..\..\include\util_filter.h"\
  -	"..\..\..\include\util_uri.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
   	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -397,11 +404,15 @@
   	"..\..\..\include\ap_release.h"\
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
  -	"..\..\..\include\util_uri.h"\
  +	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
  +	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -412,6 +423,7 @@
   	"..\..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\..\srclib\apr\include\apr_general.h"\
   	"..\..\..\srclib\apr\include\apr_hash.h"\
  +	"..\..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\..\srclib\apr\include\apr_tables.h"\
  @@ -434,11 +446,15 @@
   	"..\..\..\include\ap_release.h"\
   	"..\..\..\include\httpd.h"\
   	"..\..\..\include\pcreposix.h"\
  -	"..\..\..\include\util_uri.h"\
  +	"..\..\..\include\util_filter.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
  +	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -449,6 +465,7 @@
   	"..\..\..\srclib\apr\include\apr_file_io.h"\
   	"..\..\..\srclib\apr\include\apr_general.h"\
   	"..\..\..\srclib\apr\include\apr_hash.h"\
  +	"..\..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\..\srclib\apr\include\apr_strings.h"\
  @@ -479,13 +496,14 @@
   	"..\..\..\include\pcreposix.h"\
   	"..\..\..\include\util_cfgtree.h"\
   	"..\..\..\include\util_filter.h"\
  -	"..\..\..\include\util_uri.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
   	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -531,13 +549,14 @@
   	"..\..\..\include\pcreposix.h"\
   	"..\..\..\include\util_cfgtree.h"\
   	"..\..\..\include\util_filter.h"\
  -	"..\..\..\include\util_uri.h"\
   	"..\..\..\include\util_xml.h"\
   	"..\..\..\os\win32\os.h"\
   	"..\..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\..\srclib\apr-util\include\apr_dbm.h"\
   	"..\..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\..\srclib\apr-util\include\apr_xml.h"\
   	"..\..\..\srclib\apr-util\include\apu.h"\
   	"..\..\..\srclib\apr-util\include\apu_compat.h"\
  @@ -572,26 +591,26 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\../..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../../..\httpd-2.0\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"\
  +   cd "..\../../..\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 "..\../..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../../..\httpd-2.0\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"\
  +   cd "..\../../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\dav\main"
   
  @@ -600,13 +619,13 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libaprutil - Win32 Release" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\dav\main"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -614,12 +633,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\dav\main"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "..\../..\srclib\apr-util"
  +   cd "..\../../..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -629,26 +648,26 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\dav\main"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../../..\httpd-2.0"
  +   $(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 "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\dav\main"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\../.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\dav\main"
   
  
  
  
  1.6       +46 -41    httpd-2.0/modules/generators/mod_info.mak
  
  Index: mod_info.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_info.mak	2001/03/22 05:56:49	1.5
  +++ mod_info.mak	2001/06/28 00:30:46	1.6
  @@ -41,13 +41,13 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Release" "libhttpd - Win32 Release"\
  +ALL : "libhttpd - Win32 Release" "libapr - Win32 Release"\
    "$(OUTDIR)\mod_info.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "libhttpd - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -134,12 +134,12 @@
   
   !ELSE 
   
  -ALL : "libapr - Win32 Debug" "libhttpd - Win32 Debug" "$(OUTDIR)\mod_info.so"
  +ALL : "libhttpd - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\mod_info.so"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libhttpd - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "libhttpd - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -147,15 +147,17 @@
   	-@erase "$(INTDIR)\mod_info.obj"
   	-@erase "$(OUTDIR)\mod_info.exp"
   	-@erase "$(OUTDIR)\mod_info.lib"
  +	-@erase "$(OUTDIR)\mod_info.map"
  +	-@erase "$(OUTDIR)\mod_info.pdb"
   	-@erase "$(OUTDIR)\mod_info.so"
   
   "$(OUTDIR)" :
       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_info" /FD /ZI /c 
  + "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_info" /FD /c 
   CPP_OBJS=.\Debug/
   CPP_SBRS=.
   
  @@ -198,8 +200,8 @@
   	
   LINK32=link.exe
   LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no\
  - /pdb:"$(OUTDIR)\mod_info.pdb" /machine:I386 /out:"$(OUTDIR)\mod_info.so"\
  - /implib:"$(OUTDIR)\mod_info.lib" /map/debug\
  + /pdb:"$(OUTDIR)\mod_info.pdb" /map:"$(INTDIR)\mod_info.map" /debug\
  + /machine:I386 /out:"$(OUTDIR)\mod_info.so" /implib:"$(OUTDIR)\mod_info.lib"\
    /base:@..\..\os\win32\BaseAddr.ref,mod_info 
   LINK32_OBJS= \
   	"$(INTDIR)\mod_info.obj" \
  @@ -219,41 +221,13 @@
   
   !IF  "$(CFG)" == "mod_info - Win32 Release"
   
  -"libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - 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"
  -
  -!ELSEIF  "$(CFG)" == "mod_info - Win32 Debug"
  -
  -"libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  -   cd ".\modules\generators"
  -
  -"libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  - RECURSE=1 
  -   cd ".\modules\generators"
  -
  -!ENDIF 
  -
  -!IF  "$(CFG)" == "mod_info - Win32 Release"
  -
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\httpd-2.0\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\generators"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\httpd-2.0\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\generators"
  @@ -261,18 +235,46 @@
   !ELSEIF  "$(CFG)" == "mod_info - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\httpd-2.0\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\generators"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\httpd-2.0\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\generators"
   
   !ENDIF 
   
  +!IF  "$(CFG)" == "mod_info - Win32 Release"
  +
  +"libhttpd - Win32 Release" : 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
  +   cd ".\modules\generators"
  +
  +"libhttpd - Win32 ReleaseCLEAN" : 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
  +   cd ".\modules\generators"
  +
  +!ELSEIF  "$(CFG)" == "mod_info - Win32 Debug"
  +
  +"libhttpd - Win32 Debug" : 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
  +   cd ".\modules\generators"
  +
  +"libhttpd - Win32 DebugCLEAN" : 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
  + RECURSE=1 
  +   cd ".\modules\generators"
  +
  +!ENDIF 
  +
   SOURCE=.\mod_info.c
   DEP_CPP_MOD_I=\
   	"..\..\include\ap_config.h"\
  @@ -284,16 +286,18 @@
   	"..\..\include\http_log.h"\
   	"..\..\include\http_main.h"\
   	"..\..\include\http_protocol.h"\
  +	"..\..\include\http_request.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
   	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  @@ -301,6 +305,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_lib.h"\
   	"..\..\srclib\apr\include\apr_lock.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
  
  
  
  1.7       +20 -18    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_status.mak	2001/04/05 09:21:41	1.6
  +++ mod_status.mak	2001/06/28 00:30:47	1.7
  @@ -225,26 +225,26 @@
   !IF  "$(CFG)" == "mod_status - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\generators"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\generators"
   
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\generators"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\generators"
   
  @@ -253,26 +253,26 @@
   !IF  "$(CFG)" == "mod_status - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\generators"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\generators"
   
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\generators"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\generators"
   
  @@ -294,12 +294,13 @@
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
   	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\server\mpm\winnt\mpm_default.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  @@ -307,6 +308,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.6       +20 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_rewrite.mak	2001/04/05 09:21:41	1.5
  +++ mod_rewrite.mak	2001/06/28 00:30:49	1.6
  @@ -227,26 +227,26 @@
   !IF  "$(CFG)" == "mod_rewrite - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\mappers"
   
  @@ -255,26 +255,26 @@
   !IF  "$(CFG)" == "mod_rewrite - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\mappers"
   
  @@ -295,11 +295,12 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_dso.h"\
  @@ -307,6 +308,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_lib.h"\
   	"..\..\srclib\apr\include\apr_lock.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
  
  
  
  1.6       +20 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_speling.mak	2001/04/05 09:21:42	1.5
  +++ mod_speling.mak	2001/06/28 00:30:49	1.6
  @@ -225,26 +225,26 @@
   !IF  "$(CFG)" == "mod_speling - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\mappers"
   
  @@ -253,26 +253,26 @@
   !IF  "$(CFG)" == "mod_speling - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\mappers"
   
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\mappers"
   
  @@ -291,17 +291,19 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_errno.h"\
   	"..\..\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_lib.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\srclib\apr\include\apr_network_io.h"\
  
  
  
  1.6       +19 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_cern_meta.mak	2001/04/05 09:21:42	1.5
  +++ mod_cern_meta.mak	2001/06/28 00:30:51	1.6
  @@ -227,26 +227,26 @@
   !IF  "$(CFG)" == "mod_cern_meta - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
  @@ -255,26 +255,26 @@
   !IF  "$(CFG)" == "mod_cern_meta - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
   
  @@ -293,11 +293,12 @@
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
   	"..\..\include\util_script.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_errno.h"\
  
  
  
  1.6       +19 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_expires.mak	2001/04/05 09:21:42	1.5
  +++ mod_expires.mak	2001/06/28 00:30:53	1.6
  @@ -225,26 +225,26 @@
   !IF  "$(CFG)" == "mod_expires - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
  @@ -253,26 +253,26 @@
   !IF  "$(CFG)" == "mod_expires - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
   
  @@ -290,11 +290,12 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_errno.h"\
  
  
  
  1.6       +23 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_headers.mak	2001/04/05 09:21:42	1.5
  +++ mod_headers.mak	2001/06/28 00:30:53	1.6
  @@ -225,26 +225,26 @@
   !IF  "$(CFG)" == "mod_headers - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
  @@ -253,26 +253,26 @@
   !IF  "$(CFG)" == "mod_headers - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
   
  @@ -284,27 +284,32 @@
   	"..\..\include\ap_mmn.h"\
   	"..\..\include\ap_release.h"\
   	"..\..\include\http_config.h"\
  +	"..\..\include\http_log.h"\
   	"..\..\include\http_request.h"\
   	"..\..\include\httpd.h"\
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_errno.h"\
   	"..\..\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_lib.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\srclib\apr\include\apr_network_io.h"\
   	"..\..\srclib\apr\include\apr_pools.h"\
   	"..\..\srclib\apr\include\apr_strings.h"\
   	"..\..\srclib\apr\include\apr_tables.h"\
  +	"..\..\srclib\apr\include\apr_thread_proc.h"\
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  
  
  
  1.6       +20 -18    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_usertrack.mak	2001/04/05 09:21:42	1.5
  +++ mod_usertrack.mak	2001/06/28 00:30:53	1.6
  @@ -227,26 +227,26 @@
   !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\../..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
   
  @@ -255,26 +255,26 @@
   !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Release" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Release"\
  - RECURSE=1 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
  + CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
   
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) /F .\libhttpd.mak CFG="libhttpd - Win32 Debug" 
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "..\.."
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libhttpd.mak CFG="libhttpd - Win32 Debug"\
  +   cd "..\../..\httpd-2.0"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
   
  @@ -292,17 +292,19 @@
   	"..\..\include\pcreposix.h"\
   	"..\..\include\util_cfgtree.h"\
   	"..\..\include\util_filter.h"\
  -	"..\..\include\util_uri.h"\
   	"..\..\os\win32\os.h"\
   	"..\..\srclib\apr-util\include\apr_buckets.h"\
   	"..\..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
   	"..\..\srclib\apr-util\include\apr_ring.h"\
  +	"..\..\srclib\apr-util\include\apr_uri.h"\
   	"..\..\srclib\apr-util\include\apu.h"\
   	"..\..\srclib\apr\include\apr.h"\
   	"..\..\srclib\apr\include\apr_errno.h"\
   	"..\..\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_lib.h"\
   	"..\..\srclib\apr\include\apr_mmap.h"\
   	"..\..\srclib\apr\include\apr_network_io.h"\
  
  
  
  1.1                  httpd-2.0/modules/tls/mod_tls.mak
  
  Index: mod_tls.mak
  ===================================================================
  # Microsoft Developer Studio Generated NMAKE File, Based on mod_tls.dsp
  !IF "$(CFG)" == ""
  CFG=mod_tls - Win32 Release
  !MESSAGE No configuration specified. Defaulting to mod_tls - Win32 Release.
  !ENDIF 
  
  !IF "$(CFG)" != "mod_tls - Win32 Release" && "$(CFG)" !=\
   "mod_tls - Win32 Debug"
  !MESSAGE Invalid configuration "$(CFG)" specified.
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_tls.mak" CFG="mod_tls - Win32 Release"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "mod_tls - Win32 Release" (based on\
   "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "mod_tls - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  !ERROR An invalid configuration is specified.
  !ENDIF 
  
  !IF "$(OS)" == "Windows_NT"
  NULL=
  !ELSE 
  NULL=nul
  !ENDIF 
  
  !IF  "$(CFG)" == "mod_tls - Win32 Release"
  
  OUTDIR=.\Release
  INTDIR=.\Release
  # Begin Custom Macros
  OutDir=.\Release
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\mod_tls.so"
  
  !ELSE 
  
  ALL : "libhttpd - Win32 Release" "libaprutil - Win32 Release"\
   "libapr - Win32 Release" "$(OUTDIR)\mod_tls.so"
  
  !ENDIF 
  
  !IF "$(RECURSE)" == "1" 
  CLEAN :"libapr - Win32 ReleaseCLEAN" "libaprutil - Win32 ReleaseCLEAN"\
   "libhttpd - Win32 ReleaseCLEAN" 
  !ELSE 
  CLEAN :
  !ENDIF 
  	-@erase "$(INTDIR)\mod_tls.idb"
  	-@erase "$(INTDIR)\mod_tls.obj"
  	-@erase "$(INTDIR)\openssl_state_machine.obj"
  	-@erase "$(OUTDIR)\mod_tls.exp"
  	-@erase "$(OUTDIR)\mod_tls.lib"
  	-@erase "$(OUTDIR)\mod_tls.map"
  	-@erase "$(OUTDIR)\mod_tls.so"
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP=cl.exe
  CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\
   "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I\
   "..\..\srclib\openssl\inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"\
   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_tls" /FD /c 
  CPP_OBJS=.\Release/
  CPP_SBRS=.
  
  .c{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cpp{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cxx{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .c{$(CPP_SBRS)}.sbr::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cpp{$(CPP_SBRS)}.sbr::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cxx{$(CPP_SBRS)}.sbr::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  MTL=midl.exe
  MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  RSC=rc.exe
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_tls.bsc" 
  BSC32_SBRS= \
  	
  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows\
   /dll /incremental:no /pdb:"$(OUTDIR)\mod_tls.pdb" /map:"$(INTDIR)\mod_tls.map"\
   /machine:I386 /out:"$(OUTDIR)\mod_tls.so" /implib:"$(OUTDIR)\mod_tls.lib"\
   /libpath:"..\..\srclib\openssl\out32dll"\
   /base:@..\..\os\win32\BaseAddr.ref,mod_tls 
  LINK32_OBJS= \
  	"$(INTDIR)\mod_tls.obj" \
  	"$(INTDIR)\openssl_state_machine.obj" \
  	"..\..\Release\libhttpd.lib" \
  	"..\..\srclib\apr-util\Release\libaprutil.lib" \
  	"..\..\srclib\apr\Release\libapr.lib"
  
  "$(OUTDIR)\mod_tls.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
      $(LINK32) @<<
    $(LINK32_FLAGS) $(LINK32_OBJS)
  <<
  
  !ELSEIF  "$(CFG)" == "mod_tls - Win32 Debug"
  
  OUTDIR=.\Debug
  INTDIR=.\Debug
  # Begin Custom Macros
  OutDir=.\Debug
  # End Custom Macros
  
  !IF "$(RECURSE)" == "0" 
  
  ALL : "$(OUTDIR)\mod_tls.so"
  
  !ELSE 
  
  ALL : "libhttpd - Win32 Debug" "libaprutil - Win32 Debug"\
   "libapr - Win32 Debug" "$(OUTDIR)\mod_tls.so"
  
  !ENDIF 
  
  !IF "$(RECURSE)" == "1" 
  CLEAN :"libapr - Win32 DebugCLEAN" "libaprutil - Win32 DebugCLEAN"\
   "libhttpd - Win32 DebugCLEAN" 
  !ELSE 
  CLEAN :
  !ENDIF 
  	-@erase "$(INTDIR)\mod_tls.idb"
  	-@erase "$(INTDIR)\mod_tls.obj"
  	-@erase "$(INTDIR)\openssl_state_machine.obj"
  	-@erase "$(OUTDIR)\mod_tls.exp"
  	-@erase "$(OUTDIR)\mod_tls.lib"
  	-@erase "$(OUTDIR)\mod_tls.map"
  	-@erase "$(OUTDIR)\mod_tls.pdb"
  	-@erase "$(OUTDIR)\mod_tls.so"
  
  "$(OUTDIR)" :
      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  
  CPP=cl.exe
  CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
   "..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /I\
   "..\..\srclib\openssl\inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_tls" /FD /c 
  CPP_OBJS=.\Debug/
  CPP_SBRS=.
  
  .c{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cpp{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cxx{$(CPP_OBJS)}.obj::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .c{$(CPP_SBRS)}.sbr::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cpp{$(CPP_SBRS)}.sbr::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  .cxx{$(CPP_SBRS)}.sbr::
     $(CPP) @<<
     $(CPP_PROJ) $< 
  <<
  
  MTL=midl.exe
  MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  RSC=rc.exe
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_tls.bsc" 
  BSC32_SBRS= \
  	
  LINK32=link.exe
  LINK32_FLAGS=kernel32.lib ssleay32.lib libeay32.lib /nologo /subsystem:windows\
   /dll /incremental:no /pdb:"$(OUTDIR)\mod_tls.pdb" /map:"$(INTDIR)\mod_tls.map"\
   /debug /machine:I386 /out:"$(OUTDIR)\mod_tls.so"\
   /implib:"$(OUTDIR)\mod_tls.lib" /libpath:"..\..\srclib\openssl\out32dll"\
   /base:@..\..\os\win32\BaseAddr.ref,mod_tls 
  LINK32_OBJS= \
  	"$(INTDIR)\mod_tls.obj" \
  	"$(INTDIR)\openssl_state_machine.obj" \
  	"..\..\Debug\libhttpd.lib" \
  	"..\..\srclib\apr-util\Debug\libaprutil.lib" \
  	"..\..\srclib\apr\Debug\libapr.lib"
  
  "$(OUTDIR)\mod_tls.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
      $(LINK32) @<<
    $(LINK32_FLAGS) $(LINK32_OBJS)
  <<
  
  !ENDIF 
  
  
  !IF "$(CFG)" == "mod_tls - Win32 Release" || "$(CFG)" ==\
   "mod_tls - Win32 Debug"
  
  !IF  "$(CFG)" == "mod_tls - Win32 Release"
  
  "libapr - Win32 Release" : 
     cd "..\../..\httpd-2.0\srclib\apr"
     $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
     cd "..\..\modules\tls"
  
  "libapr - Win32 ReleaseCLEAN" : 
     cd "..\../..\httpd-2.0\srclib\apr"
     $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
   RECURSE=1 
     cd "..\..\modules\tls"
  
  !ELSEIF  "$(CFG)" == "mod_tls - Win32 Debug"
  
  "libapr - Win32 Debug" : 
     cd "..\../..\httpd-2.0\srclib\apr"
     $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
     cd "..\..\modules\tls"
  
  "libapr - Win32 DebugCLEAN" : 
     cd "..\../..\httpd-2.0\srclib\apr"
     $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
   RECURSE=1 
     cd "..\..\modules\tls"
  
  !ENDIF 
  
  !IF  "$(CFG)" == "mod_tls - Win32 Release"
  
  "libaprutil - Win32 Release" : 
     cd "..\../..\httpd-2.0\srclib\apr-util"
     $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
   
     cd "..\..\modules\tls"
  
  "libaprutil - Win32 ReleaseCLEAN" : 
     cd "..\../..\httpd-2.0\srclib\apr-util"
     $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
   CFG="libaprutil - Win32 Release" RECURSE=1 
     cd "..\..\modules\tls"
  
  !ELSEIF  "$(CFG)" == "mod_tls - Win32 Debug"
  
  "libaprutil - Win32 Debug" : 
     cd "..\../..\httpd-2.0\srclib\apr-util"
     $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
     cd "..\..\modules\tls"
  
  "libaprutil - Win32 DebugCLEAN" : 
     cd "..\../..\httpd-2.0\srclib\apr-util"
     $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
   CFG="libaprutil - Win32 Debug" RECURSE=1 
     cd "..\..\modules\tls"
  
  !ENDIF 
  
  !IF  "$(CFG)" == "mod_tls - Win32 Release"
  
  "libhttpd - Win32 Release" : 
     cd "..\../..\httpd-2.0"
     $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
     cd ".\modules\tls"
  
  "libhttpd - Win32 ReleaseCLEAN" : 
     cd "..\../..\httpd-2.0"
     $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
   CFG="libhttpd - Win32 Release" RECURSE=1 
     cd ".\modules\tls"
  
  !ELSEIF  "$(CFG)" == "mod_tls - Win32 Debug"
  
  "libhttpd - Win32 Debug" : 
     cd "..\../..\httpd-2.0"
     $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
     cd ".\modules\tls"
  
  "libhttpd - Win32 DebugCLEAN" : 
     cd "..\../..\httpd-2.0"
     $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
   RECURSE=1 
     cd ".\modules\tls"
  
  !ENDIF 
  
  SOURCE=.\mod_tls.c
  DEP_CPP_MOD_T=\
  	"..\..\include\ap_config.h"\
  	"..\..\include\ap_mmn.h"\
  	"..\..\include\ap_release.h"\
  	"..\..\include\http_config.h"\
  	"..\..\include\http_connection.h"\
  	"..\..\include\http_log.h"\
  	"..\..\include\http_protocol.h"\
  	"..\..\include\httpd.h"\
  	"..\..\include\pcreposix.h"\
  	"..\..\include\util_cfgtree.h"\
  	"..\..\include\util_filter.h"\
  	"..\..\os\win32\os.h"\
  	"..\..\srclib\apr-util\include\apr_buckets.h"\
  	"..\..\srclib\apr-util\include\apr_hooks.h"\
  	"..\..\srclib\apr-util\include\apr_optional_hooks.h"\
  	"..\..\srclib\apr-util\include\apr_ring.h"\
  	"..\..\srclib\apr-util\include\apr_uri.h"\
  	"..\..\srclib\apr-util\include\apu.h"\
  	"..\..\srclib\apr\include\apr.h"\
  	"..\..\srclib\apr\include\apr_dso.h"\
  	"..\..\srclib\apr\include\apr_errno.h"\
  	"..\..\srclib\apr\include\apr_file_info.h"\
  	"..\..\srclib\apr\include\apr_file_io.h"\
  	"..\..\srclib\apr\include\apr_general.h"\
  	"..\..\srclib\apr\include\apr_lock.h"\
  	"..\..\srclib\apr\include\apr_mmap.h"\
  	"..\..\srclib\apr\include\apr_network_io.h"\
  	"..\..\srclib\apr\include\apr_pools.h"\
  	"..\..\srclib\apr\include\apr_portable.h"\
  	"..\..\srclib\apr\include\apr_strings.h"\
  	"..\..\srclib\apr\include\apr_tables.h"\
  	"..\..\srclib\apr\include\apr_thread_proc.h"\
  	"..\..\srclib\apr\include\apr_time.h"\
  	"..\..\srclib\apr\include\apr_user.h"\
  	"..\..\srclib\apr\include\apr_want.h"\
  	".\openssl_state_machine.h"\
  	
  NODEP_CPP_MOD_T=\
  	"..\..\include\ap_config_auto.h"\
  	
  
  "$(INTDIR)\mod_tls.obj" : $(SOURCE) $(DEP_CPP_MOD_T) "$(INTDIR)"
  
  
  SOURCE=.\openssl_state_machine.c
  DEP_CPP_OPENS=\
  	"..\..\srclib\apr\include\apr.h"\
  	"..\..\srclib\openssl\inc32\openssl\asn1.h"\
  	"..\..\srclib\openssl\inc32\openssl\bio.h"\
  	"..\..\srclib\openssl\inc32\openssl\blowfish.h"\
  	"..\..\srclib\openssl\inc32\openssl\bn.h"\
  	"..\..\srclib\openssl\inc32\openssl\buffer.h"\
  	"..\..\srclib\openssl\inc32\openssl\cast.h"\
  	"..\..\srclib\openssl\inc32\openssl\comp.h"\
  	"..\..\srclib\openssl\inc32\openssl\crypto.h"\
  	"..\..\srclib\openssl\inc32\openssl\des.h"\
  	"..\..\srclib\openssl\inc32\openssl\dh.h"\
  	"..\..\srclib\openssl\inc32\openssl\dsa.h"\
  	"..\..\srclib\openssl\inc32\openssl\e_os.h"\
  	"..\..\srclib\openssl\inc32\openssl\e_os2.h"\
  	"..\..\srclib\openssl\inc32\openssl\ebcdic.h"\
  	"..\..\srclib\openssl\inc32\openssl\err.h"\
  	"..\..\srclib\openssl\inc32\openssl\evp.h"\
  	"..\..\srclib\openssl\inc32\openssl\idea.h"\
  	"..\..\srclib\openssl\inc32\openssl\kssl.h"\
  	"..\..\srclib\openssl\inc32\openssl\lhash.h"\
  	"..\..\srclib\openssl\inc32\openssl\md2.h"\
  	"..\..\srclib\openssl\inc32\openssl\md4.h"\
  	"..\..\srclib\openssl\inc32\openssl\md5.h"\
  	"..\..\srclib\openssl\inc32\openssl\mdc2.h"\
  	"..\..\srclib\openssl\inc32\openssl\obj_mac.h"\
  	"..\..\srclib\openssl\inc32\openssl\objects.h"\
  	"..\..\srclib\openssl\inc32\openssl\opensslconf.h"\
  	"..\..\srclib\openssl\inc32\openssl\opensslv.h"\
  	"..\..\srclib\openssl\inc32\openssl\pem.h"\
  	"..\..\srclib\openssl\inc32\openssl\pem2.h"\
  	"..\..\srclib\openssl\inc32\openssl\pkcs7.h"\
  	"..\..\srclib\openssl\inc32\openssl\rc2.h"\
  	"..\..\srclib\openssl\inc32\openssl\rc4.h"\
  	"..\..\srclib\openssl\inc32\openssl\rc5.h"\
  	"..\..\srclib\openssl\inc32\openssl\rd_fst.h"\
  	"..\..\srclib\openssl\inc32\openssl\rijndael.h"\
  	"..\..\srclib\openssl\inc32\openssl\ripemd.h"\
  	"..\..\srclib\openssl\inc32\openssl\rsa.h"\
  	"..\..\srclib\openssl\inc32\openssl\safestack.h"\
  	"..\..\srclib\openssl\inc32\openssl\sha.h"\
  	"..\..\srclib\openssl\inc32\openssl\ssl.h"\
  	"..\..\srclib\openssl\inc32\openssl\ssl2.h"\
  	"..\..\srclib\openssl\inc32\openssl\ssl23.h"\
  	"..\..\srclib\openssl\inc32\openssl\ssl3.h"\
  	"..\..\srclib\openssl\inc32\openssl\stack.h"\
  	"..\..\srclib\openssl\inc32\openssl\symhacks.h"\
  	"..\..\srclib\openssl\inc32\openssl\tls1.h"\
  	"..\..\srclib\openssl\inc32\openssl\x509.h"\
  	"..\..\srclib\openssl\inc32\openssl\x509_vfy.h"\
  	".\openssl_state_machine.h"\
  	
  NODEP_CPP_OPENS=\
  	"..\..\srclib\openssl\inc32\openssl\MacSocket.h"\
  	
  
  "$(INTDIR)\openssl_state_machine.obj" : $(SOURCE) $(DEP_CPP_OPENS) "$(INTDIR)"
  
  
  
  !ENDIF 
  
  
  
  
  1.6       +16 -14    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gen_test_char.mak	2001/04/05 09:21:43	1.5
  +++ gen_test_char.mak	2001/06/28 00:30:57	1.6
  @@ -212,26 +212,27 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\server"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  - 
  +   cd "..\..\httpd-2.0\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 "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\server"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\..\server"
   
   !ENDIF 
  @@ -239,12 +240,12 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\server"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\server"
  @@ -252,12 +253,12 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\server"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\server"
  @@ -271,9 +272,10 @@
   	"..\include\ap_release.h"\
   	"..\include\httpd.h"\
   	"..\include\pcreposix.h"\
  -	"..\include\util_uri.h"\
   	"..\os\win32\os.h"\
   	"..\srclib\apr-util\include\apr_hooks.h"\
  +	"..\srclib\apr-util\include\apr_optional_hooks.h"\
  +	"..\srclib\apr-util\include\apr_uri.h"\
   	"..\srclib\apr-util\include\apu.h"\
   	"..\srclib\apr\include\apr.h"\
   	"..\srclib\apr\include\apr_errno.h"\
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pcre.mak	2001/04/05 09:21:45	1.2
  +++ pcre.mak	2001/06/28 00:31:01	1.3
  @@ -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.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pcreposix.mak	2001/04/05 09:21:46	1.2
  +++ pcreposix.mak	2001/06/28 00:31:01	1.3
  @@ -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.6       +14 -13    httpd-2.0/support/ab.mak
  
  Index: ab.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ab.mak	2001/04/05 09:21:46	1.5
  +++ ab.mak	2001/06/28 00:31:03	1.6
  @@ -210,26 +210,27 @@
   !IF  "$(CFG)" == "ab - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  - 
  +   cd "..\..\httpd-2.0\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 "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\..\support"
   
   !ENDIF 
  @@ -237,12 +238,12 @@
   !IF  "$(CFG)" == "ab - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -250,12 +251,12 @@
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  
  
  
  1.6       +14 -13    httpd-2.0/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- htdigest.mak	2001/04/05 09:21:46	1.5
  +++ htdigest.mak	2001/06/28 00:31:04	1.6
  @@ -214,26 +214,27 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  - 
  +   cd "..\..\httpd-2.0\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 "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\..\support"
   
   !ENDIF 
  @@ -241,12 +242,12 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -254,12 +255,12 @@
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  
  
  
  1.6       +14 -13    httpd-2.0/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- htpasswd.mak	2001/04/05 09:21:46	1.5
  +++ htpasswd.mak	2001/06/28 00:31:04	1.6
  @@ -214,26 +214,27 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  - 
  +   cd "..\..\httpd-2.0\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 "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
  +   cd "..\..\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\..\support"
   
   !ENDIF 
  @@ -241,12 +242,12 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -254,12 +255,12 @@
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "..\srclib\apr-util"
  +   cd "..\..\httpd-2.0\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  
  
  

Mime
View raw message