Inline the Makefile target perl.valgrind.config into its only remaining user.

Add the 3 recently deleted Makefile targets to the list in perldelta.pod, and
reflow the list.

2 files changed, 16 insertions, 29 deletions

diff --git a/Makefile.SH b/Makefile.SH
index 89a03cfcc2..46c26205ca 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -914,25 +914,6 @@ $(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPOR
 	-@rm -f miniperl.xok
 	$(SHRPENV) $(LDLIBPTH) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
 
-!NO!SUBS!
-
-case "${osname}${osvers}" in
-linux*|darwin*)
-	$spitshell >>$Makefile <<'!NO!SUBS!'
-# Valgrind perl (currently Linux, Darwin only)
-
-perl.valgrind.config: config.sh
-	@echo "Checking usemymalloc='n' in config.sh..."
-	@grep "^usemymalloc="    config.sh
-	@grep "^usemymalloc='n'" config.sh >/dev/null || exit 1
-	@echo "And of course you have to have valgrind..."
-	$(VALGRIND) $(VG_TEST) || exit 1
-!NO!SUBS!
-	;;
-esac	
-
-$spitshell >>$Makefile <<'!NO!SUBS!'
-
 # Microperl.  This is just a convenience thing if one happens to
 # build also the full Perl and therefore the real big Makefile:
 # usually one should manually explicitly issue the below command.
@@ -1375,7 +1356,12 @@ linux*|darwin*)
 	$spitshell >>$Makefile <<'!NO!SUBS!'
 # Targets for valgrind testing:
 
-test.valgrind check.valgrind:	test_prep perl.valgrind.config
+test.valgrind check.valgrind:	test_prep
+	@echo "Checking usemymalloc='n' in config.sh..."
+	@grep "^usemymalloc="    config.sh
+	@grep "^usemymalloc='n'" config.sh >/dev/null || exit 1
+	@echo "And of course you have to have valgrind..."
+	$(VALGRIND) $(VG_TEST) || exit 1
 	PERL_VALGRIND=1 VALGRIND='$(VALGRIND)' $(RUN_TESTS) choose
 !NO!SUBS!
 	;;
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 84db0e51c3..137b242b32 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -368,15 +368,16 @@ profiling targets have been removed, or merged into the only other Makefile
 target that uses them.  Specifically, these targets are gone, along with
 documentation that referenced them or explained how to use them:
 
- check.third check.utf16 check.utf8 coretest minitest.prep
- minitest.utf16 perl.config.dashg perl.config.dashpg
- perl.config.gcov perl.gcov perl.gprof perl.gprof.config perl.pixie
- perl.pixie.atom perl.pixie.config perl.pixie.irix perl.third
- perl.third.config pureperl purecovperl quantperl test.deparse
- test.taintwarn test.third test.torture test.utf16 test.utf8
- test_notty.deparse test_notty.third test_prep.third torturetest
- ucheck ucheck.third ucheck.utf16 ucheck.valgrind utest utest.third
- utest.utf16 utest.valgrind
+    check.third check.utf16 check.utf8 coretest minitest.prep
+    minitest.utf16 perl.config.dashg perl.config.dashpg
+    perl.config.gcov perl.gcov perl.gprof perl.gprof.config
+    perl.pixie perl.pixie.atom perl.pixie.config perl.pixie.irix
+    perl.third perl.third.config perl.valgrind.config purecovperl
+    pureperl quantperl test.deparse test.taintwarn test.third
+    test.torture test.utf16 test.utf8 test_notty.deparse
+    test_notty.third test_notty.valgrind test_prep.third
+    test_prep.valgrind torturetest ucheck ucheck.third ucheck.utf16
+    ucheck.valgrind utest utest.third utest.utf16 utest.valgrind
 
 It's still possible to run the relevant commands by "hand" - no underlying
 functionality has been removed.