PerlIO fixups for Win32:

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 416f66e..9122ea5 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -493,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)
 
@@ -502,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.-g:
        @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.-g
        @echo "Checking usemymalloc='n'..."
        @grep "^usemymalloc=" config.sh
        @grep -q "^usemymalloc='n'" config.sh || exit 1
@@ -514,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.atom.config: config.sh
+       @echo "To build perl.pixie you must Configure -Doptimize=-g, checking..."
+       $(MAKE) perl.config.-g
+
+perl.pixie.atom: /usr/bin/atom perl.pixie.atom.config perl
+       atom -tool pixie -L. -all -toolargs="-quiet" perl
+
+perl.pixie.irix: perl
+       pixie perl
+
+perl.pixie: 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
@@ -765,6 +791,8 @@ _mopup:
        -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.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.
@@ -840,52 +868,58 @@ makedepend: makedepend.SH config.sh
 # Cannot delegate rebuilding of t/perl to make
 # to allow interlaced test and minitest
 
-_test-prep: miniperl $(PERL)$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonxs_ext) $(TEST_PERL_DLL)
+_test_prep: $(PERL)$(EXE_EXT)
        cd t && (rm -f $(PERL)$(EXE_EXT); $(LNS) ../$(PERL)$(EXE_EXT) $(PERL)$(EXE_EXT))
 
-test-prep: 
-       PERL=./perl $(MAKE) _test-prep
+test_prep: miniperl ./perl$(EXE_EXT) preplibrary utilities $(dynamic_ext) $(nonxs_ext) $(TEST_PERL_DLL)
+       PERL=./perl $(MAKE) _test_prep
 
-_test-tty:
+_test_tty:
        cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) TEST $(UTF8) </dev/tty
 
-_test-notty:
+_test_notty:
        cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) TEST $(UTF8)
 
 # 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 \
-         $(MAKE) _test-tty; \
+         $(MAKE) _test_tty; \
        else \
-         $(MAKE) _test-notty; \
+         $(MAKE) _test_notty; \
        fi
 
-test check: test-prep
+test check: test_prep
        PERL=./perl $(MAKE) _test
 
-test-tty: test-prep
-       PERL=./perl $(MAKE) _test-tty
+test_tty: test_prep
+       PERL=./perl $(MAKE) _test_tty
 
-test-notty: test-prep
-       PERL=./perl $(MAKE) _test-notty
+test_notty: test_prep
+       PERL=./perl $(MAKE) _test_notty
 
-utest ucheck: test-prep
+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:
-       PERL=./perl.third $(MAKE) _test-prep
+test_prep.third: test_prep perl.third
+       PERL=./perl.third $(MAKE) _test_prep
 
-test.third check.third:        test-prep.third perl.third
+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
+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
+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.