X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=7c160d9e81492ff2b4acc6d2e0e8a45339fe537e;hb=3f7d42d86a70d697ec5a8fca00c89984282b399e;hp=43a1cc37b3c67f768f900b593d9c8585f0caddbb;hpb=747da9aeed263afa51c1e86ccd23a3a07ef3f370;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index 43a1cc3..7c160d9 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1,11 +1,8 @@ #! /bin/sh -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') - if test -f config.sh; then TOP=.; - elif test -f ../config.sh; then TOP=..; - elif test -f ../../config.sh; then TOP=../..; - elif test -f ../../../config.sh; then TOP=../../..; - elif test -f ../../../../config.sh; then TOP=../../../..; + if test -f config.sh + then TOP=. else echo "Can't find config.sh."; exit 1 fi @@ -152,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 @@ -496,6 +494,8 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) 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) +# Purify/Quantify Perls. + pureperl: $& 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) @@ -505,6 +505,42 @@ purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.li quantperl: $& 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) + +perl.config.dashg: + @echo "Checking optimize='-g'..." + @grep "^optimize=" config.sh + @grep -q "^optimize='-g'" config.sh || 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 + +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 + +# 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 + +perl.pixie.atom: /usr/bin/atom perl + atom -tool pixie -L. -all -toolargs="-quiet" perl + +perl.pixie.irix: 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 + # This version, if specified in Configure, does ONLY those scripts which need # set-id emulation. Suidperl must be setuid root. It contains the "taint" # checks as well as the special code to validate that the script in question @@ -528,7 +564,7 @@ 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; \ @@ -546,13 +582,15 @@ lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm sh mv-if-diff minimod.tmp $@ lib/re.pm: ext/re/re.pm - rm -f $@ + @-rm -f $@ cat ext/re/re.pm > $@ $(plextract): miniperl lib/Config.pm + @-rm -f $@ $(LDLIBPTH) ./miniperl -Ilib $@.PL lib/lib.pm: miniperl lib/Config.pm + @-rm -f $@ $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL extra.pods: miniperl @@ -568,7 +606,7 @@ extra.pods: miniperl install-strip: $(MAKE) STRIPFLAGS=-s install -install: +install install-all: $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) install-verbose: @@ -755,6 +793,9 @@ _mopup: -rm -f perl.exp ext.libs extra.pods opmini.o -rm -f perl.export perl.dll perl.libexp perl.map perl.def -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 suidperl miniperl $(LIBPERL) libperl.* microperl # Do not 'make _tidy' directly. @@ -786,7 +827,7 @@ _cleaner2: rm -f h2ph.man pstruct rm -rf .config rm -f testcompile compilelog - -rmdir lib/B lib/Data lib/Encode lib/IO/Socket lib/IO lib/Filter/Util 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: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean @@ -827,31 +868,70 @@ depend: makedepend makedepend: makedepend.SH config.sh sh ./makedepend.SH -# Cannot delegate rebuilding of t/perl to make to allow interlaced -# test and minitest -test-prep: miniperl perl preplibrary utilities $(dynamic_ext) $(nonxs_ext) $(TEST_PERL_DLL) - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) +# Cannot delegate rebuilding of t/perl to make +# to allow interlaced test and minitest + +_test_prep: $(PERL)$(EXE_EXT) + 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) + PERL=./perl $(MAKE) _test_prep + +_test_tty: + cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(TEST_ARGS) /dev/null 2>&1; then \ - cd t && $(LDLIBPTH) ./perl TEST t/rantests -utest ucheck: test-prep - if (true /dev/null 2>&1; then \ - cd t && $(LDLIBPTH) ./perl TEST -utf8