X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/d618fe714273452c0536fde1f0be7eaa1e7241d3..ba403c704ff59749fc2ce2550b23a8769a22897e:/Makefile.SH diff --git a/Makefile.SH b/Makefile.SH index da00514..ad220bf 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -5,7 +5,7 @@ quote() { case "$1" in '') echo "''" ;; - *) echo "$1" | sed 's/\([^a-zA-Z0-9.:_\-\/]\)/\\\1/g' ;; + *) echo "$1" | sed 's/\([^a-zA-Z0-9.:_/-]\)/\\\1/g' ;; esac } @@ -20,17 +20,17 @@ case $PERL_CONFIG_SH in ;; esac -case $CROSS_NAME in -'') - Makefile=Makefile +case "$osname" in +amigaos) + devtty=CONSOLE: ;; *) - # if cross-compilation, the Makefile named accordingly - Makefile=Makefile-cross-$CROSS_NAME - . Cross/config-${CROSS_NAME}.sh + devtty=/dev/tty ;; esac +Makefile=Makefile + : This forces SH files to create target in same directory as SH file. : This is so that make depend always knows where to find SH derivatives. case "$0" in @@ -77,7 +77,7 @@ true) sunos*) linklibperl="-lperl" ;; - netbsd*|freebsd[234]*|openbsd*|dragonfly*) + netbsd*|freebsd[234]*|openbsd*|dragonfly*|bitrig*) linklibperl="-L. -lperl" ;; interix*) @@ -257,8 +257,6 @@ CLDFLAGS = $ldflags mallocsrc = $mallocsrc mallocobj = $mallocobj -madlysrc = $madlysrc -madlyobj = $madlyobj LNS = $lns # NOTE: some systems don't grok "cp -f". XXX Configure test needed? CPS = $cp @@ -302,7 +300,12 @@ STATIC_LDFLAGS = $static_ldflags LDLIBPTH = $ldlibpth # Sometimes running an executable is an adventure. -RUN = $run +RUN = + +# When cross-compiling we want to use a (mini)perl built for the host, not the target +HOST_PERL = $hostperl +HOST_GENERATE = $hostgenerate +SYSTEM_PERL = $perl # These variables may need to be manually set for non-Unix systems. AR = $full_ar @@ -315,12 +318,31 @@ PATH_SEP = $p_ # Macros to invoke a copy of miniperl during the build. Targets which # are built using these macros should depend on \$(MINIPERL_EXE) MINIPERL_EXE = miniperl\$(EXE_EXT) -MINIPERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib +MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib + +# Macros to invoke sort the MANIFEST during build +MANIFEST_SRT = MANIFEST.srt +!GROK!THIS! + +case "$usecrosscompile$perl" in +define?*) + $spitshell >>$Makefile <>$Makefile <>$Makefile <>$Makefile <<'!NO!SUBS!' -CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@` +CCCMD = sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@ -CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $<` +CCCMDSRC = sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $< CONFIGPM_FROM_CONFIG_SH = lib/Config.pm lib/Config_heavy.pl CONFIGPM = $(CONFIGPM_FROM_CONFIG_SH) lib/Config_git.pl @@ -420,34 +443,12 @@ CONFIGPOD = lib/Config.pod CONFIGH = config.h !NO!SUBS! - ;; -*) - # if cross-compilation -$spitshell >>$Makefile < $*.i +.c.i: perl.h config.h + @echo `$(CCCMDSRC)` -E $*.c \> $*.i + @`$(CCCMDSRC)` -E $*.c > $*.i -.c.s: - $(CCCMDSRC) -S $*.c +.c.s: perl.h config.h + @echo `$(CCCMDSRC)` -S $*.c + @`$(CCCMDSRC)` -S $*.c -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make +all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) @echo " "; @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." -.PHONY: all translators utilities +$(MANIFEST_SRT): MANIFEST $(PERL_EXE) + @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ + $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) + @touch $(MANIFEST_SRT) + +.PHONY: all utilities # Both git_version.h and lib/Config_git.pl are built # by make_patchnum.pl. @@ -592,36 +601,21 @@ perl$(OBJ_EXT): git_version.h !NO!SUBS! -# Making utilities and translators require Cwd. If we have dynamic +# Making utilities requires Cwd. If we have dynamic # loading, we only need miniperl and Cwd.$dlext. If we have static # loading, we need to build perl first. case "$usedl$static_cwd" in defineundef) util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE' - x2p_deps="\$(MINIPERL_EXE) \$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE" ;; definedefine) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' - x2p_deps="\$(PERL_EXE) \$(CONFIGPM) \$(dynamic_ext) x2p/$firstmakefile FORCE" ;; *) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE' - x2p_deps="\$(PERL_EXE) \$(CONFIGPM) x2p/$firstmakefile FORCE" ;; esac $spitshell >>$Makefile <>$Makefile <>$Makefile <>$Makefile <<'!NO!SUBS!' generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs) +!NO!SUBS! +;; +*) +$spitshell >>$Makefile <<'!NO!SUBS!' +bitcount.h: generate_uudmap$(HOST_EXE_EXT) + ./generate_uudmap$(HOST_EXE_EXT) $(generated_headers) + +generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT) + -@rm generate_uudmap$(HOST_EXE_EXT) + $(LNS) $(HOST_GENERATE) generate_uudmap$(HOST_EXE_EXT) + +!NO!SUBS! +;; +esac + +case "$osname" in +amigaos*) +$spitshell >>$Makefile <<'!NO!SUBS!' +perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib + $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\\"perlmain.c", @ARGV)' DynaLoader $(static_ext) + +# The file ext.libs is a list of libraries that must be linked in +# for static extensions, e.g. -lm -lgdbm, etc. The individual +# static extension Makefile's add to it. +ext.libs: $(static_ext) + -@test -f ext.libs || touch ext.libs + +!NO!SUBS! +;; +*) +$spitshell >>$Makefile <<'!NO!SUBS!' perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(\"perlmain.c", @ARGV)' DynaLoader $(static_ext) @@ -694,6 +735,8 @@ ext.libs: $(static_ext) -@test -f ext.libs || touch ext.libs !NO!SUBS! +;; +esac # How to build libperl. This is still rather convoluted. # Load up custom Makefile.SH fragment for shared loading and executables: @@ -850,7 +893,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) # lib/buildcustomize.pl despite the reality that lib/buildcustomize.pl needs # miniperl to exist first permits us to # a) have one rule generate both miniperl and lib/buildcustomize.pl -# (so that lib/buildcustomise.pl is always available. This simplifies things) +# (so that lib/buildcustomize.pl is always available. This simplifies things) # b) have the rest of the Makefile depend on the more obvious $(MINIPERL_EXE) $(MINIPERL_EXE): lib/buildcustomize.pl @@ -858,11 +901,21 @@ $(MINIPERL_EXE): lib/buildcustomize.pl !NO!SUBS! case "${osname}${osvers}" in + amigaos*) + $spitshell >>$Makefile <<'!NO!SUBS!' +lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl + -@rm -f miniperl.xok + $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ + $(mini_obj) $(libs) +# $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' + $(MINIPERL) -f write_buildcustomize.pl +!NO!SUBS! + ;; aix*) $spitshell >>$Makefile <<'!NO!SUBS!' lib/buildcustomize.pl: $& $(mini_obj) $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(mini_obj) $(libs) - $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; @@ -870,7 +923,7 @@ lib/buildcustomize.pl: $& $(mini_obj) $spitshell >>$Makefile <<'!NO!SUBS!' lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl $(CC) -o $(MINIPERL_EXE) $(mini_obj libs) - $(LDLIBPTH) $(RUN) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' + $(LDLIBPTH) ./miniperl$(HOST _EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; @@ -892,19 +945,30 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl -@rm -f miniperl.xok $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ $(mini_obj) $(libs) - $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! ;; *) - $spitshell >>$Makefile <<'!NO!SUBS!' + if test "X$hostperl" != X; then + $spitshell >>$Makefile <' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' + \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname" +!GROK!THIS! + else + $spitshell >>$Makefile <<'!NO!SUBS!' lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl -@rm -f miniperl.xok - $(LDLIBPTH) $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ + $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ $(mini_obj) $(libs) - $(LDLIBPTH) $(RUN) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1' $(MINIPERL) -f write_buildcustomize.pl !NO!SUBS! + fi ;; esac @@ -912,7 +976,26 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl $(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl -@rm -f miniperl.xok - $(SHRPENV) $(LDLIBPTH) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) +!NO!SUBS! + + case $osname in + # In AmigaOS the Perl executable needs to be linked with -ldl, + # but none of the other executables should be. + amigaos) $spitshell >>$Makefile <<'!NO!SUBS!' + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs) -ldl +!NO!SUBS! + ;; + os390) $spitshell >>$Makefile <<'!NO!SUBS!' + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs) +!NO!SUBS! + ;; + *) $spitshell >>$Makefile <<'!NO!SUBS!' + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) +!NO!SUBS! + ;; + esac + + $spitshell >>$Makefile <<'!NO!SUBS!' # Microperl. This is just a convenience thing if one happens to # build also the full Perl and therefore the real big Makefile: @@ -971,7 +1054,7 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) # But also this ensures that all extensions are built before we try to scan # them, which picks up Devel::PPPort's documentation. pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc - $(RUN_PERL) -f -Ilib pod/buildtoc -q + $(RUN_PERL) -f pod/buildtoc -q pod/perlapi.pod: pod/perlintern.pod @@ -981,9 +1064,9 @@ pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST $(MINIPERL) pod/perlmodlib.PL -q -pod/perl5192delta.pod: pod/perldelta.pod - $(RMS) pod/perl5192delta.pod - $(LNS) perldelta.pod pod/perl5192delta.pod +pod/perl5233delta.pod: pod/perldelta.pod + $(RMS) pod/perl5233delta.pod + $(LNS) perldelta.pod pod/perl5233delta.pod extra.pods: $(MINIPERL_EXE) -@test ! -f extra.pods || rm -f `cat extra.pods` @@ -995,13 +1078,13 @@ extra.pods: $(MINIPERL_EXE) done extras.make: $(PERL_EXE) - -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` + -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` extras.test: $(PERL_EXE) - -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` + -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` extras.install: $(PERL_EXE) - -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` + -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` .PHONY: install install-strip install-all install-verbose install-silent \ no-install install.perl install.man install.html @@ -1014,19 +1097,53 @@ no_install no-install: install-notify install: install-all !NO!SUBS! + for name in all notify silent strip verbose; do flags="--$name"; - $spitshell >>$Makefile <>$Makefile <>$Makefile <>$Makefile done -$spitshell >>$Makefile <<'!NO!SUBS!' +if test "X$hostperl" != X; then + $spitshell >>$Makefile <<'!NO!SUBS!' +install.perl: $(INSTALL_DEPENDENCE) installperl + $(HOST_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) + -@test ! -s extras.lst || $(MAKE) extras.install +install.man: all installman + $(HOST_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) + +# XXX Experimental. Hardwired values, but useful for testing. +# Eventually Configure could ask for some of these values. +install.html: all installhtml + -@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd .. + $(HOST_PERL) installhtml \ + --podroot=. --podpath=. --recurse \ + --htmldir=$(privlib)/html \ + --htmlroot=$(privlib)/html \ + --splithead=pod/perlipc \ + --splititem=pod/perlfunc \ + --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \ + --verbose +!NO!SUBS! +else + $spitshell >>$Makefile <<'!NO!SUBS!' install.perl: $(INSTALL_DEPENDENCE) installperl $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) -@test ! -s extras.lst || PATH="`pwd`:\${PATH}" PERL5LIB="`pwd`/lib" \$(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` @@ -1046,7 +1163,10 @@ install.html: all installhtml --splititem=pod/perlfunc \ --ignore=Porting/Maintainers.pm,Porting/pumpkin.pod,Porting/repository.pod \ --verbose +!NO!SUBS! +fi +$spitshell >>$Makefile <<'!NO!SUBS!' # I now supply perly.c with the kits, so the following section is # used only if you force bison to run by saying @@ -1107,10 +1227,10 @@ regen_headers regen-headers: FORCE regen_meta regen-meta: META.yml META.json META.yml: FORCE - PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib Porting/makemeta -y + PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) Porting/makemeta -y META.json: FORCE - PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib Porting/makemeta -j + PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) Porting/makemeta -j regen_all regen-all: regen regen_meta @@ -1135,16 +1255,16 @@ manicheck: FORCE # DynaLoader may be needed for extensions that use Makefile.PL. $(DYNALOADER): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext) - $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) + $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) d_dummy $(dynamic_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT) $(LIBPERL) - $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic + $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic s_dummy $(static_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE - $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) + $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) n_dummy $(nonxs_ext): $(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE - $(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + $(MINIPERL) make_ext.pl $@ $(MAKE_EXT_ARGS) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) !NO!SUBS! $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' .PHONY: printconfig printconfig: - @eval `$(RUN_PERL) -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR) + @eval `$(RUN_PERL) -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR) .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ realclean _realcleaner clobber _clobber \ distclean veryclean _verycleaner -clean: _tidy _mopup +clean: realclean 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 Cross/run-* Cross/to-* Cross/from-* Cross/mkdir + -rm -rf host rm -f t/test_state rm -f config.sh cppstdin Policy.sh extras.lst + rm -f $(MANIFEST_SRT) clobber: _realcleaner _mopup _clobber @@ -1192,24 +1314,13 @@ _mopup: -rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl -rm -f config.arch config.over $(DTRACE_H) -# Do not 'make _tidy' directly. -_tidy: - -cd pod; $(LDLIBPTH) $(MAKE) clean - -cd utils; $(LDLIBPTH) $(MAKE) clean - -cd x2p; $(LDLIBPTH) $(MAKE) clean - -rm -f lib/Config_git.pl git_version.h - -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ - $(MINIPERL) make_ext.pl --target=clean $$x MAKE=$(MAKE) ; \ - done - _cleaner1: -cd os2; rm -f Makefile -cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN) -cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN) - -cd x2p; $(LDLIBPTH) $(MAKE) $(CLEAN) -@if test -f $(MINIPERL_EXE) ; then \ for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ - $(MINIPERL) make_ext.pl --target=$(CLEAN) $$x MAKE=$(MAKE) ; \ + $(MINIPERL) make_ext.pl --target=$(CLEAN) $$x MAKE="$(MAKE)" ; \ done ; \ else \ sh $(CLEAN).sh ; \ @@ -1226,7 +1337,6 @@ _cleaner2: rm -f core *perl.core t/core t/*perl.core core.* t/core.* rm -f t/$(PERL_EXE) t/rantests rm -rf t/tmp* - rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old utils/Makefile rm -f $(private) @@ -1236,45 +1346,47 @@ _cleaner2: rm -f h2ph.man pstruct rm -rf .config rm -f preload - rm -rf lib/Encode lib/Compress lib/Hash lib/re - rm -rf lib/TAP lib/Module/Pluggable lib/App - rm -rf lib/mro - rm -rf lib/IO/Compress lib/IO/Uncompress - rm -f lib/ExtUtils/ParseXS/t/XSTest.c - rm -f lib/ExtUtils/ParseXS/t/XSTest$(OBJ_EXT) - rm -f lib/ExtUtils/ParseXS/t/XSTest$(DLSUFFIX) - rm -fr lib/B - rm -fr lib/CPAN - rm -fr lib/ExtUtils/CBuilder rm -f pod2htmd.tmp rm -rf pod/perlfunc pod/perlipc -rmdir ext/B/lib - -rmdir lib/Archive/Tar lib/Archive lib/Attribute - -rmdir lib/CGI lib/Carp - -rmdir lib/Data lib/Devel lib/Digest - -rmdir lib/ExtUtils/Command lib/ExtUtils/Constant lib/ExtUtils/Liblist lib/ExtUtils/MakeMaker - -rmdir lib/File/Spec lib/Filter/Util lib/Filter - -rmdir lib/I18N/LangTags lib/IO/Socket lib/IO lib/IPC - -rmdir lib/List/Util lib/List - -rmdir lib/Locale/Maketext lib/Locale - -rmdir lib/Log/Message lib/Log - -rmdir lib/Math/Big* lib/Math - -rmdir lib/Memoize lib/MIME - -rmdir lib/Module/Build/Platform lib/Module/Build lib/Module/Load lib/Module - -rmdir lib/Net/FTP lib/Object - -rmdir lib/Parse/CPAN lib/Parse - -rmdir lib/PerlIO/via lib/PerlIO - -rmdir lib/Package lib/Params - -rmdir lib/Pod/Perldoc lib/Pod/Simple lib/Pod/Text - -rmdir lib/Sys lib/Scalar/Util lib/Scalar - -rmdir lib/Term/UI lib/Thread lib/Tie/Hash - -rmdir lib/Test/Builder/Tester lib/Test/Builder lib/Test - -rmdir lib/Unicode/Collate - -rmdir lib/XS/APItest lib/XS - -rmdir lib/inc/latest lib/inc - -rmdir lib/autodie/exception lib/autodie lib/encoding lib/threads - -rm -f lib/ExtUtils/CBuilder/t/libcompilet.dll.a - -rm -f lib/ExtUtils/ParseXS/t/libXSTest.dll.a + rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) + -rmdir lib/version lib/threads lib/encoding lib/autodie/exception + -rmdir lib/autodie/Scope lib/autodie lib/XS lib/Win32API lib/VMS + -rmdir lib/Unicode/Collate/Locale lib/Unicode/Collate/CJK + -rmdir lib/Unicode/Collate lib/Tie/Hash lib/Thread lib/Text + -rmdir lib/Test/use lib/Test/Tester lib/Test/Builder/Tester + -rmdir lib/Test/Builder/IO lib/Test/Builder lib/Test lib/Term + -rmdir lib/TAP/Parser/YAMLish lib/TAP/Parser/SourceHandler + -rmdir lib/TAP/Parser/Scheduler lib/TAP/Parser/Result + -rmdir lib/TAP/Parser/Iterator lib/TAP/Parser lib/TAP/Harness + -rmdir lib/TAP/Formatter/File lib/TAP/Formatter/Console + -rmdir lib/TAP/Formatter lib/TAP lib/Sys/Syslog lib/Sys lib/Sub + -rmdir lib/Search lib/Scalar lib/Pod/Text lib/Pod/Simple + -rmdir lib/Pod/Perldoc lib/PerlIO/via lib/PerlIO lib/Perl + -rmdir lib/Parse/CPAN lib/Parse lib/Params lib/Net/FTP lib/Module/Load + -rmdir lib/Module/CoreList lib/Module lib/Memoize lib/Math/BigInt + -rmdir lib/Math/BigFloat lib/Math lib/MIME lib/Locale/Maketext + -rmdir lib/Locale/Codes lib/Locale lib/List/Util lib/List lib/JSON/PP + -rmdir lib/JSON lib/IPC lib/IO/Uncompress/Adapter lib/IO/Uncompress + -rmdir lib/IO/Socket lib/IO/Compress/Zlib lib/IO/Compress/Zip + -rmdir lib/IO/Compress/Gzip lib/IO/Compress/Base + -rmdir lib/IO/Compress/Adapter lib/IO/Compress lib/IO + -rmdir lib/I18N/LangTags lib/I18N lib/Hash/Util lib/Hash lib/HTTP + -rmdir lib/Filter/Util lib/Filter lib/File/Spec lib/ExtUtils/Typemaps + -rmdir lib/ExtUtils/ParseXS lib/ExtUtils/MakeMaker/version + -rmdir lib/ExtUtils/MakeMaker lib/ExtUtils/Liblist + -rmdir lib/ExtUtils/Constant lib/ExtUtils/Command + -rmdir lib/ExtUtils/CBuilder/Platform/Windows + -rmdir lib/ExtUtils/CBuilder/Platform lib/ExtUtils/CBuilder + -rmdir lib/Exporter lib/Encode/Unicode lib/Encode/MIME/Header + -rmdir lib/Encode/MIME lib/Encode/KR lib/Encode/JP lib/Encode/CN + -rmdir lib/Encode lib/Digest lib/Devel lib/Data lib/Config/Perl + -rmdir lib/Compress/Raw lib/Compress lib/Carp lib/CPAN/Plugin + -rmdir lib/CPAN/Meta/History lib/CPAN/Meta lib/CPAN/LWP + -rmdir lib/CPAN/Kwalify lib/CPAN/HTTP lib/CPAN/FTP lib/CPAN/Exception + -rmdir lib/CPAN/API lib/CPAN lib/Attribute lib/Archive/Tar lib/Archive + -rmdir lib/App/Prove/State/Result lib/App/Prove/State lib/App/Prove + -rmdir lib/App lib/Amiga _realcleaner: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=distclean @@ -1316,8 +1428,8 @@ done $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: depend -depend: makedepend - sh ./makedepend MAKE=$(MAKE) cflags +depend: makedepend $(DTRACE_H) $(generated_headers) + sh ./makedepend MAKE="$(MAKE)" cflags .PHONY: test check test_prep test_prep_nodll test_prep_pre \ test_prep_reonly test_tty test-tty test_notty test-notty \ @@ -1333,19 +1445,93 @@ _test: # Architecture-neutral stuff: test_prep_pre: preplibrary utilities $(nonxs_ext) +!NO!SUBS! +case "$targethost" in +'') $spitshell >>$Makefile <<'!NO!SUBS!' test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ - $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p x2p/find2perl \ - $(generated_pods) + $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) +!NO!SUBS! +;; +*) $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) - $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic + $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) +!NO!SUBS! + +case "$targethost" in +'') $spitshell >>$Makefile <<'!NO!SUBS!' test check: test_prep $(RUN_TESTS) choose +!NO!SUBS! +;; +*) $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' test_tty test-tty: test_prep $(RUN_TESTS) tty @@ -1365,23 +1551,30 @@ test.valgrind check.valgrind: test_prep @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1 @echo "And of course you have to have valgrind..." $(VALGRIND) $(VG_TEST) || exit 1 - PERL_VALGRIND=1 VALGRIND='$(VALGRIND)' $(RUN_TESTS) choose + PERL_VALGRIND=1 VALGRIND='$(VALGRIND)' TESTFILE=harness $(RUN_TESTS) choose !NO!SUBS! ;; esac $spitshell >>$Makefile <<'!NO!SUBS!' -# Can't depend on lib/Config.pm because that might be where miniperl +# minitest can't depend on lib/Config.pm because that might be where miniperl # is crashing. -minitest: $(MINIPERL_EXE) +minitest_prep: -@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles) @echo " " @echo "You may see some irrelevant test failures if you have been unable" @echo "to build lib/Config.pm, or the Unicode data files." @echo " " - - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ - && $(RUN_PERL) TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t opbasic/*.t op/*.t uni/*.t &2 case "$osname" in os390|posix-bc) - if cd x2p - then - rm -f y.tab.c y.tab.h - case "$osname" in - posix-bc) - # we are using two different yaccs in BS2000 Posix! - byacc a2p.y >/dev/null 2>&1 - ;; - *) # e.g. os390 - yacc a2p.y >/dev/null 2>&1 - ;; - esac - if cmp -s y.tab.c a2p.c - then - rm -f y.tab.c - else - echo "a2p.y -> a2p.c" >&2 - mv -f y.tab.c a2p.c - chmod u+w a2p.c - sed -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \ - -e 's|^static void __YY_YACC_MAIN.*BS2000.*|/*static main deleted*/|' \ - -e 's/y\.tab/a2p/g' a2p.c >a2p.tmp && mv a2p.tmp a2p.c - xxx="$xxx a2p.c" - fi - # In case somebody yacc -d:ed the a2p.y. - if test -f y.tab.h - then - if cmp -s y.tab.h a2p.h - then - rm -f y.tab.h - else - echo "a2p.h -> a2p.h" >&2 - mv -f y.tab.h a2p.h - xxx="$xxx a2p.h" - fi - fi - cd .. - fi ;; *) echo "'$osname' is an EBCDIC system I don't know that well." >&4