Refresh .mak files for tagging 2.0.19
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@58315 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/aprutil.mak b/aprutil.mak
index 88b9c11..a12a883 100644
--- a/aprutil.mak
+++ b/aprutil.mak
@@ -64,12 +64,12 @@
-@erase "$(INTDIR)\apr_buckets_refcount.obj"
-@erase "$(INTDIR)\apr_buckets_simple.obj"
-@erase "$(INTDIR)\apr_buckets_socket.obj"
+ -@erase "$(INTDIR)\apr_date.obj"
-@erase "$(INTDIR)\apr_dbm.obj"
-@erase "$(INTDIR)\apr_hooks.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
-@erase "$(INTDIR)\apr_uri.obj"
-@erase "$(INTDIR)\apr_xml.obj"
- -@erase "$(INTDIR)\apr_date.obj"
-@erase "$(INTDIR)\aprutil.idb"
-@erase "$(INTDIR)\sdbm.obj"
-@erase "$(INTDIR)\sdbm_hash.obj"
@@ -139,12 +139,12 @@
"$(INTDIR)\apr_buckets_refcount.obj" \
"$(INTDIR)\apr_buckets_simple.obj" \
"$(INTDIR)\apr_buckets_socket.obj" \
+ "$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apr_dbm.obj" \
"$(INTDIR)\apr_hooks.obj" \
"$(INTDIR)\apr_sha1.obj" \
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\apr_xml.obj" \
- "$(INTDIR)\apr_date.obj" \
"$(INTDIR)\sdbm.obj" \
"$(INTDIR)\sdbm_hash.obj" \
"$(INTDIR)\sdbm_lock.obj" \
@@ -195,6 +195,7 @@
-@erase "$(INTDIR)\apr_buckets_refcount.obj"
-@erase "$(INTDIR)\apr_buckets_simple.obj"
-@erase "$(INTDIR)\apr_buckets_socket.obj"
+ -@erase "$(INTDIR)\apr_date.obj"
-@erase "$(INTDIR)\apr_dbm.obj"
-@erase "$(INTDIR)\apr_hooks.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -270,6 +271,7 @@
"$(INTDIR)\apr_buckets_refcount.obj" \
"$(INTDIR)\apr_buckets_simple.obj" \
"$(INTDIR)\apr_buckets_socket.obj" \
+ "$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apr_dbm.obj" \
"$(INTDIR)\apr_hooks.obj" \
"$(INTDIR)\apr_sha1.obj" \
@@ -776,6 +778,23 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=.\misc\apr_date.c
+DEP_CPP_APR_DA=\
+ "..\apr\include\apr.h"\
+ "..\apr\include\apr_errno.h"\
+ "..\apr\include\apr_lib.h"\
+ "..\apr\include\apr_pools.h"\
+ "..\apr\include\apr_time.h"\
+ "..\apr\include\apr_want.h"\
+ ".\include\apr_date.h"\
+ ".\include\apu.h"\
+
+
+"$(INTDIR)\apr_date.obj" : $(SOURCE) $(DEP_CPP_APR_DA) "$(INTDIR)"\
+ ".\include\apu.h"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
SOURCE=.\include\apu.hw
!IF "$(CFG)" == "aprutil - Win32 Release"
@@ -869,12 +888,12 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
"apr - Win32 Release" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\apr-util"
"apr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -882,12 +901,12 @@
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
"apr - Win32 Debug" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\apr-util"
"apr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
cd "..\apr-util"
diff --git a/libaprutil.mak b/libaprutil.mak
index 4b63065..fdc0703 100644
--- a/libaprutil.mak
+++ b/libaprutil.mak
@@ -66,12 +66,12 @@
-@erase "$(INTDIR)\apr_buckets_refcount.obj"
-@erase "$(INTDIR)\apr_buckets_simple.obj"
-@erase "$(INTDIR)\apr_buckets_socket.obj"
+ -@erase "$(INTDIR)\apr_date.obj"
-@erase "$(INTDIR)\apr_dbm.obj"
-@erase "$(INTDIR)\apr_hooks.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
-@erase "$(INTDIR)\apr_uri.obj"
-@erase "$(INTDIR)\apr_xml.obj"
- -@erase "$(INTDIR)\apr_date.obj"
-@erase "$(INTDIR)\aprutil.idb"
-@erase "$(INTDIR)\sdbm.obj"
-@erase "$(INTDIR)\sdbm_hash.obj"
@@ -149,12 +149,12 @@
"$(INTDIR)\apr_buckets_refcount.obj" \
"$(INTDIR)\apr_buckets_simple.obj" \
"$(INTDIR)\apr_buckets_socket.obj" \
+ "$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apr_dbm.obj" \
"$(INTDIR)\apr_hooks.obj" \
"$(INTDIR)\apr_sha1.obj" \
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\apr_xml.obj" \
- "$(INTDIR)\apr_date.obj" \
"$(INTDIR)\sdbm.obj" \
"$(INTDIR)\sdbm_hash.obj" \
"$(INTDIR)\sdbm_lock.obj" \
@@ -205,6 +205,7 @@
-@erase "$(INTDIR)\apr_buckets_refcount.obj"
-@erase "$(INTDIR)\apr_buckets_simple.obj"
-@erase "$(INTDIR)\apr_buckets_socket.obj"
+ -@erase "$(INTDIR)\apr_date.obj"
-@erase "$(INTDIR)\apr_dbm.obj"
-@erase "$(INTDIR)\apr_hooks.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -290,6 +291,7 @@
"$(INTDIR)\apr_buckets_refcount.obj" \
"$(INTDIR)\apr_buckets_simple.obj" \
"$(INTDIR)\apr_buckets_socket.obj" \
+ "$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apr_dbm.obj" \
"$(INTDIR)\apr_hooks.obj" \
"$(INTDIR)\apr_sha1.obj" \
@@ -796,6 +798,23 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=.\misc\apr_date.c
+DEP_CPP_APR_DA=\
+ "..\apr\include\apr.h"\
+ "..\apr\include\apr_errno.h"\
+ "..\apr\include\apr_lib.h"\
+ "..\apr\include\apr_pools.h"\
+ "..\apr\include\apr_time.h"\
+ "..\apr\include\apr_want.h"\
+ ".\include\apr_date.h"\
+ ".\include\apu.h"\
+
+
+"$(INTDIR)\apr_date.obj" : $(SOURCE) $(DEP_CPP_APR_DA) "$(INTDIR)"\
+ ".\include\apu.h"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
SOURCE=.\include\apu.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
@@ -889,12 +908,12 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
cd "..\apr-util"
"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -902,12 +921,12 @@
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
cd "..\apr-util"
"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
+ cd "..\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
RECURSE=1
cd "..\apr-util"
diff --git a/xml/expat/lib/xml.mak b/xml/expat/lib/xml.mak
index 2ebeb97..8b19e5e 100644
--- a/xml/expat/lib/xml.mak
+++ b/xml/expat/lib/xml.mak
@@ -197,9 +197,6 @@
!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug"
SOURCE=.\xmlparse.c
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
DEP_CPP_XMLPA=\
".\config.h"\
".\expat.h"\
@@ -211,26 +208,7 @@
".\expat.h"
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-DEP_CPP_XMLPA=\
- ".\config.h"\
- ".\expat.h"\
- ".\winconfig.h"\
- ".\xmlrole.h"\
- ".\xmltok.h"\
-
-
-"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)"\
- ".\winconfig.h" ".\expat.h" ".\config.h"
-
-
-!ENDIF
-
SOURCE=.\xmlrole.c
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
DEP_CPP_XMLRO=\
".\ascii.h"\
".\config.h"\
@@ -241,26 +219,7 @@
"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)" ".\config.h"
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-DEP_CPP_XMLRO=\
- ".\ascii.h"\
- ".\config.h"\
- ".\winconfig.h"\
- ".\xmlrole.h"\
- ".\xmltok.h"\
-
-
-"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)"\
- ".\winconfig.h" ".\config.h"
-
-
-!ENDIF
-
SOURCE=.\xmltok.c
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
DEP_CPP_XMLTO=\
".\ascii.h"\
".\asciitab.h"\
@@ -278,29 +237,6 @@
"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" ".\config.h"
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-DEP_CPP_XMLTO=\
- ".\ascii.h"\
- ".\asciitab.h"\
- ".\config.h"\
- ".\iasciitab.h"\
- ".\latin1tab.h"\
- ".\nametab.h"\
- ".\utf8tab.h"\
- ".\winconfig.h"\
- ".\xmltok.h"\
- ".\xmltok_impl.c"\
- ".\xmltok_impl.h"\
- ".\xmltok_ns.c"\
-
-
-"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" ".\winconfig.h"\
- ".\config.h"
-
-
-!ENDIF
-
SOURCE=xmltok_impl.c
SOURCE=xmltok_ns.c
SOURCE=.\expat.h.in
