X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=285269de442b5d93750e617fe2839723bf376cd9;hb=9c045eb230d3b294af134ce743669059dcb2f128;hp=edebe2d6e5fed97d20397b6341d3683990de6eb1;hpb=8effa313da900da0f8fd20d1b081587c842a085e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index edebe2d..285269d 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -604,65 +604,36 @@ SYMH = perlvars.h intrpvar.h thrdvar.h
 CHMOD_W = chmod +w
 
 # The following files are generated automatically
+#	keywords.pl:	keywords.h
+#	opcode.pl:	opcode.h opnames.h pp_proto.h pp.sym
+# [* embed.pl needs pp.sym generated by opcode.pl! *]
+#	embed.pl:	proto.h embed.h embedvar.h global.sym objXSUB.h
+#			perlapi.h perlapi.c pod/perlintern.pod
+#			pod/perlapi.pod
+#	bytecode.pl:	ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c
+#			ext/B/B/Asmdata.pm
+#	regcomp.pl:	regnodes.h
+#	warnings.pl:	warnings.h lib/warnings.pm
 # The correct versions should be already supplied with the perl kit,
 # in case you don't have perl available.
 # To force them to be regenerated, type
 #	make regen_headers
 
-KEYWORDS_PL_GEN	= keywords.h
-
-OPCODE_PL_GEN = opcode.h opnames.h pp_proto.h pp.sym
-
-# embed.pl needs pp.sym generated by opcode.pl
-
-EMBED_PL_GEN = proto.h embed.h embedvar.h global.sym objXSUB.h \
-		perlapi.h perlapi.c pod/perlintern.pod pod/perlapi.pod
-
-BYTECODE_PL_GEN = ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c \
-		ext/B/B/Asmdata.pm
-
-REGCOMP_PL_GEN = regnodes.h
-
-WARNINGS_PL_GEN = warnings.h lib/warnings.pm
-
-# End of automatically generated files.
-# Beginning of rules to generate them on request.
-
-AUTOGEN_FILES = $(KEYWORDS_PL_GEN) $(OPCODE_PL_GEN) $(EMBED_PL_GEN) \
-		$(BYTECODE_PL_GEN) $(REGCOMP_PL_GEN) $(WARNINGS_PL_GEN)
+AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \
+		embed.h embedvar.h global.sym \
+		pod/perlintern.pod pod/perlapi.pod \
+		objXSUB.h perlapi.h perlapi.c ext/ByteLoader/byterun.h \
+		ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \
+		warnings.h lib/warnings.pm
 
 regen_headers:	FORCE
-	$(CHMOD_W) $(AUTOGEN_FILES)
-	perl keywords.pl
-	perl opcode.pl
-	perl embed.pl
-	perl bytecode.pl
-	perl regcomp.pl
-	perl warnings.pl
-
-$(KEYWORDS_PL_GEN): keywords.pl FORCE
-	$(CHMOD_W) $(KEYWORDS_PL_GEN)
-	perl keywords.pl
-
-$(OPCODE_PL_GEN): opcode.pl FORCE
-	$(CHMOD_W) $(OPCODE_PL_GEN)
-	perl opcode.pl
-
-$(EMBED_PL_GEN): embed.pl FORCE
-	$(CHMOD_W) $(EMBED_PL_GEN)
-	perl embed.pl
-
-$(BYTECODE_PL_GEN): bytecode.pl FORCE
-	$(CHMOD_W) $(BYTECODE_PL_GEN)
-	perl bytecode.pl
-
-$(REGCOMP_PL_GEN): regcomp.pl FORCE
-	$(CHMOD_W) $(REGCOMP_PL_GEN)
-	perl regcomp.pl
-
-$(WARNINGS_PL_GEN): warnings.pl FORCE
-	$(CHMOD_W) $(WARNINGS_PL_GEN)
-	perl warnings.pl
+	-$(CHMOD_W) $(AUTOGEN_FILES)
+	-perl keywords.pl
+	-perl opcode.pl
+	-perl embed.pl
+	-perl bytecode.pl
+	-perl regcomp.pl
+	-perl warnings.pl
 
 # Extensions:
 # Names added to $(dynamic_ext) or $(static_ext) or $(nonxs_ext) will
@@ -725,7 +696,7 @@ _cleaner:
 	-@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
 	$(LDLIBPTH) sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \
 	done
-	rm -f *.orig */*.orig *~ */*~ core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/tmp* t/c t/perl so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) .nfs* .*.c
+	rm -f *.orig */*.orig *~ */*~ core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/tmp* t/c t/perl .?*.c so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
 	rm -rf $(addedbyconf)
 	rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
 	rm -f $(private)
@@ -812,6 +783,9 @@ okfile:	utilities
 nok:	utilities
 	$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)'
 
+nokfile:	utilities
+	$(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok
+
 clist:	$(c)
 	echo $(c) | tr ' ' $(TRNL) >.clist