Use the new use vars feature.

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

diff --git a/Makefile.SH b/Makefile.SH
index 3c6e8e3..7c160d9 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1,5 +1,5 @@
 #! /bin/sh
-case $CONFIGDOTSH in
+case $PERL_CONFIG_SH in
 '')
        if test -f config.sh
                then TOP=.
@@ -129,15 +129,6 @@ case "$osname" in
        ;;
 esac
 
-case "$usedl" in
-define) testreqext="$testreqext \$(DYNALOADER)" ;;
-esac
-
-case "$DPERL_EXTERNAL_GLOB" in
-"") ;;
-*) testreqext="$testreqext \$(EXTGLOB)" ;;
-esac
-
 echo "Extracting Makefile (with variable substitutions)"
 $spitshell >Makefile <<!GROK!THIS!
 # Makefile.SH
@@ -158,7 +149,8 @@ CLDFLAGS = $ldflags
 mallocsrc = $mallocsrc
 mallocobj = $mallocobj
 LNS = $lns
-CPS = $cp -f
+# NOTE: some systems don't grok "cp -f". XXX Configure test needed?
+CPS = $cp
 RMS = rm -f
 ranlib = $ranlib
 
@@ -195,9 +187,6 @@ static_ext = $static_list
 nonxs_ext = $nonxs_list
 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
-EXTGLOB = lib/auto/File/Glob/Glob\$(DLSUFFIX)
-
-TESTREQEXT = $testreqext
 
 libs = $perllibs $cryptlib
 
@@ -575,7 +564,7 @@ sperl$(OBJ_EXT): perl.c $(h)
 # We have to call our ./makedir because Ultrix 4.3 make can't handle the line
 #      test -d lib/auto || mkdir lib/auto
 #
-preplibrary: miniperl lib/Config.pm
+preplibrary: miniperl lib/Config.pm lib/lib.pm lib/re.pm
        @sh ./makedir lib/auto
        @echo " AutoSplitting perl library"
        $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
@@ -617,7 +606,7 @@ extra.pods: miniperl
 install-strip:
        $(MAKE) STRIPFLAGS=-s install
 
-install:
+install install-all:
        $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS)
 
 install-verbose:
@@ -838,7 +827,7 @@ _cleaner2:
        rm -f h2ph.man pstruct
        rm -rf .config
        rm -f testcompile compilelog
-       -rmdir lib/B lib/Data lib/Digest lib/Encode lib/MIME lib/IO/Socket lib/IO lib/Filter/Util lib/PerlIO lib/Sys lib/Thread lib/XS
+       -rmdir lib/B lib/Data lib/Digest lib/Encode lib/IO/Socket lib/IO lib/Filter/Util lib/List lib/MIME lib/PerlIO lib/Scalar lib/Sys lib/Thread lib/XS
 
 _realcleaner: 
        @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean
@@ -889,32 +878,32 @@ test_prep: miniperl ./perl$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonx
        PERL=./perl $(MAKE) _test_prep
 
 _test_tty:
-       cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(UTF8) </dev/tty
+       cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(TEST_ARGS) </dev/tty
 
 _test_notty:
-       cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(UTF8)
+       cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(TEST_ARGS)
 
 # The second branch is for testing without a tty or controlling terminal,
 # see t/op/stat.t
 _test:
        if (true </dev/tty) >/dev/null 2>&1; then \
-         $(MAKE) _test_tty; \
+         $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_tty   ; \
        else \
-         $(MAKE) _test_notty; \
+         $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_notty ; \
        fi
        @echo "Ran tests" > t/rantests
 
-test check: test_prep $(TESTREQEXT)
+test check: test_prep
        PERL=./perl $(MAKE) _test
 
-test_tty: test_prep $(TESTREQEXT)
+test_tty: test_prep
        PERL=./perl $(MAKE) _test_tty
 
-test_notty: test_prep $(TESTREQEXT)
+test_notty: test_prep
        PERL=./perl $(MAKE) _test_notty
 
-utest ucheck: test_prep $(TESTREQEXT)
-       PERL=./perl UTF8=-utf8 $(MAKE) _test
+utest ucheck: test_prep
+       PERL=./perl TEST_ARGS=-utf8 $(MAKE) _test
 
 test-prep:     test_prep
 
@@ -927,15 +916,23 @@ test-notty:       test_notty
 test_prep.third: test_prep perl.third
        PERL=./perl.third $(MAKE) _test_prep
 
-test.third check.third:        test_prep.third perl.third $(TESTREQEXT)
+test.third check.third:        test_prep.third perl.third
        PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 $(MAKE) _test
 
-utest.third ucheck.third: test_prep.third perl.third $(TESTREQEXT)
-       PERL=./perl.third PERL_DEBUG=PERL_3LOG=1UTF=-utf8 $(MAKE) _test
+utest.third ucheck.third: test_prep.third perl.third
+       PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 TEST_ARGS=-utf8 $(MAKE) _test
 
-test_notty.third: test_prep.third perl.third $(TESTREQEXT)
+test_notty.third: test_prep.third perl.third
        PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty
 
+# Targets for Deparse testing.
+
+test.deparse:  test_prep
+       PERL=./perl TEST_ARGS=-deparse $(MAKE) _test
+
+test_notty.deparse:    test_prep
+       PERL=./perl TEST_ARGS=-deparse $(MAKE) _test_notty
+
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.
 minitest: miniperl lib/re.pm