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.]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88336 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.mak b/Apache.mak
index fd8bfe2563f31b16d45dcf5102b9d929294e24e8..ede1d704402734697e8bd09a48bfb8349ce918c1 100644 (file)
--- a/Apache.mak
+++ b/Apache.mak
@@ -358,7 +358,6 @@ DEP_CPP_MAIN_=\
        ".\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"\

diff --git a/libhttpd.mak b/libhttpd.mak
index 672d70979dcb3fbf25eb1260ace80c9493a342ce..23042708fce907069816c9408316e2d79ccecaf5 100644 (file)
--- a/libhttpd.mak
+++ b/libhttpd.mak
@@ -426,7 +426,6 @@ DEP_CPP_BUILD=\
        ".\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 @@ DEP_CPP_MODUL=\
        ".\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 @@ DEP_CPP_CONFI=\
        ".\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 @@ DEP_CPP_CONNE=\
        ".\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 @@ DEP_CPP_LOG_C=\
        ".\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 @@ DEP_CPP_SCORE=\
        ".\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 @@ DEP_CPP_VHOST=\
        ".\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 @@ DEP_CPP_HTTP_=\
        ".\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 @@ DEP_CPP_HTTP_P=\
        ".\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 @@ DEP_CPP_HTTP_R=\
        ".\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 @@ DEP_CPP_MOD_A=\
        ".\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 @@ DEP_CPP_MOD_AC=\
        ".\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 @@ DEP_CPP_MOD_AL=\
        ".\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 @@ DEP_CPP_MOD_AS=\
        ".\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 @@ DEP_CPP_MOD_AU=\
        ".\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 @@ DEP_CPP_MOD_AUT=\
        ".\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 @@ DEP_CPP_MOD_C=\
        ".\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 @@ DEP_CPP_MOD_D=\
        ".\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 @@ DEP_CPP_MOD_E=\
        ".\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 @@ DEP_CPP_MOD_I=\
        ".\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 @@ DEP_CPP_MOD_IN=\
        ".\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 @@ DEP_CPP_MOD_IS=\
        ".\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 @@ DEP_CPP_MOD_L=\
        ".\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 @@ DEP_CPP_MOD_M=\
        ".\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 @@ DEP_CPP_MOD_N=\
        ".\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 @@ DEP_CPP_MOD_S=\
        ".\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 @@ DEP_CPP_MOD_SO=\
        ".\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 @@ DEP_CPP_MOD_U=\
        ".\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 @@ DEP_CPP_ERROR=\
        ".\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 @@ DEP_CPP_RFC14=\
        ".\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 @@ DEP_CPP_UTIL_=\
        ".\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 @@ DEP_CPP_UTIL_D=\
        ".\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 @@ DEP_CPP_UTIL_F=\
        ".\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 @@ DEP_CPP_UTIL_M=\
        ".\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 @@ DEP_CPP_UTIL_S=\
        ".\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 @@ DEP_CPP_UTIL_U=\
        ".\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 @@ DEP_CPP_UTIL_W=\
        ".\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 @@ DEP_CPP_UTIL_X=\
        ".\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 @@ DEP_CPP_LISTE=\
        ".\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 @@ DEP_CPP_MPM_W=\
        ".\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 @@ DEP_CPP_REGIS=\
        ".\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 @@ DEP_CPP_SERVI=\
        ".\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"\

diff --git a/modules/aaa/mod_auth_anon.mak b/modules/aaa/mod_auth_anon.mak
index a916d81c8a83f238ceecac3a210c6abe4b23ab41..d020de0dc33fc6b7a43736518b5eb39c00fbba65 100644 (file)
--- a/modules/aaa/mod_auth_anon.mak
+++ b/modules/aaa/mod_auth_anon.mak
@@ -227,12 +227,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_A=\
        "..\..\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"\

diff --git a/modules/aaa/mod_auth_dbm.mak b/modules/aaa/mod_auth_dbm.mak
index 0c757c7e8d7d3de6e84582d4bea166bbc233b280..948eb2211327469f8eab55632e7406bca22b3dde 100644 (file)
--- a/modules/aaa/mod_auth_dbm.mak
+++ b/modules/aaa/mod_auth_dbm.mak
@@ -233,12 +233,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_A=\
        "..\..\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"\

diff --git a/modules/aaa/mod_auth_digest.mak b/modules/aaa/mod_auth_digest.mak
index 34f3fc85caac7bafdfdfa1cdd430675d38e31f4d..c0a089e2e002e3ce8f28493618d2e122242d4e80 100644 (file)
--- a/modules/aaa/mod_auth_digest.mak
+++ b/modules/aaa/mod_auth_digest.mak
@@ -231,12 +231,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_A=\
        "..\..\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"\

