X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=051884d7390b9a54dfa3e4c2d245ffc5cb9ebaba;hb=9686a75b8c83fbfdb9121332b5246617ff2cfc4f;hp=3c6e8e3436dd7331a976b018db7a2a2aaa4ae832;hpb=556ea8bea2f27dd2ca8378d1f838ca89924261dc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index 3c6e8e3..051884d 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -129,15 +129,6 @@ case "$osname" in
 	;;
 esac
 
-case "$usedl" in
-define) testreqext="$testreqext \$(DYNALOADER)" ;;
-esac
-
-case "$DPERL_EXTERNAL_GLOB" in
-"") ;;
-*) testreqext="$testreqext \$(EXTGLOB)" ;;
-esac
-
 echo "Extracting Makefile (with variable substitutions)"
 $spitshell >Makefile <<!GROK!THIS!
 # Makefile.SH
@@ -158,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
 
@@ -195,9 +187,6 @@ static_ext = $static_list
 nonxs_ext = $nonxs_list
 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
-EXTGLOB = lib/auto/File/Glob/Glob\$(DLSUFFIX)
-
-TESTREQEXT = $testreqext
 
 libs = $perllibs $cryptlib
 
@@ -575,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; \
@@ -617,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:
@@ -838,7 +827,7 @@ _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 lib/XS
+	-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
@@ -904,16 +893,16 @@ _test:
 	fi
 	@echo "Ran tests" > t/rantests
 
-test check: test_prep $(TESTREQEXT)
+test check: test_prep
 	PERL=./perl $(MAKE) _test
 
-test_tty: test_prep $(TESTREQEXT)
+test_tty: test_prep
 	PERL=./perl $(MAKE) _test_tty
 
-test_notty: test_prep $(TESTREQEXT)
+test_notty: test_prep
 	PERL=./perl $(MAKE) _test_notty
 
-utest ucheck: test_prep $(TESTREQEXT)
+utest ucheck: test_prep
 	PERL=./perl UTF8=-utf8 $(MAKE) _test
 
 test-prep:	test_prep
@@ -927,13 +916,13 @@ test-notty:	test_notty
 test_prep.third: test_prep perl.third
 	PERL=./perl.third $(MAKE) _test_prep
 
-test.third check.third:	test_prep.third perl.third $(TESTREQEXT)
+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 $(TESTREQEXT)
+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 $(TESTREQEXT)
+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