From cvs-return-893-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Thu Mar 22 05:45:57 2001 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 4550 invoked by uid 500); 22 Mar 2001 05:45:54 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 4526 invoked by uid 500); 22 Mar 2001 05:45:52 -0000 Delivered-To: apmail-apr-util-cvs@apache.org Date: 22 Mar 2001 05:45:51 -0000 Message-ID: <20010322054551.4519.qmail@apache.org> From: wrowe@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/xml/expat/lib .cvsignore wrowe 01/03/21 21:45:50 Modified: . aprutil.dsp aprutil.mak libaprutil.mak xml/expat/lib .cvsignore Log: Reviewing one's own commit messages helps too Revision Changes Path 1.24 +1 -1 apr-util/aprutil.dsp Index: aprutil.dsp =================================================================== RCS file: /home/cvs/apr-util/aprutil.dsp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- aprutil.dsp 2001/03/22 05:38:44 1.23 +++ aprutil.dsp 2001/03/22 05:45:48 1.24 @@ -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 1.10 +40 -33 apr-util/aprutil.mak Index: aprutil.mak =================================================================== RCS file: /home/cvs/apr-util/aprutil.mak,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- aprutil.mak 2001/03/22 05:29:02 1.9 +++ aprutil.mak 2001/03/22 05:45:48 1.10 @@ -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" @@ -846,6 +825,34 @@ $(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" + 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 1.9 +32 -32 apr-util/libaprutil.mak Index: libaprutil.mak =================================================================== RCS file: /home/cvs/apr-util/libaprutil.mak,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libaprutil.mak 2001/03/22 05:29:03 1.8 +++ libaprutil.mak 2001/03/22 05:45:48 1.9 @@ -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" @@ -873,6 +845,34 @@ $(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" + 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 1.3 +3 -0 apr-util/xml/expat/lib/.cvsignore Index: .cvsignore =================================================================== RCS file: /home/cvs/apr-util/xml/expat/lib/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2001/02/28 15:07:07 1.2 +++ .cvsignore 2001/03/22 05:45:50 1.3 @@ -4,3 +4,6 @@ expat.h *.lo *.la +config.h +LibD +LibR