do subname() is deprecated, so update this hunk of test dating from perl 1.

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

diff --git a/Makefile.SH b/Makefile.SH
index 623064a..db2bfe0 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -181,6 +181,7 @@ esac
 
 : Prepare dependency lists for Makefile.
 dynamic_list=' '
+dynamic_ext_re="lib/auto/re/re.$dlext"
 extra_dep=''
 for f in $dynamic_ext; do
     : the dependency named here will never exist
@@ -313,6 +314,7 @@ MINIPERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib
 
 #
 dynamic_ext = $dynamic_list
+dynamic_ext_re = $dynamic_ext_re
 static_ext = $static_list
 nonxs_ext = $nonxs_list
 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
@@ -477,7 +479,7 @@ obj = $(ndt_obj) $(DTRACE_O)
 perltoc_pod_prereqs = extra.pods pod/perlapi.pod pod/perldelta.pod pod/perlintern.pod pod/perlmodlib.pod
 generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
 
-Icwd = -Iext/Cwd -Iext/Cwd/lib
+Icwd = -Icpan/Cwd -Icpan/Cwd/lib
 
 lintflags = \
     -b \
@@ -979,7 +981,7 @@ x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
 unidatafiles $(unidatafiles): uni.data
 
 uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
-       $(MINIPERL) -Iext/Cwd/lib lib/unicore/mktables -C lib/unicore -w
+       $(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -w
        touch uni.data
 
 # perl$(EXE_EXT) and ext because buildtoc uses Text::Wrap uses re
@@ -994,8 +996,8 @@ pod/perlapi.pod pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc
 pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
        $(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
 
-pod/perldelta.pod: pod/perl5110delta.pod
-       $(LNS) perl5110delta.pod pod/perldelta.pod
+pod/perldelta.pod: pod/perl5111delta.pod
+       $(LNS) perl5111delta.pod pod/perldelta.pod
 
 extra.pods: $(MINIPERL_EXE)
        -@test ! -f extra.pods || rm -f `cat extra.pods`
@@ -1019,7 +1021,7 @@ extras.install: perl$(EXE_EXT)
        no-install install.perl install.man install.html
 
 META.yml:      Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm
-       $(MINIPERL) Porting/makemeta
+       PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib Porting/makemeta
 
 install-strip:
        $(MAKE) STRIPFLAGS=-s install DESTDIR="$(DESTDIR)"
@@ -1201,7 +1203,7 @@ _mopup:
        -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
        -rm -f perl$(EXE_EXT) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
        -rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old
-       -rm -f config.arch config.over $(DTRACE_H)
+       -rm -f config.arch config.over $(DTRACE_H) runtests
 
 # Do not 'make _tidy' directly.
 _tidy:
@@ -1226,7 +1228,10 @@ _cleaner1:
        sh $(CLEAN).sh ; \
        fi
        rm -f realclean.sh veryclean.sh
-       -@test ! -f ./$(MINIPERL_EXE) || $(MINIPERL) mkppport --clean
+       -for file in `find cpan dist ext -name ppport.h` ; do rm -f $$file; done
+
+# Dear POSIX, thanks for making the default to xargs to be
+# run once if nothhing is passed in. It is such a great help.
 
 # Some systems do not support "?", so keep these files separate.
 _cleaner2:
@@ -1261,7 +1266,7 @@ _cleaner2:
        -rm -f lib/ExtUtils/ParseXS/t/libXSTest.dll.a
 
 _realcleaner:
-       @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean
+       @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=distclean
        @$(LDLIBPTH) $(MAKE) _cleaner2
 
 _verycleaner:
@@ -1302,7 +1307,7 @@ makedepend: makedepend.SH config.sh
        sh ./makedepend.SH
 
 .PHONY: test check test_prep test_prep_nodll test_prep_pre \
-       test_tty test-tty test_notty test-notty \
+       test_prep_reonly test_tty test-tty test_notty test-notty \
        utest ucheck test.utf8 check.utf8 test.torture torturetest \
        test.utf16 check.utf16 utest.utf16 ucheck.utf16 \
        test.third check.third utest.third ucheck.third test_notty.third \
@@ -1323,6 +1328,10 @@ test_prep_pre: preplibrary utilities $(nonxs_ext)
 test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
        cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT))
 
+test_prep_reonly: $(MINIPERL_EXE) perl$(EXE_EXT) $(dynamic_ext_re) $(TEST_PERL_DLL)
+       $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
+       cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT))
+
 test check: test_prep
        ./runtests choose
 
@@ -1422,7 +1431,7 @@ test_harness: test_prep
 test_harness_notty: test_prep
        HARNESS_NOTTY=1 TESTFILE=harness ./runtests choose
 
-test-reonly: test_prep
+test-reonly: test_prep_reonly
        TEST_ARGS='-re \bre\/' TESTFILE=harness ./runtests choose
 
 # Handy way to run perlbug -ok without having to install and run the