Add PERLIO_INIT and PERLIO_TERM to PERL_SYS_INIT* and PERL_SYS_TERM*

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

diff --git a/Makefile.SH b/Makefile.SH
index 099fed2..b3db72e 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -156,6 +156,13 @@ esac
 : Prepare dependency lists for Makefile.
 dynamic_list=' '
 extra_dep=''
+case "$d_cplusplus" in
+define)
+  : delete as a function name will not work.
+  dynamic_ext=`echo $dynamic_ext | sed 's/ODBM_File//'`
+  static_ext=`echo $static_ext | sed 's/ODBM_File//'`
+  ;;
+esac
 for f in $dynamic_ext; do
     : the dependency named here will never exist
       base=`echo "$f" | sed 's/.*\///'`
@@ -443,13 +450,7 @@ all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $
        @echo " ";
        @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
 
-.PHONY: all compile translators utilities
-
-compile: all
-       echo "testing compilation" > testcompile;
-       cd utils;  $(MAKE) compile;
-       cd x2p; $(MAKE) compile;
-       cd pod; $(MAKE) compile;
+.PHONY: all translators utilities
 
 translators:   miniperl$(EXE_EXT) $(CONFIGPM) FORCE
        @echo " "; echo "       Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
@@ -858,7 +859,7 @@ extra.pods: miniperl$(EXE_EXT)
        -@rm -f pod/perlvms.pod
        -@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods
        -@rm -f pod/perldelta.pod
-       -@test -f pod/perl594delta.pod && cd pod && $(LNS) perl594delta.pod perldelta.pod && cd .. && echo "pod/perldelta.pod" >> extra.pods # See buildtoc
+       -@test -f pod/perl595delta.pod && cd pod && $(LNS) perl595delta.pod perldelta.pod && cd .. && echo "pod/perldelta.pod" >> extra.pods # See buildtoc
 
 extras.make: perl$(EXE_EXT)
        -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst`
@@ -894,13 +895,6 @@ no-install:
 INSTALL_DEPENDENCE = all
 
 install.perl:  $(INSTALL_DEPENDENCE) installperl
-       if [ -n "$(COMPILE)" ]; \
-       then \
-               cd utils; $(MAKE) compile; \
-               cd ../x2p; $(MAKE) compile; \
-               cd ../pod; $(MAKE) compile; \
-       else :; \
-       fi
        $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
        $(MAKE) extras.install
 
@@ -963,8 +957,6 @@ CHMOD_W = chmod +w
 
 # The following files are generated automatically
 #      autodoc.pl:     pod/perlapi.pod pod/perlintern.pod
-#      bytecode.pl:    ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c
-#                      ext/B/B/Asmdata.pm
 #      embed.pl:       proto.h embed.h embedvar.h global.sym
 #                      perlapi.h perlapi.c 
 # [* embed.pl needs pp.sym generated by opcode.pl! *]
@@ -982,8 +974,7 @@ CHMOD_W = chmod +w
 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 \
-               perlapi.h perlapi.c ext/ByteLoader/byterun.h \
-               ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \
+               perlapi.h perlapi.c regnodes.h \
                warnings.h lib/warnings.pm
 
 .PHONY: regen_headers regen_pods regen_all
@@ -1084,7 +1075,6 @@ _tidy:
        -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
        $(LDLIBPTH) sh ext/util/make_ext clean $$x MAKE=$(MAKE) ; \
        done
-       rm -f testcompile compilelog
 
 _cleaner1:
        -cd os2; rm -f Makefile
@@ -1111,7 +1101,6 @@ _cleaner2:
        rm -f h2ph.man pstruct
        rm -rf .config
        rm -f preload
-       rm -f testcompile compilelog
        rm -rf lib/Encode lib/Compress lib/Hash
        rm -rf lib/IO/Compress lib/IO/Uncompress
        rm -f lib/ExtUtils/ParseXS/t/XSTest.c
@@ -1169,7 +1158,7 @@ makedepend: makedepend.SH config.sh
        test.utf16 check.utf16 utest.utf16 ucheck.utf16 \
        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.taintwarn
+       minitest coretest test.taintwarn
 
 # Cannot delegate rebuilding of t/perl to make
 # to allow interlaced test and minitest
@@ -1268,11 +1257,6 @@ utest.third ucheck.third: test_prep.third perl.third
 test_notty.third: test_prep.third perl.third
        PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty
 
-# Targets for Bytecode/ByteLoader testing.
-
-test.bytecompile:      test_prep
-       PERL=./perl TEST_ARGS=-bytecompile $(MAKE) _test
-
 # Targets for Deparse testing.
 
 test.deparse:  test_prep