X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=8033ca9528776bc4202901273519d049b00fafee;hb=17af6fb0658e86e2f4a472e3392fc688e0c25b43;hp=b425bc619e524813e5e0affbb563b975118efcb5;hpb=bddcbb41f4ee271234adc88da4c07b10b24806b6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index b425bc6..8033ca9 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1,11 +1,8 @@
 #! /bin/sh
 case $CONFIGDOTSH 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
@@ -496,6 +493,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,11 +504,16 @@ 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)
 
-perl.third.config: config.sh
-	@echo "To build perl.third you must Configure -Doptimize=-g -Uusemymalloc, checking..."
+# 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
@@ -517,6 +521,25 @@ perl.third.config: config.sh
 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
@@ -558,13 +581,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
@@ -767,7 +792,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.3log
+	-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.
@@ -799,7 +826,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/MIME lib/IO/Socket lib/IO lib/Filter/Util lib/PerlIO lib/Sys lib/Thread lib/XS
 
 _realcleaner: 
 	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean
@@ -840,31 +867,61 @@ 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
 
-# Second branch is for testing without a tty or controling terminal.
-# See t/op/stat.t
-test check: test-prep
-	if (true </dev/tty) >/dev/null 2>&1; then \
-	  cd t && $(LDLIBPTH) ./perl TEST </dev/tty; \
-	else \
-	  cd t && PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) ./perl TEST; \
-	fi
-	@echo "Ran tests" > t/rantests
+_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 $(UTF8) </dev/tty
+
+_test_notty:
+	cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(UTF8)
 
-utest ucheck: test-prep
+# The second branch is for testing without a tty or controlling terminal,
+# see t/op/stat.t
+_test:
 	if (true </dev/tty) >/dev/null 2>&1; then \
-	  cd t && $(LDLIBPTH) ./perl TEST -utf8 </dev/tty; \
+	  $(MAKE) _test_tty; \
 	else \
-	  cd t && PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) ./perl TEST -utf8; \
+	  $(MAKE) _test_notty; \
 	fi
 
-# For testing without a tty or controling terminal. See t/op/stat.t
-test-notty: test-prep
-	cd t && PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) ./perl TEST
+test check: test_prep
+	PERL=./perl $(MAKE) _test
+
+test_tty: test_prep
+	PERL=./perl $(MAKE) _test_tty
+
+test_notty: test_prep
+	PERL=./perl $(MAKE) _test_notty
+
+utest ucheck: test_prep
+	PERL=./perl UTF8=-utf8 $(MAKE) _test
+
+# Backward compat.
+
+test-tty:	test_tty
+
+test-notty:	test_notty
+
+# Targets for Third Degree testing.
+
+test_prep.third: test_prep perl.third
+	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
+
+test_notty.third: test_prep.third perl.third
+	PERL=./perl.third $(MAKE) PERL_DEBUG=PERL_3LOG=1 _test_notty
 
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.