wrowe 01/03/07 21:28:44
Modified: . apr.mak libapr.mak
. aprutil.mak libaprutil.mak
xml/expat/lib expat.dsp
Log:
Refreshing the .mak files, bringing expat.dsp up to 6.0 with all the rest
Revision Changes Path
1.7 +1 -0 apr/apr.mak
Index: apr.mak
===================================================================
RCS file: /home/cvs/apr/apr.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr.mak 2001/02/25 22:20:24 1.6
+++ apr.mak 2001/03/08 05:28:42 1.7
@@ -1049,6 +1049,7 @@
".\include\apr_general.h"\
".\include\apr_network_io.h"\
".\include\apr_pools.h"\
+ ".\include\apr_strings.h"\
".\include\apr_time.h"\
".\include\apr_user.h"\
".\include\apr_want.h"\
1.6 +1 -0 apr/libapr.mak
Index: libapr.mak
===================================================================
RCS file: /home/cvs/apr/libapr.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libapr.mak 2001/02/25 22:20:24 1.5
+++ libapr.mak 2001/03/08 05:28:43 1.6
@@ -1066,6 +1066,7 @@
".\include\apr_general.h"\
".\include\apr_network_io.h"\
".\include\apr_pools.h"\
+ ".\include\apr_strings.h"\
".\include\apr_time.h"\
".\include\apr_user.h"\
".\include\apr_want.h"\
1.6 +12 -13 apr-util/aprutil.mak
Index: aprutil.mak
===================================================================
RCS file: /home/cvs/apr-util/aprutil.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aprutil.mak 2001/02/25 22:20:24 1.5
+++ aprutil.mak 2001/03/08 05:28:44 1.6
@@ -314,11 +314,9 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
- "..\apr\include\apr_tables.h"\
"..\apr\include\apr_time.h"\
"..\apr\include\apr_user.h"\
"..\apr\include\apr_want.h"\
@@ -362,7 +360,6 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
@@ -455,7 +452,6 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
@@ -548,7 +544,6 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
@@ -728,6 +723,10 @@
".\include\apr_xml.h"\
".\include\apu.h"\
+NODEP_CPP_APR_X=\
+ ".\xml\apu_config.h"\
+ ".\xml\expat.h"\
+
"$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
".\include\apu.h"
@@ -783,12 +782,12 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
"expat - Win32 Release" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Release"
cd "..\apr-util"
"expat - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -796,12 +795,12 @@
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
"expat - Win32 Debug" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Debug"
cd "..\apr-util"
"expat - Win32 DebugCLEAN" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Debug"\
RECURSE=1
cd "..\apr-util"
@@ -811,12 +810,12 @@
!IF "$(CFG)" == "aprutil - Win32 Release"
"apr - Win32 Release" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release"
cd "..\apr-util"
"apr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
RECURSE=1
cd "..\apr-util"
@@ -824,12 +823,12 @@
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
"apr - Win32 Debug" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug"
cd "..\apr-util"
"apr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug"
RECURSE=1\
cd "..\apr-util"
1.5 +12 -13 apr-util/libaprutil.mak
Index: libaprutil.mak
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libaprutil.mak 2001/02/25 22:20:25 1.4
+++ libaprutil.mak 2001/03/08 05:28:44 1.5
@@ -336,11 +336,9 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
- "..\apr\include\apr_tables.h"\
"..\apr\include\apr_time.h"\
"..\apr\include\apr_user.h"\
"..\apr\include\apr_want.h"\
@@ -384,7 +382,6 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
@@ -477,7 +474,6 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
@@ -570,7 +566,6 @@
"..\apr\include\apr_file_info.h"\
"..\apr\include\apr_file_io.h"\
"..\apr\include\apr_general.h"\
- "..\apr\include\apr_lib.h"\
"..\apr\include\apr_mmap.h"\
"..\apr\include\apr_network_io.h"\
"..\apr\include\apr_pools.h"\
@@ -750,6 +745,10 @@
".\include\apr_xml.h"\
".\include\apu.h"\
+NODEP_CPP_APR_X=\
+ ".\xml\apu_config.h"\
+ ".\xml\expat.h"\
+
"$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
".\include\apu.h"
@@ -805,12 +804,12 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
"libapr - Win32 Release" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release"
cd "..\apr-util"
"libapr - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32
Release"\
RECURSE=1
cd "..\apr-util"
@@ -818,12 +817,12 @@
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
"libapr - Win32 Debug" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug"
cd "..\apr-util"
"libapr - Win32 DebugCLEAN" :
- cd "..\..\srclib\apr"
+ cd "\clean\httpd-2.0\srclib\apr"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
RECURSE=1
cd "..\apr-util"
@@ -833,12 +832,12 @@
!IF "$(CFG)" == "libaprutil - Win32 Release"
"libexpat - Win32 Release" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release"
cd "..\apr-util"
"libexpat - Win32 ReleaseCLEAN" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\
CFG="libexpat - Win32 Release" RECURSE=1
cd "..\apr-util"
@@ -846,12 +845,12 @@
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
"libexpat - Win32 Debug" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"
cd "..\apr-util"
"libexpat - Win32 DebugCLEAN" :
- cd "..\..\srclib\expat-lite"
+ cd "\clean\httpd-2.0\srclib\expat-lite"
$(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32
Debug"\
RECURSE=1
cd "..\apr-util"
1.4 +4 -3 apr-util/xml/expat/lib/expat.dsp
Index: expat.dsp
===================================================================
RCS file: /home/cvs/apr-util/xml/expat/lib/expat.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- expat.dsp 2001/03/08 04:16:36 1.3
+++ expat.dsp 2001/03/08 05:28:44 1.4
@@ -1,5 +1,5 @@
# Microsoft Developer Studio Project File - Name="expat" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
@@ -22,6 +22,7 @@
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -66,8 +67,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
