wrowe 01/03/21 21:29:04
Modified: . apr.mak libapr.mak
. aprutil.mak libaprutil.mak
Log:
Just freshening up
Revision Changes Path
1.8 +27 -4 apr/apr.mak
Index: apr.mak
===================================================================
RCS file: /home/cvs/apr/apr.mak,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr.mak 2001/03/08 05:28:42 1.7
+++ apr.mak 2001/03/22 05:29:00 1.8
@@ -70,6 +70,7 @@
[EMAIL PROTECTED] "$(INTDIR)\getuuid.obj"
[EMAIL PROTECTED] "$(INTDIR)\groupinfo.obj"
[EMAIL PROTECTED] "$(INTDIR)\inet_ntop.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\inet_pton.obj"
[EMAIL PROTECTED] "$(INTDIR)\locks.obj"
[EMAIL PROTECTED] "$(INTDIR)\misc.obj"
[EMAIL PROTECTED] "$(INTDIR)\mmap.obj"
@@ -170,6 +171,7 @@
"$(INTDIR)\getuuid.obj" \
"$(INTDIR)\groupinfo.obj" \
"$(INTDIR)\inet_ntop.obj" \
+ "$(INTDIR)\inet_pton.obj" \
"$(INTDIR)\locks.obj" \
"$(INTDIR)\misc.obj" \
"$(INTDIR)\mmap.obj" \
@@ -221,7 +223,6 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\access.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr.idb"
- [EMAIL PROTECTED] "$(INTDIR)\apr.pdb"
[EMAIL PROTECTED] "$(INTDIR)\apr_cpystrn.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr_fnmatch.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr_getpass.obj"
@@ -246,6 +247,7 @@
[EMAIL PROTECTED] "$(INTDIR)\getuuid.obj"
[EMAIL PROTECTED] "$(INTDIR)\groupinfo.obj"
[EMAIL PROTECTED] "$(INTDIR)\inet_ntop.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\inet_pton.obj"
[EMAIL PROTECTED] "$(INTDIR)\locks.obj"
[EMAIL PROTECTED] "$(INTDIR)\misc.obj"
[EMAIL PROTECTED] "$(INTDIR)\mmap.obj"
@@ -277,10 +279,10 @@
RSC=rc.exe
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "./include/arch" /I\
"./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D\
"APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\apr" /FD /c
+ /Fd"$(INTDIR)\apr" /FD /ZI /c
CPP_OBJS=.\LibD/
CPP_SBRS=.
@@ -346,6 +348,7 @@
"$(INTDIR)\getuuid.obj" \
"$(INTDIR)\groupinfo.obj" \
"$(INTDIR)\inet_ntop.obj" \
+ "$(INTDIR)\inet_pton.obj" \
"$(INTDIR)\locks.obj" \
"$(INTDIR)\misc.obj" \
"$(INTDIR)\mmap.obj" \
@@ -741,7 +744,6 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=.\file_io\win32\canonfile.c
SOURCE=.\file_io\win32\dir.c
DEP_CPP_DIR_C=\
".\include\apr.h"\
@@ -1058,6 +1060,27 @@
"$(INTDIR)\inet_ntop.obj" : $(SOURCE) $(DEP_CPP_INET_) "$(INTDIR)"\
+ ".\include\apr.h"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\unix\inet_pton.c
+DEP_CPP_INET_P=\
+ ".\include\apr.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_info.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_user.h"\
+ ".\include\apr_want.h"\
+ ".\include\arch\win32\apr_private.h"\
+ ".\include\arch\win32\networkio.h"\
+
+
+"$(INTDIR)\inet_pton.obj" : $(SOURCE) $(DEP_CPP_INET_P) "$(INTDIR)"\
".\include\apr.h"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.7 +27 -4 apr/libapr.mak
Index: libapr.mak
===================================================================
RCS file: /home/cvs/apr/libapr.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libapr.mak 2001/03/08 05:28:43 1.6
+++ libapr.mak 2001/03/22 05:29:00 1.7
@@ -70,6 +70,7 @@
[EMAIL PROTECTED] "$(INTDIR)\getuuid.obj"
[EMAIL PROTECTED] "$(INTDIR)\groupinfo.obj"
[EMAIL PROTECTED] "$(INTDIR)\inet_ntop.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\inet_pton.obj"
[EMAIL PROTECTED] "$(INTDIR)\locks.obj"
[EMAIL PROTECTED] "$(INTDIR)\misc.obj"
[EMAIL PROTECTED] "$(INTDIR)\mmap.obj"
@@ -178,6 +179,7 @@
"$(INTDIR)\getuuid.obj" \
"$(INTDIR)\groupinfo.obj" \
"$(INTDIR)\inet_ntop.obj" \
+ "$(INTDIR)\inet_pton.obj" \
"$(INTDIR)\locks.obj" \
"$(INTDIR)\misc.obj" \
"$(INTDIR)\mmap.obj" \
@@ -229,7 +231,6 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\access.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr.idb"
- [EMAIL PROTECTED] "$(INTDIR)\apr.pdb"
[EMAIL PROTECTED] "$(INTDIR)\apr_cpystrn.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr_fnmatch.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr_getpass.obj"
@@ -254,6 +255,7 @@
[EMAIL PROTECTED] "$(INTDIR)\getuuid.obj"
[EMAIL PROTECTED] "$(INTDIR)\groupinfo.obj"
[EMAIL PROTECTED] "$(INTDIR)\inet_ntop.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\inet_pton.obj"
[EMAIL PROTECTED] "$(INTDIR)\locks.obj"
[EMAIL PROTECTED] "$(INTDIR)\misc.obj"
[EMAIL PROTECTED] "$(INTDIR)\mmap.obj"
@@ -288,10 +290,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./include/arch" /I\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "./include/arch" /I\
"./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D\
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\apr" /FD /c
+ /Fd"$(INTDIR)\apr" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -363,6 +365,7 @@
"$(INTDIR)\getuuid.obj" \
"$(INTDIR)\groupinfo.obj" \
"$(INTDIR)\inet_ntop.obj" \
+ "$(INTDIR)\inet_pton.obj" \
"$(INTDIR)\locks.obj" \
"$(INTDIR)\misc.obj" \
"$(INTDIR)\mmap.obj" \
@@ -758,7 +761,6 @@
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=.\file_io\win32\canonfile.c
SOURCE=.\file_io\win32\dir.c
DEP_CPP_DIR_C=\
".\include\apr.h"\
@@ -1075,6 +1077,27 @@
"$(INTDIR)\inet_ntop.obj" : $(SOURCE) $(DEP_CPP_INET_) "$(INTDIR)"\
+ ".\include\apr.h"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\network_io\unix\inet_pton.c
+DEP_CPP_INET_P=\
+ ".\include\apr.h"\
+ ".\include\apr_errno.h"\
+ ".\include\apr_file_info.h"\
+ ".\include\apr_file_io.h"\
+ ".\include\apr_general.h"\
+ ".\include\apr_network_io.h"\
+ ".\include\apr_pools.h"\
+ ".\include\apr_time.h"\
+ ".\include\apr_user.h"\
+ ".\include\apr_want.h"\
+ ".\include\arch\win32\apr_private.h"\
+ ".\include\arch\win32\networkio.h"\
+
+
+"$(INTDIR)\inet_pton.obj" : $(SOURCE) $(DEP_CPP_INET_P) "$(INTDIR)"\
".\include\apr.h"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.9 +53 -39 apr-util/aprutil.mak
Index: aprutil.mak
===================================================================
RCS file: /home/cvs/apr-util/aprutil.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aprutil.mak 2001/03/08 16:06:00 1.8
+++ aprutil.mak 2001/03/22 05:29:02 1.9
@@ -40,12 +40,12 @@
!ELSE
-ALL : "xml - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\aprutil.lib"
+ALL : "apr - Win32 Release" "xml - Win32 Release" "$(OUTDIR)\aprutil.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"apr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN"
+CLEAN :"xml - Win32 ReleaseCLEAN" "apr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -79,7 +79,7 @@
RSC=rc.exe
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I\
- "./include/private" /I "./dbm/sdbm" /I "../expat-lite" /D "NDEBUG" /D
"WIN32"\
+ "./include/private" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D
"WIN32"\
/D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"APU_USE_SDBM"\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /c
CPP_OBJS=.\LibR/
@@ -165,12 +165,12 @@
!ELSE
-ALL : "xml - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\aprutil.lib"
+ALL : "apr - Win32 Debug" "xml - Win32 Debug" "$(OUTDIR)\aprutil.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"apr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN"
+CLEAN :"xml - Win32 DebugCLEAN" "apr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -192,7 +192,6 @@
[EMAIL PROTECTED] "$(INTDIR)\apr_sha1.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr_xml.obj"
[EMAIL PROTECTED] "$(INTDIR)\aprutil.idb"
- [EMAIL PROTECTED] "$(INTDIR)\aprutil.pdb"
[EMAIL PROTECTED] "$(INTDIR)\sdbm.obj"
[EMAIL PROTECTED] "$(INTDIR)\sdbm_hash.obj"
[EMAIL PROTECTED] "$(INTDIR)\sdbm_lock.obj"
@@ -204,10 +203,10 @@
RSC=rc.exe
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I\
- "./include/private" /I "./dbm/sdbm" /I "../expat-lite" /D "_DEBUG" /D
"WIN32"\
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "../apr/include" /I\
+ "./include/private" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D
"WIN32"\
/D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"APU_USE_SDBM"\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /c
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /ZI /c
CPP_OBJS=.\LibD/
CPP_SBRS=.
@@ -721,10 +720,10 @@
"..\apr\include\apr_want.h"\
".\include\apr_xml.h"\
".\include\apu.h"\
+ ".\include\private\apu_config.h"\
+ ".\xml\expat\lib\expat.h"\
NODEP_CPP_APR_X=\
- ".\xml\apu_config.h"\
- ".\xml\expat.h"\
".\xml\xmlparse.h"\
@@ -755,6 +754,21 @@
!ENDIF
+SOURCE=.\include\private\apu_config.hw
+
+!IF "$(CFG)" == "aprutil - Win32 Release"
+
+!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
+
+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
+
+
+!ENDIF
+
SOURCE=.\include\private\apu_select_dbm.hw
!IF "$(CFG)" == "aprutil - Win32 Release"
@@ -781,34 +795,6 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
-"apr - Win32 Release" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
- cd "..\apr-util"
-
-"apr - Win32 ReleaseCLEAN" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
- RECURSE=1
- cd "..\apr-util"
-
-!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-
-"apr - Win32 Debug" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
- cd "..\apr-util"
-
-"apr - Win32 DebugCLEAN" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug"
RECURSE=1\
-
- cd "..\apr-util"
-
-!ENDIF
-
-!IF "$(CFG)" == "aprutil - Win32 Release"
-
"xml - Win32 Release" :
cd ".\xml\expat\lib"
$(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
@@ -832,6 +818,34 @@
$(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"
+ cd "..\apr-util"
+
+"apr - Win32 ReleaseCLEAN" :
+ cd "..\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
+ RECURSE=1
+ cd "..\apr-util"
+
+!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
+
+"apr - Win32 Debug" :
+ cd "..\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
+ cd "..\apr-util"
+
+"apr - Win32 DebugCLEAN" :
+ cd "..\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug"
RECURSE=1\
+
+ cd "..\apr-util"
!ENDIF
1.8 +62 -41 apr-util/libaprutil.mak
Index: libaprutil.mak
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.mak,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libaprutil.mak 2001/03/08 16:06:02 1.7
+++ libaprutil.mak 2001/03/22 05:29:03 1.8
@@ -42,12 +42,12 @@
!ELSE
-ALL : "xml - Win32 Release" "libapr - Win32 Release"
"$(OUTDIR)\libaprutil.dll"
+ALL : "libapr - Win32 Release" "xml - Win32 Release"
"$(OUTDIR)\libaprutil.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN"
+CLEAN :"xml - Win32 ReleaseCLEAN" "libapr - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -83,7 +83,7 @@
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I\
- "./include/private" /I "./dbm/sdbm" /I "../expat-lite" /D "NDEBUG" /D
"WIN32"\
+ "./include/private" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D
"WIN32"\
/D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\aprutil" /FD /c
CPP_OBJS=.\Release/
@@ -175,12 +175,12 @@
!ELSE
-ALL : "xml - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\libaprutil.dll"
+ALL : "libapr - Win32 Debug" "xml - Win32 Debug" "$(OUTDIR)\libaprutil.dll"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"libapr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN"
+CLEAN :"xml - Win32 DebugCLEAN" "libapr - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -202,7 +202,6 @@
[EMAIL PROTECTED] "$(INTDIR)\apr_sha1.obj"
[EMAIL PROTECTED] "$(INTDIR)\apr_xml.obj"
[EMAIL PROTECTED] "$(INTDIR)\aprutil.idb"
- [EMAIL PROTECTED] "$(INTDIR)\aprutil.pdb"
[EMAIL PROTECTED] "$(INTDIR)\sdbm.obj"
[EMAIL PROTECTED] "$(INTDIR)\sdbm_hash.obj"
[EMAIL PROTECTED] "$(INTDIR)\sdbm_lock.obj"
@@ -217,10 +216,10 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I\
- "./include/private" /I "./dbm/sdbm" /I "../expat-lite" /D "_DEBUG" /D
"WIN32"\
- /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\aprutil" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "./include" /I "../apr/include" /I\
+ "./include/private" /I "./dbm/sdbm" /I "./xml/expat/lib" /I "./expat/lib"
/D\
+ "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM"\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\aprutil" /FD /ZI /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
@@ -741,15 +740,15 @@
"..\apr\include\apr_want.h"\
".\include\apr_xml.h"\
".\include\apu.h"\
+ ".\include\private\apu_config.h"\
+ ".\xml\expat\lib\expat.h"\
NODEP_CPP_APR_X=\
- ".\xml\apu_config.h"\
- ".\xml\expat.h"\
".\xml\xmlparse.h"\
"$(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)
@@ -775,6 +774,28 @@
!ENDIF
+SOURCE=.\include\private\apu_config.hw
+
+!IF "$(CFG)" == "libaprutil - 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)" == "libaprutil - Win32 Debug"
+
+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
+
+
+!ENDIF
+
SOURCE=.\include\private\apu_select_dbm.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
@@ -801,34 +822,6 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
-"libapr - Win32 Release" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
- cd "..\apr-util"
-
-"libapr - Win32 ReleaseCLEAN" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32
Release"\
- RECURSE=1
- cd "..\apr-util"
-
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-"libapr - Win32 Debug" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
- cd "..\apr-util"
-
-"libapr - Win32 DebugCLEAN" :
- cd "..\apr"
- $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
- RECURSE=1
- cd "..\apr-util"
-
-!ENDIF
-
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
"xml - Win32 Release" :
cd ".\xml\expat\lib"
$(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
@@ -852,6 +845,34 @@
$(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"
+ cd "..\apr-util"
+
+"libapr - Win32 ReleaseCLEAN" :
+ cd "..\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32
Release"\
+ RECURSE=1
+ cd "..\apr-util"
+
+!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
+
+"libapr - Win32 Debug" :
+ cd "..\apr"
+ $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
+ cd "..\apr-util"
+
+"libapr - Win32 DebugCLEAN" :
+ cd "..\apr"
+ $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
+ RECURSE=1
+ cd "..\apr-util"
!ENDIF
