X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=5eaef2cd254ef8c10eacae12c6efea6d3e9e0941;hb=ccf874816b57b9b91848a81cf43371bf7b3f17c8;hp=00a8b2995b21d04b696b53228629ea28d3094aee;hpb=fa72981f2ef0e07c4b04d1a4a59001e1c4ec73ce;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index 00a8b29..5eaef2c 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 '') @@ -48,7 +48,6 @@ true) -compatibility_version 1 \ -current_version \ ${api_version}.${api_subversion} \ - -image_base 0x4be00000 \ -install_name \$(shrpdir)/\$@" ;; cygwin*) @@ -149,7 +148,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 @@ -263,13 +263,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 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) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) @@ -295,7 +295,7 @@ all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $( 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 @@ -491,7 +491,7 @@ 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) + $(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILING) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # Purify/Quantify Perls. @@ -506,39 +506,63 @@ quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs # Third Degree Perl (Tru64 only) -perl.config.-g: - @echo "Checking optimize='-g'..." - @grep "^optimize=" config.sh - @grep -q "^optimize='-g'" config.sh || exit 1 +perl.config.dashg: + @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.-g - @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.atom.config: config.sh +perl.pixie.config: config.sh @echo "To build perl.pixie you must Configure -Doptimize=-g, checking..." - $(MAKE) perl.config.-g + @$(MAKE) perl.config.dashg -perl.pixie.atom: /usr/bin/atom perl.pixie.atom.config perl +perl.pixie.atom: /usr/bin/atom perl atom -tool pixie -L. -all -toolargs="-quiet" perl perl.pixie.irix: perl pixie perl -perl.pixie: perl +perl.pixie: /usr/bin/pixie perl.pixie.config perl if test -x /usr/bin/atom; then \ $(MAKE) perl.pixie.atom; \ 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 + $(MAKE) PERL_SUFFIX=.gprof PERL_PROFILING=-pg perl + @echo "Now you may run perl.gprof and then run gprof perl.gprof." + +# 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. + +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 +587,14 @@ 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 +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 @@ -605,7 +629,7 @@ extra.pods: miniperl install-strip: $(MAKE) STRIPFLAGS=-s install -install: +install install-all: $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) install-verbose: @@ -651,7 +675,10 @@ 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 +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 +686,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 @@ -774,6 +802,7 @@ realclean: _realcleaner _mopup @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 clobber: _realcleaner _mopup _clobber @@ -826,13 +855,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 @@ -877,19 +906,20 @@ test_prep: miniperl ./perl$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonx 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) _test_tty ; \ else \ - $(MAKE) _test_notty; \ + $(MAKE) TEST_ARGS=$(TEST_ARGS) _test_notty ; \ fi + @echo "Ran tests" > t/rantests test check: test_prep PERL=./perl $(MAKE) _test @@ -900,10 +930,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 @@ -918,11 +948,19 @@ 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