X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/869a466cf7062796cfbd8ca60b14dd0054b144eb..b1f5ad7d40aebe965318c54b3def2054baf2c501:/Makefile.SH diff --git a/Makefile.SH b/Makefile.SH index acf2ac6..77ed8fe 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*) @@ -99,6 +100,16 @@ true) ;; esac +case "`pwd`" in +# Protect any spaces +*" "*) ldlibpth=`echo $ldlibpth|sed 's/ /\\\\ /g'` ;; +esac + +case "$osname" in +os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" + ;; +esac + : Prepare dependency lists for Makefile. dynamic_list=' ' for f in $dynamic_ext; do @@ -189,7 +200,7 @@ DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) libs = $perllibs $cryptlib -public = perl $suidperl utilities translators +public = perl\$(EXE_EXT) $suidperl utilities translators shellflags = $shellflags @@ -197,6 +208,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 @@ -209,7 +222,7 @@ FIRSTMAKEFILE = $firstmakefile # Any special object files needed by this architecture, e.g. os2/os2.obj ARCHOBJS = $archobjs -.SUFFIXES: .c \$(OBJ_EXT) +.SUFFIXES: .c \$(OBJ_EXT) .i .s # grrr SHELL = $sh @@ -217,19 +230,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) $@` -private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm +CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $<` + +private = preplibrary lib/Config.pm lib/ExtUtils/Miniperl.pm # Files to be built with variable substitution before miniperl # is available. @@ -263,13 +299,13 @@ 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 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) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) @@ -288,11 +324,17 @@ lintflags = -hbvxac .c$(OBJ_EXT): $(CCCMD) $(PLDLFLAGS) $*.c +.c.i: + $(CCCMDSRC) -E $*.c > $*.i + +.c.s: + $(CCCMDSRC) -S $*.c + .PHONY: all compile translators utilities -all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) +all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make @echo " "; - @echo " Everything is up to date. 'make test' to run test suite." + @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." compile: all echo "testing compilation" > testcompile; @@ -300,10 +342,10 @@ compile: all cd x2p; $(MAKE) compile; cd pod; $(MAKE) compile; -translators: miniperl lib/Config.pm FORCE +translators: miniperl$(EXE_EXT) lib/Config.pm FORCE @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all -utilities: miniperl lib/Config.pm $(plextract) lib/lib.pm FORCE +utilities: miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all @@ -464,26 +506,26 @@ $(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! ;; *) $spitshell >>Makefile <<'!NO!SUBS!' -miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) +miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) -@rm -f miniperl.xok $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) @@ -494,19 +536,19 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) $spitshell >>Makefile <<'!NO!SUBS!' -perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) +perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) -@rm -f miniperl.xok - $(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILING) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) + $(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # Purify/Quantify Perls. -pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) +pureperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) +purecovperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) +quantperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # Third Degree Perl (Tru64 only) @@ -560,9 +602,26 @@ perl.gprof.config: config.sh perl.gprof: /usr/bin/gprof perl.gprof.config @-rm -f perl - $(MAKE) PERL_SUFFIX=.gprof PERL_PROFILING=-pg perl + $(MAKE) PERL_SUFFIX=.gprof PERL_PROFILE_LDFLAGS=-pg perl @echo "Now you may run perl.gprof and then run gprof perl.gprof." +# Gcov Perl + +perl.config.gcov: + @echo "To build perl.gcov you must use gcc 3.0 or newer, checking..." + @echo "Checking gccversion in config.sh..." + @grep "^gccversion=" config.sh + @grep "^gccversion='[3-9]\." config.sh >/dev/null || exit 1 + @echo "To build perl.gcov you must Configure -Dccflags=-fprofile-arcs -ftest-coverage, checking..." + @echo "Checking ccflags='-fprofile-arcs -ftest-coverage' in config.sh..." + @grep "^ccflags=" config.sh + @grep "^ccflags='.*-fprofile-arcs -ftest-coverage.*'" config.sh >/dev/null || exit 1 + +perl.gcov: perl.config.gcov + @-rm -f perl + $(MAKE) PERL_SUFFIX=.gcov PERL_PROFILE_LDFLAGS='' perl + @echo "Now you may run perl.gcov and then run gcov some.c." + # Microperl. This is just a convenience thing if one happens to # build also the full Perl and therefore the real big Makefile: # usually one should manually explicitly issue the below command. @@ -576,7 +635,7 @@ microperl: # checks as well as the special code to validate that the script in question # has been invoked correctly. -suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) +suidperl$(EXE_EXT): $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) -o suidperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) !NO!SUBS! @@ -595,36 +654,37 @@ 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$(EXE_EXT) 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$(EXE_EXT) configpm $(LDLIBPTH) ./miniperl configpm configpm.tmp sh mv-if-diff configpm.tmp $@ -lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm +lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) 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 +$(plextract): miniperl$(EXE_EXT) lib/Config.pm @-rm -f $@ $(LDLIBPTH) ./miniperl -Ilib $@.PL -lib/lib.pm: miniperl lib/Config.pm +lib/lib.pm: miniperl$(EXE_EXT) lib/Config.pm @-rm -f $@ $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL -extra.pods: miniperl +extra.pods: miniperl$(EXE_EXT) -@test -f extra.pods && rm -f `cat extra.pods` -@rm -f extra.pods -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ @@ -632,8 +692,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$(EXE_EXT) + -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` + +extras.test: perl$(EXE_EXT) + -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` + +extras.install: perl$(EXE_EXT) + -@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 @@ -661,6 +731,7 @@ install.perl: all installperl else :; \ fi $(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS) + $(MAKE) extras.install install.man: all installman $(LDLIBPTH) ./perl installman $(INSTALLFLAGS) @@ -729,7 +800,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 @@ -741,35 +812,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 @@ -783,9 +829,10 @@ regen_headers: FORCE -perl bytecode.pl -perl regcomp.pl -perl warnings.pl + -perl autodoc.pl regen_pods: FORCE - -cd pod; $(LDLIBPTH) make regen_pods + -cd pod; $(LDLIBPTH) $(MAKE) regen_pods regen_all: $(PERLYVMS) regen_headers regen_pods @@ -799,16 +846,16 @@ regen_all: $(PERLYVMS) regen_headers regen_pods # # DynaLoader may be needed for extensions that use Makefile.PL. -$(DYNALOADER): miniperl preplibrary FORCE +$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -d_dummy $(dynamic_ext): miniperl preplibrary $(DYNALOADER) FORCE +d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE +s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -n_dummy $(nonxs_ext): miniperl preplibrary $(DYNALOADER) FORCE +n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ @@ -818,11 +865,11 @@ n_dummy $(nonxs_ext): miniperl preplibrary $(DYNALOADER) FORCE clean: _tidy _mopup realclean: _realcleaner _mopup - @echo "Note that make realclean does not delete config.sh or Policy.sh" + @echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh" _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 @@ -843,7 +890,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: @@ -865,7 +913,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) @@ -874,7 +922,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 @@ -917,35 +967,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$(EXE_EXT) 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 @@ -961,6 +1017,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 @@ -991,11 +1050,16 @@ test_notty.deparse: test_prep # Can't depend on lib/Config.pm because that might be where miniperl # is crashing. -minitest: miniperl lib/re.pm +minitest: miniperl$(EXE_EXT) lib/re.pm @echo "You may see some irrelevant test failures if you have been unable" @echo "to build lib/Config.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 pragma/*.t