diff --git a/modules/cache/mod_file_cache.mak b/modules/cache/mod_file_cache.mak
index 18367e3d519808867402e5f13280f7d38aaede2d..54e896658dd670c6e2adcbc55af21a8fb930c869 100644 (file)
--- a/modules/cache/mod_file_cache.mak
+++ b/modules/cache/mod_file_cache.mak
@@ -227,12 +227,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_F=\
        "..\..\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"\

diff --git a/modules/dav/fs/mod_dav_fs.mak b/modules/dav/fs/mod_dav_fs.mak
index 46e4ecabafb6ea03d3a17412e1abd973974904e3..d07443a3cbdcc65f391b4acec240d7aab7aa8155 100644 (file)
--- a/modules/dav/fs/mod_dav_fs.mak
+++ b/modules/dav/fs/mod_dav_fs.mak
@@ -275,7 +275,6 @@ DEP_CPP_DBM_C=\
        "..\..\..\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 @@ DEP_CPP_LOCK_=\
        "..\..\..\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 @@ DEP_CPP_MOD_D=\
        "..\..\..\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 @@ DEP_CPP_REPOS=\
        "..\..\..\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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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 @@ NODEP_CPP_REPOS=\
 !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"

diff --git a/modules/dav/main/mod_dav.mak b/modules/dav/main/mod_dav.mak
index c13d4e22385f0b72eaba9a426382196c6e4c0382..12703eb0292187372d8810de8e6346453509a9b0 100644 (file)
--- a/modules/dav/main/mod_dav.mak
+++ b/modules/dav/main/mod_dav.mak
@@ -282,7 +282,6 @@ DEP_CPP_LIVEP=\
        "..\..\..\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 @@ DEP_CPP_MOD_D=\
        "..\..\..\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 @@ DEP_CPP_PROPS=\
        "..\..\..\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 @@ DEP_CPP_PROVI=\
        "..\..\..\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 @@ DEP_CPP_STD_L=\
        "..\..\..\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 @@ DEP_CPP_UTIL_=\
        "..\..\..\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 @@ DEP_CPP_UTIL_L=\
        "..\..\..\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 @@ NODEP_CPP_UTIL_L=\
 !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 @@ NODEP_CPP_UTIL_L=\
 !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 @@ NODEP_CPP_UTIL_L=\
 !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 @@ NODEP_CPP_UTIL_L=\
 !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 @@ NODEP_CPP_UTIL_L=\
 !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 @@ NODEP_CPP_UTIL_L=\
 !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"

diff --git a/modules/generators/mod_info.mak b/modules/generators/mod_info.mak
index ec154f860381d1fb2d3583d9303b70d743571b4e..1589315cbd8860e0e725e9fd18539b9d3deea215 100644 (file)
--- a/modules/generators/mod_info.mak
+++ b/modules/generators/mod_info.mak
@@ -221,12 +221,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_I=\
        "..\..\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"\

diff --git a/modules/generators/mod_status.mak b/modules/generators/mod_status.mak
index af298b061e733d8157d6b049a1636b5f488d72cd..ec42ee711feefb0d49b51b30dcb9c02e98784f2b 100644 (file)
--- a/modules/generators/mod_status.mak
+++ b/modules/generators/mod_status.mak
@@ -225,12 +225,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_S=\
        "..\..\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"\

diff --git a/modules/mappers/mod_rewrite.mak b/modules/mappers/mod_rewrite.mak
index a34febf22bffbae98a76f523e9b1d5bbd5cb1bea..dac57cc987d1c3395c7261bc35eb3c19886e52a5 100644 (file)
--- a/modules/mappers/mod_rewrite.mak
+++ b/modules/mappers/mod_rewrite.mak
@@ -227,12 +227,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_R=\
        "..\..\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"\

diff --git a/modules/mappers/mod_speling.mak b/modules/mappers/mod_speling.mak
index c43aabaaa449eb9f6537b7414efbb0fbdfa99cc5..be08f084cdeff07086cef3a6221e3e7f08ea504c 100644 (file)
--- a/modules/mappers/mod_speling.mak
+++ b/modules/mappers/mod_speling.mak
@@ -225,12 +225,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_S=\
        "..\..\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"\

diff --git a/modules/metadata/mod_cern_meta.mak b/modules/metadata/mod_cern_meta.mak
index 7c311e246941d8dfe287e04a1b68ebe10b059259..2e3ab9ac7f597d41c394a04b5f0c9f769b7d9573 100644 (file)
--- a/modules/metadata/mod_cern_meta.mak
+++ b/modules/metadata/mod_cern_meta.mak
@@ -227,12 +227,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_C=\
        "..\..\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"\

