Tidy up Makefile part of #29260 and apply to makefile.mk too

p4raw-id: //depot/perl@29306

diff --git a/win32/Makefile b/win32/Makefile
index 8aec66f..99ca522 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -518,7 +518,6 @@ $(o).dll:
 .rc.res:
        $(RSC) -i.. $<
 
-       
 #
 # various targets
 
@@ -957,10 +956,10 @@ all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
        regcomp.pl
        cd win32
 
-regnodes :  ..\regnodes.h
+regnodes : ..\regnodes.h
 
-reonly : regnodes .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
-       $(X2P) Extensions_reonly
+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
@@ -1367,7 +1366,7 @@ test-reonly : reonly utils
        $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg \bre\b $(EXTRA)
        cd ..\win32
 
-regen : 
+regen :
        cd ..
        regen.pl
        cd win32

diff --git a/win32/makefile.mk b/win32/makefile.mk
index a871758..80454ca 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1008,7 +1008,12 @@ all : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2)           \
        $(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
 
@@ -1552,9 +1557,6 @@ test-reonly : reonly utils
 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)