Change 30698 by [EMAIL PROTECTED] on 2007/03/22 21:42:58
Integrate:
[ 29260]
Subject: Re: [PATCH] New regex syntax omnibus
From: demerphq <[EMAIL PROTECTED]>
Date: Thu, 9 Nov 2006 17:09:34 +0100
Message-ID: <[EMAIL PROTECTED]>
[ 29306]
Tidy up Makefile part of #29260 and apply to makefile.mk too
Affected files ...
... //depot/maint-5.8/perl/win32/Makefile#65 integrate
... //depot/maint-5.8/perl/win32/makefile.mk#73 integrate
Differences ...
==== //depot/maint-5.8/perl/win32/Makefile#65 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#64~30311~ 2007-02-15 03:24:02.000000000 -0800
+++ perl/win32/Makefile 2007-03-22 14:42:58.000000000 -0700
@@ -952,8 +952,15 @@
$(X2P) MakePPPort Extensions $(PERLSTATIC)
@echo Everything is up to date. '$(MAKE_BARE) test' to run test suite.
-reonly : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES)
$(PERLEXE) \
- $(X2P) Extensions_reonly
+..\regnodes.h : ..\regcomp.sym
+ cd ..
+ regcomp.pl
+ cd win32
+
+regnodes : ..\regnodes.h
+
+reonly : regnodes .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES)
\
+ $(PERLEXE) $(X2P) Extensions_reonly
@echo Perl and 're' are up to date.
$(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
@@ -1366,11 +1373,6 @@
regen.pl
cd win32
-regnodes :
- cd ..
- regcomp.pl
- cd win32
-
test-notty : test-prep
set PERL_SKIP_TTY_TEST=1
cd ..\t
==== //depot/maint-5.8/perl/win32/makefile.mk#73 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#72~30311~ 2007-02-15 03:24:02.000000000 -0800
+++ perl/win32/makefile.mk 2007-03-22 14:42:58.000000000 -0700
@@ -1017,7 +1017,12 @@
$(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
$(X2P) MakePPPort Extensions $(PERLSTATIC)
-reonly : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \
+..\regnodes.h : ..\regcomp.sym
+ cd .. && regcomp.pl && cd win32
+
+regnodes : ..\regnodes.h
+
+reonly : regnodes .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \
$(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
$(X2P) Extensions_reonly
@@ -1565,9 +1570,6 @@
regen :
cd .. && regen.pl && cd win32
-regnodes :
- cd .. && regcomp.pl && cd win32
-
test-notty : test-prep
set PERL_SKIP_TTY_TEST=1 && \
cd ..\t && $(PERLEXE) -I.\lib harness $(TEST_SWITCHES) $(TEST_FILES)
End of Patch.
