X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=d5684e5fc6c53547e1d8e3b5986e22682c7a8058;hb=f05e27e5b9aa3dce0aa1ab50210632677c656114;hp=ecd036b5c3965beb32cfc306da73d8e916ffe6d6;hpb=01f2eac450f9dfc91c650462d75a6bc8d7a0c65b;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index ecd036b..d5684e5 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -95,7 +95,7 @@ true) linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl" ;; os390*) - shrpldflags='-W l,dll' + shrpldflags='-W l,XPLINK,dll' linklibperl='libperl.x' DPERL_EXTERNAL_GLOB='' ;; @@ -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/.*\///'` @@ -199,7 +206,6 @@ CLDFLAGS = $ldflags mallocsrc = $mallocsrc mallocobj = $mallocobj -madlyh = $madlyh madlysrc = $madlysrc madlyobj = $madlyobj LNS = $lns @@ -355,7 +361,7 @@ h1 = EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h dosish.h h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h opcode.h h3 = pad.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h -h5 = utf8.h warnings.h $(madlyh) +h5 = utf8.h warnings.h h = $(h1) $(h2) $(h3) $(h4) $(h5) c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c perl.c @@ -443,13 +449,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 @@ -815,6 +815,10 @@ preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) autosplit_lib_modules(@ARGV)' lib/*/*.pm $(MAKE) lib/re.pm +.PHONY: makeppport +makeppport: miniperl$(EXE_EXT) $(CONFIGPM) + $(LDLIBPTH) ./miniperl -Ilib mkppport + lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm @@ -824,6 +828,7 @@ lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGP $(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm lib/re.pm: ext/re/re.pm + @-rm -f $@ cp ext/re/re.pm lib/re.pm $(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p @@ -854,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` @@ -890,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 @@ -928,10 +926,9 @@ install.html: all installhtml run_byacc: @echo "run_byacc is obsolete; try 'make regen_perly' instead" -# this outputs perly.h, perly.act, perly.tab, madly.h, madly.act and madly.tab +# this outputs perly.h, perly.act and perly.tab regen_perly: perl regen_perly.pl - perl regen_perly.pl madly.y # We don't want to regenerate perly.c and perly.h, but they might # appear out-of-date after a patch is applied or a new distribution is @@ -942,13 +939,6 @@ perly.c: perly.y perly.h: perly.y -@sh -c true -# Similary for madly. -madly.c: madly.y - -@sh -c true - -madly.h: madly.y - -@sh -c true - # No compat3.sym here since and including the 5.004_50. # No interp.sym since 5.005_03. SYM = global.sym globvar.sym perlio.sym pp.sym @@ -959,8 +949,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! *] @@ -978,8 +966,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 @@ -1014,10 +1001,10 @@ manicheck: FORCE $(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE +d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE +s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @@ -1080,7 +1067,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 @@ -1090,6 +1076,7 @@ _cleaner1: -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) sh ext/util/make_ext $(CLEAN) $$x MAKE=$(MAKE) ; \ done + $(LDLIBPTH) ./miniperl -Ilib mkppport --clean # Some systems do not support "?", so keep these files separate. _cleaner2: @@ -1106,7 +1093,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 @@ -1164,7 +1150,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 @@ -1263,11 +1249,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