diff --git a/modules/metadata/mod_expires.mak b/modules/metadata/mod_expires.mak
index 9520ff091133a8c29bbaf2ef8b81c30a68c87397..31b75065704d07f259bb25ec068f7845b2431756 100644 (file)
--- a/modules/metadata/mod_expires.mak
+++ b/modules/metadata/mod_expires.mak
@@ -225,12 +225,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_E=\
        "..\..\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"\

diff --git a/modules/metadata/mod_headers.mak b/modules/metadata/mod_headers.mak
index 0b96e80fa28b06bcec241c7285b75849705e6fd1..503cdce67362b61113dbbea8ae97a04d9e91f16f 100644 (file)
--- a/modules/metadata/mod_headers.mak
+++ b/modules/metadata/mod_headers.mak
@@ -225,12 +225,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_H=\
        "..\..\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"\

diff --git a/modules/metadata/mod_usertrack.mak b/modules/metadata/mod_usertrack.mak
index 40663be7bef6ed83281a8068e5f73898da96c66e..5fdcec3ca54dad6b686a18a4e9a99b881f815b3f 100644 (file)
--- a/modules/metadata/mod_usertrack.mak
+++ b/modules/metadata/mod_usertrack.mak
@@ -227,12 +227,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_MOD_U=\
        "..\..\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"\

diff --git a/server/gen_test_char.mak b/server/gen_test_char.mak
index 9fd6e7d27b8ee9415d8468112ec6dd1e84001acb..4c3cb3242844e918c7eacb962de715936d7bd884 100644 (file)
--- a/server/gen_test_char.mak
+++ b/server/gen_test_char.mak
@@ -212,12 +212,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_GEN_T=\
        "..\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"\

diff --git a/srclib/expat-lite/expat.mak b/srclib/expat-lite/expat.mak
index 1b7ede00e1ee2d9658e2a526525fcf2ab45827c7..e06e1efccf02b41c984d327dc7d49d0ca239b3d2 100644 (file)
--- a/srclib/expat-lite/expat.mak
+++ b/srclib/expat-lite/expat.mak
@@ -209,18 +209,9 @@ SOURCE=".\hashtable.c"
 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 @@ DEP_CPP_XMLPA=\
        ".\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 @@ DEP_CPP_XMLRO=\
        ".\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 @@ DEP_CPP_XMLTO=\
        ".\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"\
        
 

diff --git a/srclib/expat-lite/libexpat.mak b/srclib/expat-lite/libexpat.mak
index 4dc25253cc16c8ba31ca0c0857692e1155445a2a..5fbecfa6910dcd84b9808346008b3687fe845c14 100644 (file)
--- a/srclib/expat-lite/libexpat.mak
+++ b/srclib/expat-lite/libexpat.mak
@@ -230,18 +230,9 @@ SOURCE=".\hashtable.c"
 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 @@ DEP_CPP_XMLPA=\
        ".\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 @@ DEP_CPP_XMLRO=\
        ".\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 @@ DEP_CPP_XMLTO=\
        ".\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"\
        
 

diff --git a/support/ab.mak b/support/ab.mak
index 02f83e8d0ef724b8305d1405a88e6fce65ad82f9..3691c90a472e004de8a9eeb6c491c693324689ab 100644 (file)
--- a/support/ab.mak
+++ b/support/ab.mak
@@ -210,12 +210,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_AB_C0=\
        "..\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)"

diff --git a/support/htdigest.mak b/support/htdigest.mak
index f617b30fb38d2589fe20a35b8f67904abf4dae65..2db4089c95f7f67c47c8a89b0fd62020ba72695a 100644 (file)
--- a/support/htdigest.mak
+++ b/support/htdigest.mak
@@ -214,12 +214,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_HTDIG=\
        "..\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)"

diff --git a/support/htpasswd.mak b/support/htpasswd.mak
index ea68acd91fad5fd47eb1543550526c8e31575c4e..ca5cf42d4a6ece50f8dd3dc07c0fa027e561511f 100644 (file)
--- a/support/htpasswd.mak
+++ b/support/htpasswd.mak
@@ -214,12 +214,12 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ LINK32_OBJS= \
 !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 @@ DEP_CPP_HTPAS=\
        "..\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)"

diff --git a/support/logresolve.mak b/support/logresolve.mak
index 3b92c3b4329028c41a23fa6d0cc6c0b805f5b6b7..278daf8a32e146b8ccbf1c22f1f325019804ba4d 100644 (file)
--- a/support/logresolve.mak
+++ b/support/logresolve.mak
@@ -204,9 +204,6 @@ DEP_CPP_LOGRE=\
        "..\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)"