X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=63f7417eb9b13178fe477669b3869591df52f295;hb=7207e29d564e32c8ec2cb43eabae72ff68c02442;hp=2df7ac8c6d202497da0fff345deeafd7baca4e9b;hpb=51a35ef15409e6e7977aa76e82c32623afd8b3ae;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index 2df7ac8..63f7417 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -45,9 +45,10 @@ true) ;; rhapsody*|darwin*) shrpldflags="${ldflags} -dynamiclib \ - -compatibility_version 1 \ + -compatibility_version \ + ${api_revision}.${api_version}.${api_subversion} \ -current_version \ - ${api_version}.${api_subversion} \ + ${revision}.${patchlevel}.${subversion} \ -install_name \$(shrpdir)/\$@" ;; cygwin*) @@ -197,6 +198,8 @@ shellflags = $shellflags # do it for you. $make_set_make +# Mention $gmake here so it gets probed for by Configure. + # These variables may need to be manually set for non-Unix systems. AR = $full_ar EXE_EXT = $_exe @@ -217,21 +220,42 @@ SHELL = $sh # how to tr(anslate) newlines TRNL = '$trnl' +OPTIMIZE = $optimize + +EXTRAS = $extras + +INSTALLPREFIXEXP = $prefix + !GROK!THIS! # not used by Makefile but by installperl; # mentioned here so that metaconfig picks these up # $installusrbinperl # $versiononly +case "${osname}:${osvers}" in +darwin:*) +$spitshell >>Makefile <>Makefile <<'!NO!SUBS!' -CCCMD = `sh $(shellflags) cflags $(LIBPERL) $@` +CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $@` -CCCMDSRC = `sh $(shellflags) cflags $(LIBPERL) $<` +CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $<` -private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm +private = preplibrary lib/Config.pm lib/ExtUtils/Miniperl.pm # Files to be built with variable substitution before miniperl # is available. @@ -259,19 +283,19 @@ 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 h3 = opcode.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 +h5 = utf8.h warnings.h sharedsv.h h = $(h1) $(h2) $(h3) $(h4) $(h5) c1 = $(mallocsrc) av.c scope.c op.c doop.c doio.c dump.c hv.c mg.c c2 = perl.c perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c universal.c xsutils.c -c4 = globals.c perlio.c perlapi.c numeric.c locale.c pp_pack.c +c4 = globals.c perlio.c perlapi.c numeric.c locale.c pp_pack.c pp_sort.c sharedsv.c c = $(c1) $(c2) $(c3) $(c4) miniperlmain.c perlmain.c obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) -obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) xsutils$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) +obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) xsutils$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) sharedsv$(OBJ_EXT) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) @@ -298,7 +322,7 @@ lintflags = -hbvxac .PHONY: all compile translators utilities -all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) +all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make @echo " "; @echo " Everything is up to date. 'make test' to run test suite." @@ -472,19 +496,19 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) !NO!SUBS! case "${osname}${osvers}" in - next4*) + aix*) $spitshell >>Makefile <<'!NO!SUBS!' miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) - $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + $(CC) -o miniperl $(CLDFLAGS) \ + `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; - aix*) + beos*|next4*) $spitshell >>Makefile <<'!NO!SUBS!' miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) - $(CC) -o miniperl $(CLDFLAGS) \ - `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! @@ -620,26 +644,27 @@ sperl$(OBJ_EXT): perl.c $(h) # test -d lib/auto || mkdir lib/auto # .PHONY: preplibrary -preplibrary: miniperl lib/Config.pm lib/lib.pm lib/re.pm +preplibrary: miniperl lib/Config.pm lib/lib.pm @sh ./makedir lib/auto @echo " AutoSplitting perl library" $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm + $(MAKE) lib/re.pm # Take care to avoid modifying lib/Config.pm without reason # (If trying to create a new port and having problems with the configpm script, # try 'make minitest' and/or commenting out the tests at the end of configpm.) -lib/Config.pm: config.sh miniperl configpm lib/re.pm +lib/Config.pm: config.sh miniperl configpm $(LDLIBPTH) ./miniperl configpm configpm.tmp sh mv-if-diff configpm.tmp $@ lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp sh mv-if-diff minimod.tmp $@ + -touch lib/ExtUtils/Miniperl.pm lib/re.pm: ext/re/re.pm - @-rm -f $@ - cat ext/re/re.pm > $@ + cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm $(plextract): miniperl lib/Config.pm @-rm -f $@ @@ -657,8 +682,18 @@ extra.pods: miniperl cd pod ; $(LNS) ../$$x "perl"$$nx".pod" ; cd .. ; \ echo "pod/perl"$$nx".pod" >> extra.pods ; \ done + -@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 +extras.make: perl + -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` + +extras.test: perl + -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` + +extras.install: perl + -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` + .PHONY: install install-strip install-all install-verbose install-silent \ no-install install.perl install.man installman install.html installhtml @@ -686,6 +721,7 @@ install.perl: all installperl else :; \ fi $(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS) + $(MAKE) extras.install install.man: all installman $(LDLIBPTH) ./perl installman $(INSTALLFLAGS) @@ -754,7 +790,7 @@ CHMOD_W = chmod +w # keywords.pl: keywords.h # opcode.pl: opcode.h opnames.h pp_proto.h pp.sym # [* embed.pl needs pp.sym generated by opcode.pl! *] -# embed.pl: proto.h embed.h embedvar.h global.sym objXSUB.h +# embed.pl: proto.h embed.h embedvar.h global.sym # perlapi.h perlapi.c pod/perlintern.pod # pod/perlapi.pod # bytecode.pl: ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c @@ -766,35 +802,10 @@ CHMOD_W = chmod +w # To force them to be regenerated, type # make regen_headers -keywords.h: keywords.pl - -perl keywords.pl - -OPCODE_PL_OUTPUT = opcode.h opnames.h pp_proto.h pp.sym - -$(OPCODE_PL_OUTPUT): opcode.pl - -perl opcode.pl - -# Really the prerequisites for the next rule should only be "embed.pl pp.sym" -# Writing it this way gives make a big hint to always run opcode.pl before -# embed.pl. The alternative - running embed.pl then opcode.pl causes embed.pl -# to be re-run next make invocation, and then all object files get recompiled. - -proto.h embed.h embedvar.h global.sym objXSUB.h perlapi.h perlapi.c pod/perlintern.pod pod/perlapi.pod: embed.pl $(OPCODE_PL_OUTPUT) - -perl embed.pl - -ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm: bytecode.pl - -perl bytecode.pl - -regnodes.h: regcomp.pl - -perl regcomp.pl - -warnings.h lib/warnings.pm: warnings.pl - -perl warnings.pl - 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 \ - objXSUB.h perlapi.h perlapi.c ext/ByteLoader/byterun.h \ + perlapi.h perlapi.c ext/ByteLoader/byterun.h \ ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \ warnings.h lib/warnings.pm @@ -828,13 +839,9 @@ $(DYNALOADER): miniperl preplibrary FORCE @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) d_dummy $(dynamic_ext): miniperl preplibrary $(DYNALOADER) FORCE - @-rm -f lib/re.pm - @cat ext/re/re.pm > lib/re.pm @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE - @-rm -f lib/re.pm - @cat ext/re/re.pm > lib/re.pm @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl preplibrary $(DYNALOADER) FORCE @@ -851,7 +858,7 @@ realclean: _realcleaner _mopup _clobber: -@rm -f Cross/run-* Cross/to-* Cross/from-* - rm -f config.sh cppstdin Policy.sh + rm -f config.sh cppstdin Policy.sh extras.lst clobber: _realcleaner _mopup _clobber @@ -872,7 +879,8 @@ _mopup: -rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log -rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok - rm -f perl suidperl miniperl $(LIBPERL) libperl.* microperl + -rm -f perlld cygwin.c ld2 libperl*.def libperl*.dll + rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl # Do not 'make _tidy' directly. _tidy: @@ -894,7 +902,7 @@ _cleaner1: done _cleaner2: - rm -f core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/forktmp* t/tmp* t/c t/perl t/rantests .?*.c so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) + rm -f core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/forktmp* t/tmp* t/c t/perl$(EXE_EXT) t/rantests .?*.c so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old rm -f $(private) @@ -903,7 +911,9 @@ _cleaner2: rm -f h2ph.man pstruct rm -rf .config rm -f testcompile compilelog - -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 + -rmdir lib/B lib/Data lib/Digest lib/Encode lib/IO/Socket lib/IO/t lib/IO + -rmdir lib/Filter/Util lib/List lib/MIME lib/PerlIO lib/Scalar lib/Sys + -rmdir lib/Thread lib/XS _realcleaner: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean @@ -946,35 +956,41 @@ depend: makedepend makedepend: makedepend.SH config.sh sh ./makedepend.SH -.PHONY: test check test_prep _test_prep \ +.PHONY: test check test_prep test_prep_nodll test_prep_pre _test_prep \ test_tty test-tty _test_tty test_notty test-notty _test_notty \ utest ucheck test.utf8 check.utf8 \ test.third check.third utest.third ucheck.third test_notty.third \ test.deparse test_notty.deparse \ - minitest + minitest coretest # Cannot delegate rebuilding of t/perl to make # to allow interlaced test and minitest -_test_prep: $(PERL)$(EXE_EXT) +TESTFILE=TEST + +_test_prep: cd t && (rm -f $(PERL)$(EXE_EXT); $(LNS) ../$(PERL)$(EXE_EXT) $(PERL)$(EXE_EXT)) -test_prep: miniperl ./perl$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonxs_ext) $(TEST_PERL_DLL) +# Architecture-neutral stuff: + +test_prep_pre: preplibrary utilities $(nonxs_ext) + +test_prep: test_prep_pre miniperl perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) PERL=./perl $(MAKE) _test_prep _test_tty: - cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(TEST_ARGS) /dev/null 2>&1; then \ - $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_tty ; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_tty ; \ else \ - $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_notty ; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_notty ; \ fi @echo "Ran tests" > t/rantests @@ -990,6 +1006,9 @@ test_notty: test_prep utest ucheck test.utf8 check.utf8: test_prep PERL=./perl TEST_ARGS=-utf8 $(MAKE) _test +coretest: test_prep + PERL=./perl TEST_ARGS=-core $(MAKE) _test + test-prep: test_prep test-tty: test_tty @@ -998,7 +1017,7 @@ test-notty: test_notty # Targets for Third Degree testing. -test_prep.third: test_prep perl.third +test_prep.third: test_prep perl.third perl.third$(EXE_EXT) PERL=./perl.third $(MAKE) _test_prep test.third check.third: test_prep.third perl.third @@ -1026,6 +1045,11 @@ minitest: miniperl lib/re.pm - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ && $(LDLIBPTH) ./perl TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t