Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 357E510A7E for ; Wed, 6 Nov 2013 05:16:14 +0000 (UTC) Received: (qmail 47180 invoked by uid 500); 6 Nov 2013 05:16:13 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 47077 invoked by uid 500); 6 Nov 2013 05:16:11 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 47070 invoked by uid 99); 6 Nov 2013 05:16:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Nov 2013 05:16:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Nov 2013 05:16:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8810723889EC; Wed, 6 Nov 2013 05:15:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1539243 - in /apr/apr/branches/1.5.x: apr.dep apr.mak libapr.dep libapr.mak Date: Wed, 06 Nov 2013 05:15:40 -0000 To: commits@apr.apache.org From: gsmith@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131106051540.8810723889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsmith Date: Wed Nov 6 05:15:39 2013 New Revision: 1539243 URL: http://svn.apache.org/r1539243 Log: make files to match r1539205 Modified: apr/apr/branches/1.5.x/apr.dep apr/apr/branches/1.5.x/apr.mak apr/apr/branches/1.5.x/libapr.dep apr/apr/branches/1.5.x/libapr.mak Modified: apr/apr/branches/1.5.x/apr.dep URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/apr.dep?rev=1539243&r1=1539242&r2=1539243&view=diff ============================================================================== --- apr/apr/branches/1.5.x/apr.dep (original) +++ apr/apr/branches/1.5.x/apr.dep Wed Nov 6 05:15:39 2013 @@ -1886,3 +1886,31 @@ !ENDIF +!IF "$(CFG)" == "apr - Win32 Release" + +!ELSEIF "$(CFG)" == "apr - Win32 Debug" + +!ELSEIF "$(CFG)" == "apr - Win32 Release9x" + +!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" + +!ELSEIF "$(CFG)" == "apr - x64 Release" + +!ELSEIF "$(CFG)" == "apr - x64 Debug" + +!ENDIF + +!IF "$(CFG)" == "apr - Win32 Release" + +!ELSEIF "$(CFG)" == "apr - Win32 Debug" + +!ELSEIF "$(CFG)" == "apr - Win32 Release9x" + +!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" + +!ELSEIF "$(CFG)" == "apr - x64 Release" + +!ELSEIF "$(CFG)" == "apr - x64 Debug" + +!ENDIF + Modified: apr/apr/branches/1.5.x/apr.mak URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/apr.mak?rev=1539243&r1=1539242&r2=1539243&view=diff ============================================================================== --- apr/apr/branches/1.5.x/apr.mak (original) +++ apr/apr/branches/1.5.x/apr.mak Wed Nov 6 05:15:39 2013 @@ -37,7 +37,7 @@ INTDIR=.\LibR OutDir=.\LibR # End Custom Macros -ALL : "$(OUTDIR)\apr-1.lib" +ALL : ".\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" CLEAN : @@ -116,6 +116,10 @@ CLEAN : -@erase "$(INTDIR)\utf8.obj" -@erase "$(INTDIR)\version.obj" -@erase "$(OUTDIR)\apr-1.lib" + -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -247,7 +251,7 @@ INTDIR=.\LibD OutDir=.\LibD # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" CLEAN : @@ -327,6 +331,9 @@ CLEAN : -@erase "$(INTDIR)\version.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -458,7 +465,7 @@ INTDIR=.\9x\LibR OutDir=.\9x\LibR # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibR\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" CLEAN : @@ -538,6 +545,9 @@ CLEAN : -@erase "$(INTDIR)\version.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -669,7 +679,7 @@ INTDIR=.\9x\LibD OutDir=.\9x\LibD # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\LibD\gen_test_char.exe" "$(OUTDIR)\apr-1.lib" CLEAN : @@ -749,6 +759,9 @@ CLEAN : -@erase "$(INTDIR)\version.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -880,7 +893,7 @@ INTDIR=.\x64\LibR OutDir=.\x64\LibR # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\x64\LibR\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" CLEAN : @@ -960,6 +973,9 @@ CLEAN : -@erase "$(INTDIR)\version.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -1091,7 +1107,7 @@ INTDIR=.\x64\LibD OutDir=.\x64\LibD # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\apr-1.lib" +ALL : ".\x64\LibD\gen_test_char.exe" ".\include\apr_escape_test_char.h" ".\include\apr.h" "$(OUTDIR)\apr-1.lib" CLEAN : @@ -1171,6 +1187,9 @@ CLEAN : -@erase "$(INTDIR)\version.obj" -@erase "$(OUTDIR)\apr-1.lib" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -1321,7 +1340,7 @@ SOURCE=.\dso\win32\dso.c SOURCE=.\encoding\apr_escape.c -"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\include\apr_escape_test_char.h" ".\include\apr.h" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -1749,9 +1768,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1762,9 +1779,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1775,9 +1790,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1788,9 +1801,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1801,9 +1812,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1814,9 +1823,153 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h +<< + + +!ENDIF + +SOURCE=.\include\apr_escape.h + +!IF "$(CFG)" == "apr - Win32 Release" + +InputPath=.\include\apr_escape.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "apr - Win32 Debug" + +InputPath=.\include\apr_escape.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "apr - Win32 Release9x" + +InputPath=.\include\apr_escape.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" + +InputPath=.\include\apr_escape.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "apr - x64 Release" + +InputPath=.\include\apr_escape.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "apr - x64 Debug" + +InputPath=.\include\apr_escape.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ENDIF + +SOURCE=.\include\apr_want.h + +!IF "$(CFG)" == "apr - Win32 Release" + +InputPath=.\include\apr_want.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "apr - Win32 Debug" + +InputPath=.\include\apr_want.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "apr - Win32 Release9x" + +InputPath=.\include\apr_want.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "apr - Win32 Debug9x" + +InputPath=.\include\apr_want.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "apr - x64 Release" + +InputPath=.\include\apr_want.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "apr - x64 Debug" + +InputPath=.\include\apr_want.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h << Modified: apr/apr/branches/1.5.x/libapr.dep URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/libapr.dep?rev=1539243&r1=1539242&r2=1539243&view=diff ============================================================================== --- apr/apr/branches/1.5.x/libapr.dep (original) +++ apr/apr/branches/1.5.x/libapr.dep Wed Nov 6 05:15:39 2013 @@ -1886,6 +1886,34 @@ !ENDIF +!IF "$(CFG)" == "libapr - Win32 Release" + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" + +!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" + +!ELSEIF "$(CFG)" == "libapr - x64 Release" + +!ELSEIF "$(CFG)" == "libapr - x64 Debug" + +!ENDIF + +!IF "$(CFG)" == "libapr - Win32 Release" + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" + +!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" + +!ELSEIF "$(CFG)" == "libapr - x64 Release" + +!ELSEIF "$(CFG)" == "libapr - x64 Debug" + +!ENDIF + .\libapr.rc : \ ".\include\apr.h"\ ".\include\apr_version.h"\ Modified: apr/apr/branches/1.5.x/libapr.mak URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/libapr.mak?rev=1539243&r1=1539242&r2=1539243&view=diff ============================================================================== --- apr/apr/branches/1.5.x/libapr.mak (original) +++ apr/apr/branches/1.5.x/libapr.mak Wed Nov 6 05:15:39 2013 @@ -33,11 +33,12 @@ NULL=nul OUTDIR=.\Release INTDIR=.\Release +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep # Begin Custom Macros OutDir=.\Release # End Custom Macros -ALL : "$(OUTDIR)\libapr-1.dll" +ALL : ".\Release\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" CLEAN : @@ -120,6 +121,10 @@ CLEAN : -@erase "$(OUTDIR)\libapr-1.exp" -@erase "$(OUTDIR)\libapr-1.lib" -@erase "$(OUTDIR)\libapr-1.pdb" + -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -166,7 +171,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr. BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref LINK32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ "$(INTDIR)\dso.obj" \ @@ -252,13 +257,11 @@ SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -ALL : $(DS_POSTBUILD_DEP) - # Begin Custom Macros OutDir=.\Release # End Custom Macros -$(DS_POSTBUILD_DEP) : "$(OUTDIR)\libapr-1.dll" +"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" if exist .\Release\libapr-1.dll.manifest mt.exe -manifest .\Release\libapr-1.dll.manifest -outputresource:.\Release\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" @@ -266,11 +269,12 @@ $(DS_POSTBUILD_DEP) : "$(OUTDIR)\libapr- OUTDIR=.\Debug INTDIR=.\Debug +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep # Begin Custom Macros OutDir=.\Debug # End Custom Macros -ALL : "$(OUTDIR)\libapr-1.dll" +ALL : ".\include\apr_escape_test_char.h" ".\Debug\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" CLEAN : @@ -353,6 +357,10 @@ CLEAN : -@erase "$(OUTDIR)\libapr-1.exp" -@erase "$(OUTDIR)\libapr-1.lib" -@erase "$(OUTDIR)\libapr-1.pdb" + -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -399,7 +407,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr. BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 LINK32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ "$(INTDIR)\dso.obj" \ @@ -485,13 +493,11 @@ SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -ALL : $(DS_POSTBUILD_DEP) - # Begin Custom Macros OutDir=.\Debug # End Custom Macros -$(DS_POSTBUILD_DEP) : "$(OUTDIR)\libapr-1.dll" +"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" if exist .\Debug\libapr-1.dll.manifest mt.exe -manifest .\Debug\libapr-1.dll.manifest -outputresource:.\Debug\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" @@ -499,11 +505,12 @@ $(DS_POSTBUILD_DEP) : "$(OUTDIR)\libapr- OUTDIR=.\9x\Release INTDIR=.\9x\Release +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep # Begin Custom Macros OutDir=.\9x\Release # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +ALL : ".\include\apr_escape_test_char.h" ".\9x\Release\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" CLEAN : @@ -587,6 +594,9 @@ CLEAN : -@erase "$(OUTDIR)\libapr-1.lib" -@erase "$(OUTDIR)\libapr-1.pdb" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -633,7 +643,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr. BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 /opt:ref LINK32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ "$(INTDIR)\dso.obj" \ @@ -719,13 +729,11 @@ SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -ALL : $(DS_POSTBUILD_DEP) - # Begin Custom Macros OutDir=.\9x\Release # End Custom Macros -$(DS_POSTBUILD_DEP) : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" if exist .\9x\Release\libapr-1.dll.manifest mt.exe -manifest .\9x\Release\libapr-1.dll.manifest -outputresource:.\9x\Release\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" @@ -733,11 +741,12 @@ $(DS_POSTBUILD_DEP) : ".\include\apr.h" OUTDIR=.\9x\Debug INTDIR=.\9x\Debug +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep # Begin Custom Macros OutDir=.\9x\Debug # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +ALL : ".\include\apr_escape_test_char.h" ".\include\apr.h" ".\9x\Debug\gen_test_char.exe" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" CLEAN : @@ -821,6 +830,9 @@ CLEAN : -@erase "$(OUTDIR)\libapr-1.lib" -@erase "$(OUTDIR)\libapr-1.pdb" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -867,7 +879,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr. BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X86 LINK32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ "$(INTDIR)\dso.obj" \ @@ -953,13 +965,11 @@ SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -ALL : $(DS_POSTBUILD_DEP) - # Begin Custom Macros OutDir=.\9x\Debug # End Custom Macros -$(DS_POSTBUILD_DEP) : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" if exist .\9x\Debug\libapr-1.dll.manifest mt.exe -manifest .\9x\Debug\libapr-1.dll.manifest -outputresource:.\9x\Debug\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" @@ -967,11 +977,12 @@ $(DS_POSTBUILD_DEP) : ".\include\apr.h" OUTDIR=.\x64\Release INTDIR=.\x64\Release +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep # Begin Custom Macros OutDir=.\x64\Release # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +ALL : ".\x64\Release\gen_test_char.exe" ".\include\apr_escape_test_char.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" CLEAN : @@ -1055,6 +1066,9 @@ CLEAN : -@erase "$(OUTDIR)\libapr-1.lib" -@erase "$(OUTDIR)\libapr-1.pdb" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -1101,7 +1115,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr. BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 /opt:ref +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 /opt:ref LINK32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ "$(INTDIR)\dso.obj" \ @@ -1187,13 +1201,11 @@ SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -ALL : $(DS_POSTBUILD_DEP) - # Begin Custom Macros OutDir=.\x64\Release # End Custom Macros -$(DS_POSTBUILD_DEP) : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" if exist .\x64\Release\libapr-1.dll.manifest mt.exe -manifest .\x64\Release\libapr-1.dll.manifest -outputresource:.\x64\Release\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" @@ -1201,11 +1213,12 @@ $(DS_POSTBUILD_DEP) : ".\include\apr.h" OUTDIR=.\x64\Debug INTDIR=.\x64\Debug +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep # Begin Custom Macros OutDir=.\x64\Debug # End Custom Macros -ALL : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +ALL : ".\x64\Debug\gen_test_char.exe" ".\include\apr_escape_test_char.h" "$(OUTDIR)\libapr-1.dll" "$(DS_POSTBUILD_DEP)" CLEAN : @@ -1289,6 +1302,9 @@ CLEAN : -@erase "$(OUTDIR)\libapr-1.lib" -@erase "$(OUTDIR)\libapr-1.pdb" -@erase ".\include\apr.h" + -@erase ".\include\apr_gen_test_char.h" + -@erase "$(OUTDIR)\gen_test_char.exe" + -@erase "$(OUTDIR)\gen_test_char.obj" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" @@ -1335,7 +1351,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapr. BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 +LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libapr-1.pdb" /debug /out:"$(OUTDIR)\libapr-1.dll" /implib:"$(OUTDIR)\libapr-1.lib" /MACHINE:X64 LINK32_OBJS= \ "$(INTDIR)\apr_atomic.obj" \ "$(INTDIR)\dso.obj" \ @@ -1421,13 +1437,11 @@ SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep -ALL : $(DS_POSTBUILD_DEP) - # Begin Custom Macros OutDir=.\x64\Debug # End Custom Macros -$(DS_POSTBUILD_DEP) : ".\include\apr.h" "$(OUTDIR)\libapr-1.dll" +"$(DS_POSTBUILD_DEP)" : "$(OUTDIR)\libapr-1.dll" if exist .\x64\Debug\libapr-1.dll.manifest mt.exe -manifest .\x64\Debug\libapr-1.dll.manifest -outputresource:.\x64\Debug\libapr-1.dll;2 echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" @@ -1458,7 +1472,7 @@ SOURCE=.\dso\win32\dso.c SOURCE=.\encoding\apr_escape.c -"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h" +"$(INTDIR)\apr_escape.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_escape.h" ".\include\apr_escape_test_char.h" ".\include\apr.h" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -1886,9 +1900,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1899,9 +1911,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1912,9 +1922,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1925,9 +1933,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1938,9 +1944,7 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h << @@ -1951,9 +1955,153 @@ InputPath=.\include\apr.hw ".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" < .\include\apr.h - cl.exe /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /I ".\include" .\tools\gen_test_char.c - .\gen_test_char.exe > .\include\apr_escape_test_char.h + type .\include\apr.hw > .\include\apr.h +<< + + +!ENDIF + +SOURCE=.\include\apr_escape.h + +!IF "$(CFG)" == "libapr - Win32 Release" + +InputPath=.\include\apr_escape.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" + +InputPath=.\include\apr_escape.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" + +InputPath=.\include\apr_escape.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" + +InputPath=.\include\apr_escape.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "libapr - x64 Release" + +InputPath=.\include\apr_escape.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ELSEIF "$(CFG)" == "libapr - x64 Debug" + +InputPath=.\include\apr_escape.h + +"$(INTDIR)\gen_test_char.exe" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr_escape_test_char.h +<< + + +!ENDIF + +SOURCE=.\include\apr_want.h + +!IF "$(CFG)" == "libapr - Win32 Release" + +InputPath=.\include\apr_want.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug" + +InputPath=.\include\apr_want.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "libapr - Win32 Release9x" + +InputPath=.\include\apr_want.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "libapr - Win32 Debug9x" + +InputPath=.\include\apr_want.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "libapr - x64 Release" + +InputPath=.\include\apr_want.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h +<< + + +!ELSEIF "$(CFG)" == "libapr - x64 Debug" + +InputPath=.\include\apr_want.h + +".\include\apr_escape_test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\include\apr.h <<