Update apr-util make files for win32
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@58335 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/libaprutil.mak b/libaprutil.mak
index 34b3cc0..4fe56a7 100644
--- a/libaprutil.mak
+++ b/libaprutil.mak
@@ -177,14 +177,12 @@
!IF "$(RECURSE)" == "0"
-ALL : ".\uri\uri_delims.h" ".\include\private\apu_select_dbm.h"\
- ".\include\private\apu_config.h" ".\include\apu.h" "$(OUTDIR)\libaprutil.dll"
+ALL : "$(OUTDIR)\libaprutil.dll"
!ELSE
ALL : "xml - Win32 Debug" "gen_uri_delims - Win32 Debug" "libapr - Win32 Debug"\
- ".\uri\uri_delims.h" ".\include\private\apu_select_dbm.h"\
- ".\include\private\apu_config.h" ".\include\apu.h" "$(OUTDIR)\libaprutil.dll"
+ "$(OUTDIR)\libaprutil.dll"
!ENDIF
@@ -224,10 +222,6 @@
-@erase "$(OUTDIR)\libaprutil.lib"
-@erase "$(OUTDIR)\libaprutil.map"
-@erase "$(OUTDIR)\libaprutil.pdb"
- -@erase ".\include\apu.h"
- -@erase ".\include\private\apu_config.h"
- -@erase ".\include\private\apu_select_dbm.h"
- -@erase ".\uri\uri_delims.h"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -321,9 +315,6 @@
!IF "$(CFG)" == "libaprutil - Win32 Release" || "$(CFG)" ==\
"libaprutil - Win32 Debug"
SOURCE=.\buckets\apr_brigade.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_B=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -350,19 +341,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_brigade.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BU=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -387,19 +366,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_eos.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUC=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -424,19 +391,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_eos.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_file.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCK=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -461,19 +416,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_file.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_flush.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKE=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -498,19 +441,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_flush.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_heap.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKET=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -535,19 +466,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_heap.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_mmap.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKETS=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -572,19 +491,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_mmap.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_pipe.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKETS_=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -609,19 +516,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_pipe.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_pool.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKETS_P=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -646,19 +541,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_pool.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_refcount.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKETS_R=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -683,19 +566,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_refcount.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_simple.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKETS_S=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -720,19 +591,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_simple.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\buckets\apr_buckets_socket.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BUCKETS_SO=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -757,19 +616,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_buckets_socket.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\crypto\apr_sha1.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_S=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -789,19 +636,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_sha1.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\dbm\sdbm\sdbm.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_SDBM_=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -825,19 +660,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\dbm\sdbm\sdbm_hash.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_SDBM_H=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -859,19 +682,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\dbm\sdbm\sdbm_lock.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_SDBM_L=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -894,19 +705,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\dbm\sdbm\sdbm_pair.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_SDBM_P=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -930,19 +729,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\dbm\apr_dbm.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_D=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -966,19 +753,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_dbm.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\encoding\apr_base64.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_BA=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -995,19 +770,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_base64.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\hooks\apr_hooks.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_H=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -1027,19 +790,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_hooks.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\uri\apr_uri.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_U=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -1064,19 +815,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_uri.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\xml\apr_xml.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_X=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -1099,19 +838,7 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_xml.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\misc\apr_date.c
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
DEP_CPP_APR_DA=\
"..\apr\include\apr.h"\
"..\apr\include\apr_errno.h"\
@@ -1129,15 +856,6 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-
-"$(INTDIR)\apr_date.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=.\include\apu.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
diff --git a/xml/expat/lib/xml.mak b/xml/expat/lib/xml.mak
index 8b19e5e..2ebeb97 100644
--- a/xml/expat/lib/xml.mak
+++ b/xml/expat/lib/xml.mak
@@ -197,6 +197,9 @@
!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug"
SOURCE=.\xmlparse.c
+
+!IF "$(CFG)" == "xml - Win32 Release"
+
DEP_CPP_XMLPA=\
".\config.h"\
".\expat.h"\
@@ -208,7 +211,26 @@
".\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"\
@@ -219,7 +241,26 @@
"$(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"\
@@ -237,6 +278,29 @@
"$(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
