Re: DBD::Sybase and Sybase::CTlib build problems w/ 5.8.1, Solaris, gcc

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 8656207..713b2a3 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -310,13 +310,11 @@ shextract = Makefile cflags config.h makeaperl makedepend \
 # available.  Dependencies handled manually below (for now).
 
 pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
-       pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL \
-       pod/buildtoc.PL
+       pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
 
 # lib/lib.pm is not listed here because it has a rule of its own.
 plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
-       pod/pod2usage pod/podchecker pod/podselect \
-       pod/buildtoc
+       pod/pod2usage pod/podchecker pod/podselect
 
 addedbyconf = UU $(shextract) $(plextract) lib/lib.pm pstruct
 
@@ -612,7 +610,7 @@ perl.valgrind.config: 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 --help >/dev/null || exit 1
+       valgrind ./perl -e 1 2>/dev/null || exit 1
 
 # Third Degree Perl (Tru64 only)
 
@@ -906,8 +904,8 @@ regen_all: $(PERLYVMS) regen regen_pods
 .PHONY:        manisort manicheck
 
 manisort:      FORCE
-       LC_ALL=C sort -fc MANIFEST || (echo "WARNING: re-sorting MANIFEST"; \
-               LC_ALL=C sort -fo MANIFEST MANIFEST)
+       LC_ALL=C sort -fdc MANIFEST || (echo "WARNING: re-sorting MANIFEST"; \
+               LC_ALL=C sort -fdo MANIFEST MANIFEST)
 
 manicheck:     FORCE
        perl Porting/manicheck
@@ -1057,7 +1055,7 @@ makedepend: makedepend.SH config.sh
        utest ucheck test.utf8 check.utf8 test.torture torturetest \
        test.third check.third utest.third ucheck.third test_notty.third \
        test.deparse test_notty.deparse test_harness test_harness_notty \
-       test.bytecompile minitest coretest
+       test.bytecompile minitest coretest test.taintwarn
 
 # Cannot delegate rebuilding of t/perl to make
 # to allow interlaced test and minitest
@@ -1157,6 +1155,11 @@ test.deparse:    test_prep
 test_notty.deparse:    test_prep
        PERL=./perl TEST_ARGS=-deparse $(MAKE) _test_notty
 
+# Targets to run the test suite with -t
+
+test.taintwarn:        test_prep
+       PERL=./perl TEST_ARGS=-taintwarn $(MAKE) _test
+
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.
 minitest: miniperl$(EXE_EXT) lib/re.pm