diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-06 18:57:18 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-06 18:57:18 +0000 |
| commit | 76b6ecb3566f35f9dbef4d49ec380ce3cf5fc428 (patch) | |
| tree | b728056b3e034e97699c68259bd7447cb1d1812b /libapr.mak | |
| parent | 2028bd6b22afeac592a9a88f23f8eace27f012fd (diff) | |
| download | libapr-76b6ecb3566f35f9dbef4d49ec380ce3cf5fc428.tar.gz | |
Manditory patch to 1.4.4 for command line builds due to r1083177 breakage
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1100328 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'libapr.mak')
| -rw-r--r-- | libapr.mak | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/libapr.mak b/libapr.mak index eb8362e98..3193ab966 100644 --- a/libapr.mak +++ b/libapr.mak @@ -42,7 +42,6 @@ ALL : "$(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"
@@ -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)\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"
@@ -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)\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"
@@ -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)\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"
@@ -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)\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"
@@ -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"
|