From 3fa4a84fe0bc5db4f93f42f2d6a95980ec67b77d Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sun, 25 Feb 2001 22:20:24 +0000 Subject: 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/apr/apr/trunk@61305 13f79535-47bb-0310-9956-ffa450edef68 --- apr.mak | 62 -------------------------------------------------------------- 1 file changed, 62 deletions(-) (limited to 'apr.mak') diff --git a/apr.mak b/apr.mak index c367adb75..db8fe2fb7 100644 --- a/apr.mak +++ b/apr.mak @@ -416,8 +416,6 @@ DEP_CPP_TIME_=\ ".\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 @@ DEP_CPP_TIMES=\ ".\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 @@ DEP_CPP_APR_S=\ ".\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 @@ DEP_CPP_ERROR=\ ".\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 @@ DEP_CPP_GETOP=\ ".\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 @@ DEP_CPP_MISC_=\ ".\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 @@ DEP_CPP_NAMES=\ ".\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 @@ DEP_CPP_START=\ ".\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 @@ DEP_CPP_DIR_C=\ ".\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 @@ DEP_CPP_FILEA=\ ".\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 @@ DEP_CPP_FILED=\ ".\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 @@ DEP_CPP_FILES=\ ".\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 @@ DEP_CPP_FLOCK=\ ".\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 @@ DEP_CPP_FULLR=\ ".\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 @@ DEP_CPP_OPEN_=\ ".\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 @@ DEP_CPP_PIPE_=\ ".\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 @@ DEP_CPP_READW=\ ".\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 @@ DEP_CPP_SEEK_=\ ".\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 @@ DEP_CPP_LOCKS=\ ".\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 @@ DEP_CPP_INET_=\ ".\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 @@ DEP_CPP_POLL_=\ ".\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 @@ DEP_CPP_SENDR=\ ".\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 @@ DEP_CPP_SOCKA=\ ".\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 @@ DEP_CPP_SOCKE=\ ".\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 @@ DEP_CPP_SOCKO=\ ".\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 @@ DEP_CPP_PROC_=\ ".\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 @@ DEP_CPP_SIGNA=\ ".\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 @@ DEP_CPP_THREA=\ ".\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 @@ DEP_CPP_THREAD=\ ".\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 @@ DEP_CPP_DSO_C=\ ".\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 @@ DEP_CPP_APR_P=\ ".\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 @@ DEP_CPP_COMMO=\ ".\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 @@ DEP_CPP_MMAP_=\ ".\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 @@ DEP_CPP_GROUP=\ ".\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 @@ DEP_CPP_USERI=\ ".\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)"\ -- cgit v1.2.1