httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/support ab.mak htdigest.mak htpasswd.mak logresolve.mak
Date Sun, 25 Feb 2001 22:20:25 GMT
wrowe       01/02/25 14:20:25

  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
               .        apr.mak libapr.mak
               .        aprutil.mak libaprutil.mak
               srclib/expat-lite expat.mak libexpat.mak
               support  ab.mak htdigest.mak htpasswd.mak logresolve.mak
  Log:
    A patch to clean up much bogusity in Win32.  Eliminates absolute cd "/..."
    references using build/fixwin32mak.pl, and the latest #if APR_HAVE_FOO_H
    fixes apparently worked, now that they no longer appear as dependencies
    [which had broken the build entirely.]
  
  Revision  Changes    Path
  1.3       +0 -1      httpd-2.0/Apache.mak
  
  Index: Apache.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Apache.mak	2001/02/25 02:53:27	1.2
  +++ Apache.mak	2001/02/25 22:20:22	1.3
  @@ -358,7 +358,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MAIN_=\
   	".\include\ap_config_auto.h"\
  
  
  
  1.4       +0 -69     httpd-2.0/libhttpd.mak
  
  Index: libhttpd.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/libhttpd.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- libhttpd.mak	2001/02/25 20:56:35	1.3
  +++ libhttpd.mak	2001/02/25 22:20:22	1.4
  @@ -426,7 +426,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_BUILD=\
   	".\include\ap_config_auto.h"\
  @@ -460,7 +459,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MODUL=\
   	".\include\ap_config_auto.h"\
  @@ -553,8 +551,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_CONFI=\
   	".\include\ap_config_auto.h"\
  @@ -605,8 +601,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_CONNE=\
   	".\include\ap_config_auto.h"\
  @@ -647,7 +641,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_LOG_C=\
   	".\include\ap_config_auto.h"\
  @@ -695,8 +688,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_SCORE=\
   	".\include\ap_config_auto.h"\
  @@ -743,8 +734,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_VHOST=\
   	".\include\ap_config_auto.h"\
  @@ -804,8 +793,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_HTTP_=\
   	".\include\ap_config_auto.h"\
  @@ -861,8 +848,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_HTTP_P=\
   	".\include\ap_config_auto.h"\
  @@ -914,8 +899,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_HTTP_R=\
   	".\include\ap_config_auto.h"\
  @@ -959,7 +942,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_A=\
   	".\include\ap_config_auto.h"\
  @@ -1008,8 +990,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_AC=\
   	".\include\ap_config_auto.h"\
  @@ -1050,7 +1030,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_AL=\
   	".\include\ap_config_auto.h"\
  @@ -1098,8 +1077,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_AS=\
   	".\include\ap_config_auto.h"\
  @@ -1147,8 +1124,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_AU=\
   	".\include\ap_config_auto.h"\
  @@ -1199,8 +1174,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_AUT=\
   	".\include\ap_config_auto.h"\
  @@ -1252,8 +1225,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_C=\
   	".\include\ap_config_auto.h"\
  @@ -1302,8 +1273,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_D=\
   	".\include\ap_config_auto.h"\
  @@ -1343,7 +1312,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_E=\
   	".\include\ap_config_auto.h"\
  @@ -1393,8 +1361,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_I=\
   	".\include\ap_config_auto.h"\
  @@ -1450,8 +1416,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_IN=\
   	".\include\ap_config_auto.h"\
  @@ -1499,8 +1463,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_IS=\
   	".\include\ap_config_auto.h"\
  @@ -1546,8 +1508,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_L=\
   	".\include\ap_config_auto.h"\
  @@ -1590,7 +1550,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_M=\
   	".\include\ap_config_auto.h"\
  @@ -1639,8 +1598,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_N=\
   	".\include\ap_config_auto.h"\
  @@ -1685,8 +1642,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_S=\
   	".\include\ap_config_auto.h"\
  @@ -1724,7 +1679,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_SO=\
   	".\include\ap_config_auto.h"\
  @@ -1764,7 +1718,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_U=\
   	".\include\ap_config_auto.h"\
  @@ -1806,8 +1759,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_ERROR=\
   	".\include\ap_config_auto.h"\
  @@ -1848,7 +1799,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_RFC14=\
   	".\include\ap_config_auto.h"\
  @@ -1899,10 +1849,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_UTIL_=\
   	".\include\ap_config_auto.h"\
  @@ -1949,7 +1895,6 @@
   	".\srclib\apr\include\apr_tables.h"\
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_UTIL_D=\
   	".\include\ap_config_auto.h"\
  @@ -1987,7 +1932,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_UTIL_F=\
   	".\include\ap_config_auto.h"\
  @@ -2029,8 +1973,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_UTIL_M=\
   	".\include\ap_config_auto.h"\
  @@ -2084,8 +2026,6 @@
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
   	".\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_UTIL_S=\
   	".\include\ap_config_auto.h"\
  @@ -2121,7 +2061,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_UTIL_U=\
   	".\include\ap_config_auto.h"\
  @@ -2157,7 +2096,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_UTIL_W=\
   	".\include\ap_config_auto.h"\
  @@ -2203,8 +2141,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_UTIL_X=\
   	".\include\ap_config_auto.h"\
  @@ -2244,7 +2180,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_LISTE=\
   	".\include\ap_config_auto.h"\
  @@ -2296,8 +2231,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MPM_W=\
   	".\include\ap_config_auto.h"\
  @@ -2337,7 +2270,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_REGIS=\
   	".\include\ap_config_auto.h"\
  @@ -2378,7 +2310,6 @@
   	".\srclib\apr\include\apr_time.h"\
   	".\srclib\apr\include\apr_user.h"\
   	".\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_SERVI=\
   	".\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -10     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_anon.mak	2001/02/25 02:53:27	1.2
  +++ mod_auth_anon.mak	2001/02/25 22:20:22	1.3
  @@ -227,12 +227,12 @@
   !IF  "$(CFG)" == "mod_auth_anon - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\aaa"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -240,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -255,12 +255,12 @@
   !IF  "$(CFG)" == "mod_auth_anon - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\aaa"
  @@ -268,12 +268,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
  @@ -317,8 +317,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +12 -14    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_dbm.mak	2001/02/25 02:53:27	1.2
  +++ mod_auth_dbm.mak	2001/02/25 22:20:22	1.3
  @@ -233,12 +233,12 @@
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\aaa"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -246,12 +246,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\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 "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -275,12 +275,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -290,12 +290,12 @@
   !IF  "$(CFG)" == "mod_auth_dbm - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\aaa"
  @@ -303,12 +303,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
  @@ -353,8 +353,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +12 -14    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_digest.mak	2001/02/25 02:53:27	1.2
  +++ mod_auth_digest.mak	2001/02/25 22:20:22	1.3
  @@ -231,12 +231,12 @@
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\aaa"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -244,12 +244,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\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 "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -273,12 +273,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\aaa"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\aaa"
  @@ -288,12 +288,12 @@
   !IF  "$(CFG)" == "mod_auth_digest - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\aaa"
  @@ -301,12 +301,12 @@
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\aaa"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\aaa"
  @@ -357,8 +357,6 @@
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
   	"..\..\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_A=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -10     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_file_cache.mak	2001/02/25 02:53:28	1.2
  +++ mod_file_cache.mak	2001/02/25 22:20:22	1.3
  @@ -227,12 +227,12 @@
   !IF  "$(CFG)" == "mod_file_cache - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\cache"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\cache"
  @@ -240,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\cache"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\cache"
  @@ -255,12 +255,12 @@
   !IF  "$(CFG)" == "mod_file_cache - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\cache"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\cache"
  @@ -268,12 +268,12 @@
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\cache"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\cache"
  @@ -317,8 +317,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_F=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +16 -21    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_dav_fs.mak	2001/02/25 02:53:28	1.2
  +++ mod_dav_fs.mak	2001/02/25 22:20:23	1.3
  @@ -275,7 +275,6 @@
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	"..\main\mod_dav.h"\
   	".\repos.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_DBM_C=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -318,7 +317,6 @@
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	"..\main\mod_dav.h"\
   	".\repos.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_LOCK_=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -359,7 +357,6 @@
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	"..\main\mod_dav.h"\
   	".\repos.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_D=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -410,8 +407,6 @@
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	"..\main\mod_dav.h"\
   	".\repos.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_REPOS=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -423,12 +418,12 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\dav\fs"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -436,12 +431,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\dav\fs"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -451,13 +446,13 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libaprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\dav\fs"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -465,12 +460,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\dav\fs"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\dav\fs"
  @@ -480,12 +475,12 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\dav\fs"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\dav\fs"
  @@ -493,12 +488,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\dav\fs"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\dav\fs"
  @@ -508,12 +503,12 @@
   !IF  "$(CFG)" == "mod_dav_fs - Win32 Release"
   
   "mod_dav - Win32 Release" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  +   cd "..\../..\modules\dav\main"
      $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release" 
      cd "..\fs"
   
   "mod_dav - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  +   cd "..\../..\modules\dav\main"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Release"\
    RECURSE=1 
      cd "..\fs"
  @@ -521,12 +516,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
   "mod_dav - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  +   cd "..\../..\modules\dav\main"
      $(MAKE) /$(MAKEFLAGS) /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug" 
      cd "..\fs"
   
   "mod_dav - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\modules\dav\main"
  +   cd "..\../..\modules\dav\main"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\mod_dav.mak" CFG="mod_dav - Win32 Debug"\
    RECURSE=1 
      cd "..\fs"
  
  
  
  1.3       +12 -22    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_dav.mak	2001/02/25 02:53:28	1.2
  +++ mod_dav.mak	2001/02/25 22:20:23	1.3
  @@ -282,7 +282,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_LIVEP=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -338,8 +337,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_D=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -385,7 +382,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_PROPS=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -423,7 +419,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_PROVI=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -462,7 +457,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_STD_L=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -516,8 +510,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_UTIL_=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -568,8 +560,6 @@
   	"..\..\..\srclib\apr\include\apr_user.h"\
   	"..\..\..\srclib\apr\include\apr_want.h"\
   	".\mod_dav.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_UTIL_L=\
   	"..\..\..\include\ap_config_auto.h"\
  @@ -581,12 +571,12 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\dav\main"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -594,12 +584,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\dav\main"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\../..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -609,13 +599,13 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libaprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Release"\
    
      cd "..\..\modules\dav\main"
   
   "libaprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Release" RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -623,12 +613,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
   "libaprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\libaprutil.mak" CFG="libaprutil - Win32 Debug" 
      cd "..\..\modules\dav\main"
   
   "libaprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\../..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libaprutil.mak"\
    CFG="libaprutil - Win32 Debug" RECURSE=1 
      cd "..\..\modules\dav\main"
  @@ -638,12 +628,12 @@
   !IF  "$(CFG)" == "mod_dav - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\dav\main"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\dav\main"
  @@ -651,12 +641,12 @@
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\dav\main"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\../.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\dav\main"
  
  
  
  1.3       +8 -10     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_info.mak	2001/02/25 02:53:28	1.2
  +++ mod_info.mak	2001/02/25 22:20:23	1.3
  @@ -221,12 +221,12 @@
   !IF  "$(CFG)" == "mod_info - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\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 "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\generators"
  @@ -234,12 +234,12 @@
   !ELSEIF  "$(CFG)" == "mod_info - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\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 "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\generators"
  @@ -249,12 +249,12 @@
   !IF  "$(CFG)" == "mod_info - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\generators"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\generators"
  @@ -262,12 +262,12 @@
   !ELSEIF  "$(CFG)" == "mod_info - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\generators"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\generators"
  @@ -312,8 +312,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_I=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -10     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_status.mak	2001/02/25 02:53:28	1.2
  +++ mod_status.mak	2001/02/25 22:20:23	1.3
  @@ -225,12 +225,12 @@
   !IF  "$(CFG)" == "mod_status - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\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 "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\generators"
  @@ -238,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\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 "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\generators"
  @@ -253,12 +253,12 @@
   !IF  "$(CFG)" == "mod_status - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\generators"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\generators"
  @@ -266,12 +266,12 @@
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\generators"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\generators"
  @@ -316,8 +316,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_S=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -10     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_rewrite.mak	2001/02/25 02:53:29	1.2
  +++ mod_rewrite.mak	2001/02/25 22:20:23	1.3
  @@ -227,12 +227,12 @@
   !IF  "$(CFG)" == "mod_rewrite - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\mappers"
  @@ -240,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\mappers"
  @@ -255,12 +255,12 @@
   !IF  "$(CFG)" == "mod_rewrite - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\mappers"
  @@ -268,12 +268,12 @@
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\mappers"
  @@ -321,8 +321,6 @@
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
   	".\mod_rewrite.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   NODEP_CPP_MOD_R=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -9      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_speling.mak	2001/02/25 02:53:29	1.2
  +++ mod_speling.mak	2001/02/25 22:20:23	1.3
  @@ -225,12 +225,12 @@
   !IF  "$(CFG)" == "mod_speling - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\mappers"
  @@ -238,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\mappers"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\mappers"
  @@ -253,12 +253,12 @@
   !IF  "$(CFG)" == "mod_speling - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\mappers"
  @@ -266,12 +266,12 @@
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\mappers"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\mappers"
  @@ -312,7 +312,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_S=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -9      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_cern_meta.mak	2001/02/25 02:53:29	1.2
  +++ mod_cern_meta.mak	2001/02/25 22:20:24	1.3
  @@ -227,12 +227,12 @@
   !IF  "$(CFG)" == "mod_cern_meta - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -240,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -255,12 +255,12 @@
   !IF  "$(CFG)" == "mod_cern_meta - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
  @@ -268,12 +268,12 @@
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
  @@ -314,7 +314,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_C=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -9      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_expires.mak	2001/02/25 02:53:29	1.2
  +++ mod_expires.mak	2001/02/25 22:20:24	1.3
  @@ -225,12 +225,12 @@
   !IF  "$(CFG)" == "mod_expires - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -238,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -253,12 +253,12 @@
   !IF  "$(CFG)" == "mod_expires - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
  @@ -266,12 +266,12 @@
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
  @@ -311,7 +311,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_E=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -9      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_headers.mak	2001/02/25 02:53:29	1.2
  +++ mod_headers.mak	2001/02/25 22:20:24	1.3
  @@ -225,12 +225,12 @@
   !IF  "$(CFG)" == "mod_headers - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -238,12 +238,12 @@
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -253,12 +253,12 @@
   !IF  "$(CFG)" == "mod_headers - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
  @@ -266,12 +266,12 @@
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
  @@ -308,7 +308,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_H=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -9      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_usertrack.mak	2001/02/25 02:53:29	1.2
  +++ mod_usertrack.mak	2001/02/25 22:20:24	1.3
  @@ -227,12 +227,12 @@
   !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -240,12 +240,12 @@
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\..\modules\metadata"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\..\modules\metadata"
  @@ -255,12 +255,12 @@
   !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
   
   "libhttpd - Win32 Release" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Release" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak"\
    CFG="libhttpd - Win32 Release" RECURSE=1 
      cd ".\modules\metadata"
  @@ -268,12 +268,12 @@
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
   "libhttpd - Win32 Debug" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug" 
      cd ".\modules\metadata"
   
   "libhttpd - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0"
  +   cd "..\.."
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libhttpd.mak" CFG="libhttpd - Win32 Debug"\
    RECURSE=1 
      cd ".\modules\metadata"
  @@ -312,7 +312,6 @@
   	"..\..\srclib\apr\include\apr_time.h"\
   	"..\..\srclib\apr\include\apr_user.h"\
   	"..\..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_MOD_U=\
   	"..\..\include\ap_config_auto.h"\
  
  
  
  1.3       +8 -9      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gen_test_char.mak	2001/02/25 02:53:29	1.2
  +++ gen_test_char.mak	2001/02/25 22:20:24	1.3
  @@ -212,12 +212,12 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\server"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
    RECURSE=1 
      cd "..\..\server"
  @@ -225,12 +225,12 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\server"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
    
      cd "..\..\server"
  @@ -240,12 +240,12 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\server"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\server"
  @@ -253,12 +253,12 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\server"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\server"
  @@ -288,7 +288,6 @@
   	"..\srclib\apr\include\apr_time.h"\
   	"..\srclib\apr\include\apr_user.h"\
   	"..\srclib\apr\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   NODEP_CPP_GEN_T=\
   	"..\include\ap_config_auto.h"\
  
  
  
  1.6       +0 -62     apr/apr.mak
  
  Index: apr.mak
  ===================================================================
  RCS file: /home/cvs/apr/apr.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr.mak	2001/02/25 02:53:29	1.5
  +++ apr.mak	2001/02/25 22:20:24	1.6
  @@ -416,8 +416,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"
  @@ -441,8 +439,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
  @@ -493,8 +489,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
  @@ -613,9 +607,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\errorcodes.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)"\
  @@ -639,7 +630,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
  @@ -674,7 +664,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)" ".\include\apr.h"
  @@ -695,7 +684,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  @@ -734,7 +722,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\locks.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  @@ -780,8 +767,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"
  @@ -809,8 +794,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
  @@ -839,8 +822,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
  @@ -870,8 +851,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
  @@ -899,8 +878,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\flock.obj" : $(SOURCE) $(DEP_CPP_FLOCK) "$(INTDIR)"\
  @@ -918,7 +895,6 @@
   	".\include\apr_time.h"\
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\fullrw.obj" : $(SOURCE) $(DEP_CPP_FULLR) "$(INTDIR)"\
  @@ -950,8 +926,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"
  @@ -979,8 +953,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"
  @@ -1010,8 +982,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  @@ -1039,8 +1009,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"
  @@ -1065,8 +1033,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\locks.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
  @@ -1088,8 +1054,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\inet_ntop.obj" : $(SOURCE) $(DEP_CPP_INET_) "$(INTDIR)"\
  @@ -1111,7 +1075,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)" ".\include\apr.h"
  @@ -1142,8 +1105,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"\
  @@ -1167,7 +1128,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
   	".\network_io\unix\sa_common.c"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"\
  @@ -1193,8 +1153,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"\
  @@ -1216,7 +1174,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"\
  @@ -1249,8 +1206,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"
  @@ -1278,8 +1233,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  @@ -1306,8 +1259,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  @@ -1334,8 +1285,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  @@ -1366,8 +1315,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\dso.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"
  @@ -1394,8 +1341,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
  @@ -1444,7 +1389,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\common.obj" : $(SOURCE) $(DEP_CPP_COMMO) "$(INTDIR)"\
  @@ -1476,8 +1420,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\mmap.obj" : $(SOURCE) $(DEP_CPP_MMAP_) "$(INTDIR)" ".\include\apr.h"
  @@ -1501,8 +1443,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\groupinfo.obj" : $(SOURCE) $(DEP_CPP_GROUP) "$(INTDIR)"\
  @@ -1527,8 +1467,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\userinfo.obj" : $(SOURCE) $(DEP_CPP_USERI) "$(INTDIR)"\
  
  
  
  1.5       +0 -62     apr/libapr.mak
  
  Index: libapr.mak
  ===================================================================
  RCS file: /home/cvs/apr/libapr.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- libapr.mak	2001/02/25 02:53:29	1.4
  +++ libapr.mak	2001/02/25 22:20:24	1.5
  @@ -433,8 +433,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"
  @@ -458,8 +456,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
  @@ -510,8 +506,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\apr_snprintf.obj" : $(SOURCE) $(DEP_CPP_APR_S) "$(INTDIR)"\
  @@ -630,9 +624,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\errorcodes.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)"\
  @@ -656,7 +647,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\getopt.obj" : $(SOURCE) $(DEP_CPP_GETOP) "$(INTDIR)"\
  @@ -691,7 +681,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\misc.obj" : $(SOURCE) $(DEP_CPP_MISC_) "$(INTDIR)" ".\include\apr.h"
  @@ -712,7 +701,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  @@ -751,7 +739,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\locks.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  @@ -797,8 +784,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"
  @@ -826,8 +811,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
  @@ -856,8 +839,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
  @@ -887,8 +868,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
  @@ -916,8 +895,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\flock.obj" : $(SOURCE) $(DEP_CPP_FLOCK) "$(INTDIR)"\
  @@ -935,7 +912,6 @@
   	".\include\apr_time.h"\
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\fullrw.obj" : $(SOURCE) $(DEP_CPP_FULLR) "$(INTDIR)"\
  @@ -967,8 +943,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\open.obj" : $(SOURCE) $(DEP_CPP_OPEN_) "$(INTDIR)" ".\include\apr.h"
  @@ -996,8 +970,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"
  @@ -1027,8 +999,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\atime.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  @@ -1056,8 +1026,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"
  @@ -1082,8 +1050,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\locks.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\locks.obj" : $(SOURCE) $(DEP_CPP_LOCKS) "$(INTDIR)"\
  @@ -1105,8 +1071,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\inet_ntop.obj" : $(SOURCE) $(DEP_CPP_INET_) "$(INTDIR)"\
  @@ -1128,7 +1092,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\poll.obj" : $(SOURCE) $(DEP_CPP_POLL_) "$(INTDIR)" ".\include\apr.h"
  @@ -1159,8 +1122,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\sendrecv.obj" : $(SOURCE) $(DEP_CPP_SENDR) "$(INTDIR)"\
  @@ -1184,7 +1145,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
   	".\network_io\unix\sa_common.c"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sockaddr.obj" : $(SOURCE) $(DEP_CPP_SOCKA) "$(INTDIR)"\
  @@ -1210,8 +1170,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\sockets.obj" : $(SOURCE) $(DEP_CPP_SOCKE) "$(INTDIR)"\
  @@ -1233,7 +1191,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\networkio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sockopt.obj" : $(SOURCE) $(DEP_CPP_SOCKO) "$(INTDIR)"\
  @@ -1266,8 +1223,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\proc.obj" : $(SOURCE) $(DEP_CPP_PROC_) "$(INTDIR)" ".\include\apr.h"
  @@ -1295,8 +1250,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  @@ -1323,8 +1276,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  @@ -1351,8 +1302,6 @@
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\threadproc.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  @@ -1383,8 +1332,6 @@
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\dso.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"
  @@ -1411,8 +1358,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
  @@ -1461,7 +1406,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\common.obj" : $(SOURCE) $(DEP_CPP_COMMO) "$(INTDIR)"\
  @@ -1493,8 +1437,6 @@
   	".\include\arch\unix\misc.h"\
   	".\include\arch\win32\apr_private.h"\
   	".\include\arch\win32\fileio.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\mmap.obj" : $(SOURCE) $(DEP_CPP_MMAP_) "$(INTDIR)" ".\include\apr.h"
  @@ -1518,8 +1460,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\groupinfo.obj" : $(SOURCE) $(DEP_CPP_GROUP) "$(INTDIR)"\
  @@ -1544,8 +1484,6 @@
   	".\include\apr_user.h"\
   	".\include\apr_want.h"\
   	".\include\arch\win32\apr_private.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
   	
   
   "$(INTDIR)\userinfo.obj" : $(SOURCE) $(DEP_CPP_USERI) "$(INTDIR)"\
  
  
  
  1.5       +8 -26     apr-util/aprutil.mak
  
  Index: aprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- aprutil.mak	2001/02/25 21:02:25	1.4
  +++ aprutil.mak	2001/02/25 22:20:24	1.5
  @@ -300,7 +300,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_brigade.obj" : $(SOURCE) $(DEP_CPP_APR_B) "$(INTDIR)"\
  @@ -326,7 +325,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets.obj" : $(SOURCE) $(DEP_CPP_APR_BU) "$(INTDIR)"\
  @@ -350,7 +348,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) $(DEP_CPP_APR_BUC) "$(INTDIR)"\
  @@ -375,7 +372,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) $(DEP_CPP_APR_BUCK) "$(INTDIR)"\
  @@ -399,7 +395,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKE) "$(INTDIR)"\
  @@ -423,7 +418,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKET) "$(INTDIR)"\
  @@ -447,7 +441,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS) "$(INTDIR)"\
  @@ -472,7 +465,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_)\
  @@ -496,7 +488,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_P)\
  @@ -520,7 +511,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_R)\
  @@ -544,7 +534,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_S)\
  @@ -569,7 +558,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_SO)\
  @@ -611,7 +599,6 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)"
  @@ -629,7 +616,6 @@
   	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)"
  @@ -648,7 +634,6 @@
   	"..\apr\include\apr_want.h"\
   	".\dbm\sdbm\sdbm_private.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"
  @@ -669,7 +654,6 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"
  @@ -691,7 +675,6 @@
   	".\include\apr_sdbm.h"\
   	".\include\apu.h"\
   	".\include\private\apu_select_dbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_dbm.obj" : $(SOURCE) $(DEP_CPP_APR_D) "$(INTDIR)"\
  @@ -744,7 +727,6 @@
   	"..\expat-lite\xmlparse.h"\
   	".\include\apr_xml.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
  @@ -801,12 +783,12 @@
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
   "expat - Win32 Release" : 
  -   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Release" 
      cd "..\apr-util"
   
   "expat - Win32 ReleaseCLEAN" : 
  -   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -814,12 +796,12 @@
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
   "expat - Win32 Debug" : 
  -   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Debug" 
      cd "..\apr-util"
   
   "expat - Win32 DebugCLEAN" : 
  -   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Debug"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -829,12 +811,12 @@
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\spiffy\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\apr-util"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\spiffy\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -842,12 +824,12 @@
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\spiffy\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\apr-util"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\spiffy\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
    
      cd "..\apr-util"
  
  
  
  1.4       +8 -26     apr-util/libaprutil.mak
  
  Index: libaprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- libaprutil.mak	2001/02/25 02:53:30	1.3
  +++ libaprutil.mak	2001/02/25 22:20:25	1.4
  @@ -322,7 +322,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_brigade.obj" : $(SOURCE) $(DEP_CPP_APR_B) "$(INTDIR)"\
  @@ -348,7 +347,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets.obj" : $(SOURCE) $(DEP_CPP_APR_BU) "$(INTDIR)"\
  @@ -372,7 +370,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) $(DEP_CPP_APR_BUC) "$(INTDIR)"\
  @@ -397,7 +394,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) $(DEP_CPP_APR_BUCK) "$(INTDIR)"\
  @@ -421,7 +417,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKE) "$(INTDIR)"\
  @@ -445,7 +440,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKET) "$(INTDIR)"\
  @@ -469,7 +463,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS) "$(INTDIR)"\
  @@ -494,7 +487,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_)\
  @@ -518,7 +510,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_P)\
  @@ -542,7 +533,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_R)\
  @@ -566,7 +556,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_S)\
  @@ -591,7 +580,6 @@
   	".\include\apr_buckets.h"\
   	".\include\apr_ring.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) $(DEP_CPP_APR_BUCKETS_SO)\
  @@ -633,7 +621,6 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)"
  @@ -651,7 +638,6 @@
   	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)"
  @@ -670,7 +656,6 @@
   	"..\apr\include\apr_want.h"\
   	".\dbm\sdbm\sdbm_private.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"
  @@ -691,7 +676,6 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"
  @@ -713,7 +697,6 @@
   	".\include\apr_sdbm.h"\
   	".\include\apu.h"\
   	".\include\private\apu_select_dbm.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_dbm.obj" : $(SOURCE) $(DEP_CPP_APR_D) "$(INTDIR)"\
  @@ -766,7 +749,6 @@
   	"..\expat-lite\xmlparse.h"\
   	".\include\apr_xml.h"\
   	".\include\apu.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
  @@ -823,12 +805,12 @@
   !IF  "$(CFG)" == "libaprutil - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\apr-util"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -836,12 +818,12 @@
   !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\apr-util"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -851,12 +833,12 @@
   !IF  "$(CFG)" == "libaprutil - Win32 Release"
   
   "libexpat - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release" 
      cd "..\apr-util"
   
   "libexpat - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\
    CFG="libexpat - Win32 Release" RECURSE=1 
      cd "..\apr-util"
  @@ -864,12 +846,12 @@
   !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
   
   "libexpat - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug" 
      cd "..\apr-util"
   
   "libexpat - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  +   cd "..\..\srclib\expat-lite"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\
    RECURSE=1 
      cd "..\apr-util"
  
  
  
  1.2       +4 -40     httpd-2.0/srclib/expat-lite/expat.mak
  
  Index: expat.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/expat.mak,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- expat.mak	2001/02/25 20:51:20	1.1
  +++ expat.mak	2001/02/25 22:20:25	1.2
  @@ -209,18 +209,9 @@
   DEP_CPP_HASHT=\
   	".\hashtable.h"\
   	".\xmldef.h"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_HASHT=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  @@ -234,18 +225,9 @@
   	".\xmlparse.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_XMLPA=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  @@ -257,18 +239,9 @@
   	".\xmldef.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_XMLRO=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  @@ -287,18 +260,9 @@
   	".\xmltok_impl.c"\
   	".\xmltok_impl.h"\
   	".\xmltok_ns.c"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_XMLTO=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  
  
  
  1.4       +4 -40     httpd-2.0/srclib/expat-lite/libexpat.mak
  
  Index: libexpat.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/libexpat.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- libexpat.mak	2001/02/25 20:50:22	1.3
  +++ libexpat.mak	2001/02/25 22:20:25	1.4
  @@ -230,18 +230,9 @@
   DEP_CPP_HASHT=\
   	".\hashtable.h"\
   	".\xmldef.h"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_HASHT=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  @@ -255,18 +246,9 @@
   	".\xmlparse.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_XMLPA=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  @@ -278,18 +260,9 @@
   	".\xmldef.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_XMLRO=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  @@ -308,18 +281,9 @@
   	".\xmltok_impl.c"\
   	".\xmltok_impl.h"\
   	".\xmltok_ns.c"\
  -	{$(INCLUDE)}"ap_config.h"\
  -	{$(INCLUDE)}"ap_ctype.h"\
  -	{$(INCLUDE)}"ap_mmn.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"dirent.h"\
  -	{$(INCLUDE)}"hsregex.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"os.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   NODEP_CPP_XMLTO=\
  -	"..\..\..\..\apache\include\ap_config_auto.h"\
  +	".\ap_config.h"\
   	".\nspr.h"\
   	
   
  
  
  
  1.3       +8 -9      httpd-2.0/support/ab.mak
  
  Index: ab.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ab.mak	2001/02/25 02:53:30	1.2
  +++ ab.mak	2001/02/25 22:20:25	1.3
  @@ -210,12 +210,12 @@
   !IF  "$(CFG)" == "ab - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -223,12 +223,12 @@
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
    
      cd "..\..\support"
  @@ -238,12 +238,12 @@
   !IF  "$(CFG)" == "ab - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -251,12 +251,12 @@
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  @@ -281,7 +281,6 @@
   	"..\srclib\apr\include\apr_user.h"\
   	"..\srclib\apr\include\apr_want.h"\
   	"..\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\ab.obj" : $(SOURCE) $(DEP_CPP_AB_C0) "$(INTDIR)"
  
  
  
  1.3       +8 -9      httpd-2.0/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htdigest.mak	2001/02/25 02:53:30	1.2
  +++ htdigest.mak	2001/02/25 22:20:25	1.3
  @@ -214,12 +214,12 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -227,12 +227,12 @@
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
    
      cd "..\..\support"
  @@ -242,12 +242,12 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -255,12 +255,12 @@
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  @@ -282,7 +282,6 @@
   	"..\srclib\apr\include\apr_user.h"\
   	"..\srclib\apr\include\apr_want.h"\
   	"..\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\htdigest.obj" : $(SOURCE) $(DEP_CPP_HTDIG) "$(INTDIR)"
  
  
  
  1.3       +8 -9      httpd-2.0/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- htpasswd.mak	2001/02/25 02:53:30	1.2
  +++ htpasswd.mak	2001/02/25 22:20:25	1.3
  @@ -214,12 +214,12 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   "apr - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\..\support"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -227,12 +227,12 @@
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\..\support"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr"
  +   cd "..\srclib\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
    
      cd "..\..\support"
  @@ -242,12 +242,12 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   "aprutil - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Release" 
      cd "..\..\support"
   
   "aprutil - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Release"\
    RECURSE=1 
      cd "..\..\support"
  @@ -255,12 +255,12 @@
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   "aprutil - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) /F ".\aprutil.mak" CFG="aprutil - Win32 Debug" 
      cd "..\..\support"
   
   "aprutil - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\apr-util"
  +   cd "..\srclib\apr-util"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\aprutil.mak" CFG="aprutil - Win32 Debug"\
    RECURSE=1 
      cd "..\..\support"
  @@ -285,7 +285,6 @@
   	"..\srclib\apr\include\apr_user.h"\
   	"..\srclib\apr\include\apr_want.h"\
   	"..\srclib\apr\include\apr_xlate.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
   	
   
   "$(INTDIR)\htpasswd.obj" : $(SOURCE) $(DEP_CPP_HTPAS) "$(INTDIR)"
  
  
  
  1.3       +0 -3      httpd-2.0/support/logresolve.mak
  
  Index: logresolve.mak
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/logresolve.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- logresolve.mak	2001/02/25 02:53:30	1.2
  +++ logresolve.mak	2001/02/25 22:20:25	1.3
  @@ -204,9 +204,6 @@
   	"..\srclib\apr\include\apr.h"\
   	"..\srclib\apr\include\apr_errno.h"\
   	"..\srclib\apr\include\apr_lib.h"\
  -	{$(INCLUDE)}"arpa\inet.h"\
  -	{$(INCLUDE)}"netdb.h"\
  -	{$(INCLUDE)}"sys\socket.h"\
   	
   
   "$(INTDIR)\logresolve.obj" : $(SOURCE) $(DEP_CPP_LOGRE) "$(INTDIR)"
  
  
  

Mime
View raw message