X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=2de7fe6c215fcac1377dabe4d501790cb50379aa;hb=64420d0dad7f104a674beb20cf3622ce16388536;hp=fbfd531e695a3c8f5d46689f8f89cd9f1a9779c1;hpb=719561de565da48e5025010fde615e18739f36ef;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index fbfd531..2de7fe6 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1,5 +1,5 @@ #! /bin/sh -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh then TOP=. @@ -26,7 +26,7 @@ ldlibpth='' DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' case "$useshrplib" in true) - # Prefix all runs of 'miniperl' and 'perl' with + # Prefix all runs of 'miniperl' and 'perl' with # $ldlibpth so that ./perl finds *this* shared libperl. case "$LD_LIBRARY_PATH" in '') @@ -45,10 +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} \ - -image_base 0x4be00000 \ + ${revision}.${patchlevel}.${subversion} \ -install_name \$(shrpdir)/\$@" ;; cygwin*) @@ -149,7 +149,8 @@ CLDFLAGS = $ldflags mallocsrc = $mallocsrc mallocobj = $mallocobj LNS = $lns -CPS = $cp -f +# NOTE: some systems don't grok "cp -f". XXX Configure test needed? +CPS = $cp RMS = rm -f ranlib = $ranlib @@ -209,7 +210,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,6 +218,12 @@ 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 @@ -227,7 +234,9 @@ TRNL = '$trnl' ## In the following dollars and backticks do not need the extra backslash. $spitshell >>Makefile <<'!NO!SUBS!' -CCCMD = `sh $(shellflags) cflags $(LIBPERL) $@` +CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $@` + +CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $<` private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm @@ -263,13 +272,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 +c4 = globals.c perlio.c perlapi.c numeric.c locale.c pp_pack.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) +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) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) @@ -288,14 +297,22 @@ lintflags = -hbvxac .c$(OBJ_EXT): $(CCCMD) $(PLDLFLAGS) $*.c -all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) +.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) extras.make @echo " "; @echo " Everything is up to date. 'make test' to run test suite." compile: all echo "testing compilation" > testcompile; cd utils; $(MAKE) compile; - cd x2p; $(MAKE) compile; + cd x2p; $(MAKE) compile; cd pod; $(MAKE) compile; translators: miniperl lib/Config.pm FORCE @@ -310,6 +327,7 @@ utilities: miniperl lib/Config.pm $(plextract) lib/lib.pm FORCE # Phony target to force checking subdirectories. # Apparently some makes require an action for the FORCE target. +.PHONY: FORCE FORCE: @sh -c true !NO!SUBS! @@ -481,6 +499,7 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) *) $spitshell >>Makefile <<'!NO!SUBS!' miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) + -@rm -f miniperl.xok $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest @@ -491,7 +510,8 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) $spitshell >>Makefile <<'!NO!SUBS!' perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) - $(SHRPENV) $(LDLIBPTH) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) + -@rm -f miniperl.xok + $(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. @@ -507,25 +527,26 @@ quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs # Third Degree Perl (Tru64 only) perl.config.dashg: - @echo "Checking optimize='-g'..." - @grep "^optimize=" config.sh - @grep -q "^optimize='-g'" config.sh || exit 1 + @echo "Checking optimize='-g' in config.sh..." + @grep "^optimize=" config.sh + @grep "^optimize='-g'" config.sh >/dev/null || exit 1 perl.third.config: config.sh @echo "To build perl.third you must Configure -Doptimize=-g -Uusemymalloc, checking..." - $(MAKE) perl.config.dashg - @echo "Checking usemymalloc='n'..." - @grep "^usemymalloc=" config.sh - @grep -q "^usemymalloc='n'" config.sh || exit 1 + @$(MAKE) perl.config.dashg + @echo "Checking usemymalloc='n' in config.sh..." + @grep "^usemymalloc=" config.sh + @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1 perl.third: /usr/bin/atom perl.third.config perl atom -tool third -L. -all -gp -toolargs="-quiet -invalid -uninit heap+stack+partword+copy -min 0" perl + @echo "Now you may run perl.third and then study perl.3log." # Pixie Perls (Tru64 and IRIX only) perl.pixie.config: config.sh @echo "To build perl.pixie you must Configure -Doptimize=-g, checking..." - $(MAKE) perl.config.dashg + @$(MAKE) perl.config.dashg perl.pixie.atom: /usr/bin/atom perl atom -tool pixie -L. -all -toolargs="-quiet" perl @@ -539,6 +560,48 @@ perl.pixie: /usr/bin/pixie perl.pixie.config perl else \ $(MAKE) perl.pixie.irix; \ fi + @echo "Now you may run perl.pixie and then run pixie." + +# Gprof Perl + +perl.config.dashpg: + @echo "Checking optimize='-pg' in config.sh..." + @grep "^optimize=" config.sh + @grep "^optimize='.*-pg.*'" config.sh >/dev/null || exit 1 + +perl.gprof.config: config.sh + @echo "To build perl.gprof you must Configure -Doptimize=-pg, checking..." + @$(MAKE) perl.config.dashpg + +perl.gprof: /usr/bin/gprof perl.gprof.config + @-rm -f 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. + +.PHONY: microperl +microperl: + $(MAKE) -f Makefile.micro # This version, if specified in Configure, does ONLY those scripts which need # set-id emulation. Suidperl must be setuid root. It contains the "taint" @@ -563,14 +626,15 @@ sperl$(OBJ_EXT): perl.c $(h) # We have to call our ./makedir because Ultrix 4.3 make can't handle the line # test -d lib/auto || mkdir lib/auto # -preplibrary: miniperl lib/Config.pm +.PHONY: preplibrary +preplibrary: miniperl lib/Config.pm lib/lib.pm lib/re.pm @sh ./makedir lib/auto @echo " AutoSplitting perl library" $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.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, +# (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 $(LDLIBPTH) ./miniperl configpm configpm.tmp @@ -600,12 +664,25 @@ 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 + install-strip: $(MAKE) STRIPFLAGS=-s install -install: +install install-all: $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) install-verbose: @@ -626,6 +703,7 @@ install.perl: all installperl else :; \ fi $(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS) + $(MAKE) extras.install install.man: all installman $(LDLIBPTH) ./perl installman $(INSTALLFLAGS) @@ -651,7 +729,12 @@ install.html: all installhtml # to run with precisely the same version of byacc as I use. You # normally shouldn't remake perly.[ch]. -run_byacc: FORCE +.PHONY: check_byacc run_byacc + +check_byacc: + @$(BYACC) -V 2>&1 | grep 'version 1\.8\.2' + +run_byacc: FORCE check_byacc $(BYACC) -d perly.y -chmod 664 perly.c perly.h sh $(shellflags) ./perly.fixer y.tab.c perly.c @@ -659,6 +742,7 @@ run_byacc: FORCE -e 's/y\.tab/perly/g' perly.c >perly.tmp && mv perly.tmp perly.c sed -e '/^extern YYSTYPE yy/D' y.tab.h >yh.tmp && mv yh.tmp y.tab.h cmp -s y.tab.h perly.h && rm -f y.tab.h || mv y.tab.h perly.h + perl -i perlyline.pl perly.c chmod 664 vms/perly_c.vms vms/perly_h.vms perl vms/vms_yfix.pl perly.c perly.h vms/perly_c.vms vms/perly_h.vms @@ -732,6 +816,8 @@ AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \ ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \ warnings.h lib/warnings.pm +.PHONY: regen_headers regen_pods regen_all + regen_headers: FORCE -$(CHMOD_W) $(AUTOGEN_FILES) -perl keywords.pl @@ -760,21 +846,30 @@ $(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 @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) +.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ + realclean _realcleaner clobber _clobber \ + distclean veryclean _verycleaner + clean: _tidy _mopup realclean: _realcleaner _mopup @echo "Note that make realclean does not delete config.sh or Policy.sh" _clobber: - rm -f config.sh cppstdin Policy.sh + -@rm -f Cross/run-* Cross/to-* Cross/from-* + rm -f config.sh cppstdin Policy.sh extras.lst clobber: _realcleaner _mopup _clobber @@ -794,7 +889,7 @@ _mopup: -rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap -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 + -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok rm -f perl suidperl miniperl $(LIBPERL) libperl.* microperl # Do not 'make _tidy' directly. @@ -826,13 +921,13 @@ _cleaner2: rm -f h2ph.man pstruct rm -rf .config rm -f testcompile compilelog - -rmdir lib/B lib/Data lib/Digest lib/Encode lib/MIME lib/IO/Socket lib/IO lib/Filter/Util lib/PerlIO lib/Sys lib/Thread + -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 -_realcleaner: +_realcleaner: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean @$(LDLIBPTH) $(MAKE) _cleaner2 -_verycleaner: +_verycleaner: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean @$(LDLIBPTH) $(MAKE) _cleaner2 -rm -f *~ *.orig */*~ */*.orig */*/*~ */*/*.orig @@ -842,6 +937,7 @@ _verycleaner: # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message # for that spot. +.PHONY: lint lint: $(c) lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz @@ -858,6 +954,7 @@ config.h: config_h.SH config.sh $(SHELL) config_h.SH # When done, touch perlmain.c so that it doesn't get remade each time. +.PHONY: depend depend: makedepend sh ./makedepend MAKE=$(MAKE) - test -s perlmain.c && touch perlmain.c @@ -867,29 +964,43 @@ depend: makedepend makedepend: makedepend.SH config.sh sh ./makedepend.SH +.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 + # 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 $(UTF8) /dev/null 2>&1; then \ - $(MAKE) _test_tty; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_tty ; \ else \ - $(MAKE) _test_notty; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) TESTFILE=$(TESTFILE) _test_notty ; \ fi + @echo "Ran tests" > t/rantests test check: test_prep PERL=./perl $(MAKE) _test @@ -900,10 +1011,10 @@ test_tty: test_prep test_notty: test_prep PERL=./perl $(MAKE) _test_notty -utest ucheck: test_prep - PERL=./perl UTF8=-utf8 $(MAKE) _test +utest ucheck test.utf8 check.utf8: test_prep + PERL=./perl TEST_ARGS=-utf8 $(MAKE) _test -# Backward compat. +test-prep: test_prep test-tty: test_tty @@ -911,30 +1022,46 @@ 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 PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 $(MAKE) _test utest.third ucheck.third: test_prep.third perl.third - PERL=./perl.third PERL_DEBUG=PERL_3LOG=1UTF=-utf8 $(MAKE) _test + PERL=./perl.third PERL_DEBUG=PERL_3LOG=1 TEST_ARGS=-utf8 $(MAKE) _test test_notty.third: test_prep.third perl.third PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty +# Targets for Deparse testing. + +test.deparse: test_prep + PERL=./perl TEST_ARGS=-deparse $(MAKE) _test + +test_notty.deparse: test_prep + PERL=./perl TEST_ARGS=-deparse $(MAKE) _test_notty + # Can't depend on lib/Config.pm because that might be where miniperl # is crashing. minitest: miniperl 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 .clist @@ -974,14 +1103,18 @@ pllist: $(pl) Makefile: Makefile.SH ./config.sh $(SHELL) Makefile.SH +.PHONY: distcheck distcheck: FORCE perl '-MExtUtils::Manifest=&fullcheck' -e 'fullcheck()' +.PHONY: elc elc: emacs/cperl-mode.elc emacs/cperl-mode.elc: emacs/cperl-mode.el -cd emacs; emacs -batch -q -no-site-file -f batch-byte-compile cperl-mode.el +.PHONY: etags ctags tags + etags: TAGS TAGS: emacs/cperl-mode.elc