Author: wrowe
Date: Fri May  6 18:57:18 2011
New Revision: 1100328

URL: http://svn.apache.org/viewvc?rev=1100328&view=rev
Log:
Manditory patch to 1.4.4 for command line builds due to r1083177 breakage

Modified:
    apr/apr/branches/1.4.x/apr.mak
    apr/apr/branches/1.4.x/libapr.mak

Modified: apr/apr/branches/1.4.x/apr.mak
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/apr.mak?rev=1100328&r1=1100327&r2=1100328&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/apr.mak (original)
+++ apr/apr/branches/1.4.x/apr.mak Fri May  6 18:57:18 2011
@@ -41,7 +41,6 @@ ALL : "$(OUTDIR)\apr-1.lib"
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
@@ -226,7 +225,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -249,7 +247,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\apr-1
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
@@ -435,7 +432,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -458,7 +454,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\apr-1
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
@@ -644,7 +639,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -667,7 +661,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\apr-1
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
@@ -853,7 +846,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -876,7 +868,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\apr-1
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
@@ -1062,7 +1053,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -1085,7 +1075,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\apr-1
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr-1.idb"
 	-@erase "$(INTDIR)\apr-1.pdb"
 	-@erase "$(INTDIR)\apr_atomic.obj"
@@ -1271,7 +1260,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -1692,12 +1680,6 @@ SOURCE=.\threadproc\win32\threadpriv.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\time\win32\access.c
-
-"$(INTDIR)\access.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=.\time\win32\time.c
 
 "$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"

Modified: apr/apr/branches/1.4.x/libapr.mak
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/libapr.mak?rev=1100328&r1=1100327&r2=1100328&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/libapr.mak (original)
+++ apr/apr/branches/1.4.x/libapr.mak Fri May  6 18:57:18 2011
@@ -42,7 +42,6 @@ ALL : "$(OUTDIR)\libapr-1.dll" "$(DS_POS
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr_atomic.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
@@ -234,7 +233,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -272,7 +270,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\libap
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr_atomic.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
@@ -465,7 +462,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -503,7 +499,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\libap
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr_atomic.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
@@ -696,7 +691,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -734,7 +728,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\libap
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr_atomic.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
@@ -927,7 +920,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -965,7 +957,6 @@ ALL : ".\include\apr.h" "$(OUTDIR)\libap
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr_atomic.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
@@ -1158,7 +1149,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -1192,11 +1182,10 @@ DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
 OutDir=.\x64\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
+ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)"
 
 
 CLEAN :
-	-@erase "$(INTDIR)\access.obj"
 	-@erase "$(INTDIR)\apr_atomic.obj"
 	-@erase "$(INTDIR)\apr_cpystrn.obj"
 	-@erase "$(INTDIR)\apr_fnmatch.obj"
@@ -1274,6 +1263,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\libapr-1.exp"
 	-@erase "$(OUTDIR)\libapr-1.lib"
 	-@erase "$(OUTDIR)\libapr-1.pdb"
+	-@erase ".\include\apr.h"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -1388,7 +1378,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\signals.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\threadpriv.obj" \
-	"$(INTDIR)\access.obj" \
 	"$(INTDIR)\time.obj" \
 	"$(INTDIR)\timestr.obj" \
 	"$(INTDIR)\groupinfo.obj" \
@@ -1823,12 +1812,6 @@ SOURCE=.\threadproc\win32\threadpriv.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-SOURCE=.\time\win32\access.c
-
-"$(INTDIR)\access.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 SOURCE=.\time\win32\time.c
 
 "$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"