Reviewing one's own commit messages helps too
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@58176 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/aprutil.dsp b/aprutil.dsp
index fcf382e..bf54d5e 100644
--- a/aprutil.dsp
+++ b/aprutil.dsp
@@ -253,7 +253,7 @@
SOURCE=.\include\private\apu_config.hw
-!IF "$(CFG)" == "libaprutil - Win32 Release"
+!IF "$(CFG)" == "aprutil - Win32 Release"
# Begin Custom Build
InputPath=.\include\private\apu_config.hw
diff --git a/aprutil.mak b/aprutil.mak
index 9ff8131..1e59f41 100644
--- a/aprutil.mak
+++ b/aprutil.mak
@@ -40,12 +40,12 @@
!ELSE
-ALL : "apr - Win32 Release" "xml - Win32 Release" "$(OUTDIR)\aprutil.lib"
+ALL : "xml - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\aprutil.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"xml - Win32 ReleaseCLEAN" "apr - Win32 ReleaseCLEAN"
+CLEAN :"apr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -165,12 +165,12 @@
!ELSE
-ALL : "apr - Win32 Debug" "xml - Win32 Debug" "$(OUTDIR)\aprutil.lib"
+ALL : "xml - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\aprutil.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"xml - Win32 DebugCLEAN" "apr - Win32 DebugCLEAN"
+CLEAN :"apr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -728,7 +728,7 @@
"$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
- ".\include\apu.h"
+ ".\include\private\apu_config.h" ".\include\apu.h"
$(CPP) $(CPP_PROJ) $(SOURCE)
@@ -758,6 +758,13 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
+InputPath=.\include\private\apu_config.hw
+
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_config.hw .\include\private\apu_config.h > nul
+ echo Created apu_config.h from apu_config.hw
+
+
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
InputPath=.\include\private\apu_config.hw
@@ -795,34 +802,6 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
-"xml - Win32 Release" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
- cd "..\..\.."
-
-"xml - Win32 ReleaseCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Release"\
- RECURSE=1
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-
-"xml - Win32 Debug" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug"
- cd "..\..\.."
-
-"xml - Win32 DebugCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1\
-
- cd "..\..\.."
-
-!ENDIF
-
-!IF "$(CFG)" == "aprutil - Win32 Release"
-
"apr - Win32 Release" :
cd "..\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
@@ -849,6 +828,34 @@
!ENDIF
+!IF "$(CFG)" == "aprutil - Win32 Release"
+
+"xml - Win32 Release" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
+ cd "..\..\.."
+
+"xml - Win32 ReleaseCLEAN" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Release"\
+ RECURSE=1
+ cd "..\..\.."
+
+!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
+
+"xml - Win32 Debug" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug"
+ cd "..\..\.."
+
+"xml - Win32 DebugCLEAN" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1\
+
+ cd "..\..\.."
+
+!ENDIF
+
!ENDIF
diff --git a/libaprutil.mak b/libaprutil.mak
index 7a7d12f..a36b58c 100644
--- a/libaprutil.mak
+++ b/libaprutil.mak
@@ -42,12 +42,12 @@
!ELSE
-ALL : "libapr - Win32 Release" "xml - Win32 Release" "$(OUTDIR)\libaprutil.dll"
+ALL : "xml - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\libaprutil.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"xml - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
+CLEAN :"libapr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -175,12 +175,12 @@
!ELSE
-ALL : "libapr - Win32 Debug" "xml - Win32 Debug" "$(OUTDIR)\libaprutil.dll"
+ALL : "xml - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\libaprutil.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"xml - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
+CLEAN :"libapr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -822,34 +822,6 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
-"xml - Win32 Release" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
- cd "..\..\.."
-
-"xml - Win32 ReleaseCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Release"\
- RECURSE=1
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-"xml - Win32 Debug" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug"
- cd "..\..\.."
-
-"xml - Win32 DebugCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1\
-
- cd "..\..\.."
-
-!ENDIF
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
"libapr - Win32 Release" :
cd "..\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
@@ -876,6 +848,34 @@
!ENDIF
+!IF "$(CFG)" == "libaprutil - Win32 Release"
+
+"xml - Win32 Release" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
+ cd "..\..\.."
+
+"xml - Win32 ReleaseCLEAN" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Release"\
+ RECURSE=1
+ cd "..\..\.."
+
+!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
+
+"xml - Win32 Debug" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug"
+ cd "..\..\.."
+
+"xml - Win32 DebugCLEAN" :
+ cd ".\xml\expat\lib"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1\
+
+ cd "..\..\.."
+
+!ENDIF
+
!ENDIF
diff --git a/xml/expat/lib/.cvsignore b/xml/expat/lib/.cvsignore
index abb280c..59006cb 100644
--- a/xml/expat/lib/.cvsignore
+++ b/xml/expat/lib/.cvsignore
@@ -4,3 +4,6 @@
expat.h
*.lo
*.la
+config.h
+LibD
+LibR
