Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 30897 invoked by uid 500); 13 May 2002 16:35:06 -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 30886 invoked from network); 13 May 2002 16:35:06 -0000 Date: 13 May 2002 16:35:05 -0000 Message-ID: <20020513163505.44802.qmail@icarus.apache.org> From: wrowe@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/test Makefile.in MakeWin32Make.pl X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 02/05/13 09:35:05 Modified: test Makefile.in MakeWin32Make.pl Log: Ain't got no regex, ain't got no fork, Till I committed, this thing was borked Revision Changes Path 1.83 +7 -5 apr/test/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr/test/Makefile.in,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- Makefile.in 9 May 2002 16:42:21 -0000 1.82 +++ Makefile.in 13 May 2002 16:35:05 -0000 1.83 @@ -1,6 +1,12 @@ srcdir = @srcdir@ VPATH = @srcdir@ +NONPORTABLE = \ + testshm@EXEEXT@ \ + testprocmutex@EXEEXT@ \ + testglobalmutex@EXEEXT@ \ + testregex@EXEEXT@ + PROGRAMS = \ client@EXEEXT@ \ sendfile@EXEEXT@ \ @@ -19,7 +25,6 @@ testargs@EXEEXT@ \ testud@EXEEXT@ \ testmmap@EXEEXT@ \ - testshm@EXEEXT@ \ testshmproducer@EXEEXT@ \ testshmconsumer@EXEEXT@ \ testpipe@EXEEXT@ \ @@ -34,19 +39,16 @@ teststr@EXEEXT@ \ testuser@EXEEXT@ \ testsockets@EXEEXT@ \ - testprocmutex@EXEEXT@ \ - testglobalmutex@EXEEXT@ \ testvsn@EXEEXT@ \ testsleep@EXEEXT@ \ testrand@EXEEXT@ \ testdup@EXEEXT@ \ testatomic@EXEEXT@ \ - testregex@EXEEXT@ \ testpools@EXEEXT@ \ testmutexscope@EXEEXT@ -TARGETS = $(PROGRAMS) +TARGETS = $(PROGRAMS) $(NONPORTABLE) # bring in rules.mk for standard functionality @INCLUDE_RULES@ 1.15 +4 -3 apr/test/MakeWin32Make.pl Index: MakeWin32Make.pl =================================================================== RCS file: /home/cvs/apr/test/MakeWin32Make.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- MakeWin32Make.pl 15 Sep 2001 00:57:13 -0000 1.14 +++ MakeWin32Make.pl 13 May 2002 16:35:05 -0000 1.15 @@ -45,9 +45,10 @@ if ($t =~ s|-shared|\/subsystem:windows \/dll|) { $t =~ s|-o (\S+)|\/out:\"$1\"|; } - while ($t =~ s|\.a\b|\.lib|) {} - while ($t =~ s|\.o\b|\.obj|) {} - while ($t =~ s|\.lo\b|\.obj|) {} + $t =~ s|\$\(NONPORTABLE\)||g; + $t =~ s|\.a\b|\.lib|g; + $t =~ s|\.o\b|\.obj|g; + $t =~ s|\.lo\b|\.obj|g; print $dstfl $t;