X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/39c4a6cffea9850b73821f0162a8caaafbe90804..0bd1c35ee47dab181543ba366fe021122c591f65:/Makefile.SH diff --git a/Makefile.SH b/Makefile.SH index 665ff68..8569955 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,6 +20,15 @@ case $PERL_CONFIG_SH in ;; esac +case "$osname" in +amigaos) + devtty=CONSOLE: + ;; +*) + devtty=/dev/tty + ;; +esac + Makefile=Makefile : This forces SH files to create target in same directory as SH file. @@ -180,11 +189,12 @@ dynamic_list=' ' dynamic_ext_re="lib/auto/re/re.$dlext" extra_dep=' ext/Pod-Functions/pm_to_blib: cpan/Pod-Simple/pm_to_blib cpan/Pod-Escapes/pm_to_blib pod/perlfunc.pod +cpan/IO-Compress/pm_to_blib: dist/lib/pm_to_blib ' for f in $dynamic_ext; do : the dependency named here will never exist base=`echo "$f" | sed 's/.*\///'` - this_target="lib/auto/$f/$base.$dlext" + this_target="lib/auto/$f/$base.$dlext" dynamic_list="$dynamic_list $this_target" : Parallel makes reveal that we have some interdependencies @@ -221,14 +231,22 @@ for f in $nonxs_ext; do done dtrace_h='' -dtrace_o='' -minidtrace_o='' + +# three object files generated by 'dtrace -G' when dtrace is enabled +dtrace_perllib_o='' +dtrace_mini_o='' +dtrace_main_o='' + case "$usedtrace" in define|true) - dtrace_h='perldtrace.h' - $dtrace -G -s perldtrace.d -o perldtrace.tmp >/dev/null 2>&1 \ - && rm -f perldtrace.tmp && dtrace_o='perldtrace$(OBJ_EXT)' \ - && minidtrace_o='miniperldtrace$(OBJ_EXT)' + dtrace_h='perldtrace.h' + case "$dtraceobject" in + define) + dtrace_perllib_o='dtrace_perllib$(OBJ_EXT)' + dtrace_mini_o='dtrace_mini$(OBJ_EXT)' + dtrace_main_o='dtrace_main$(OBJ_EXT)' + ;; + esac ;; esac @@ -311,6 +329,9 @@ PATH_SEP = $p_ MINIPERL_EXE = miniperl\$(EXE_EXT) MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib +# Macros to invoke sort the MANIFEST during build +MANIFEST_SRT = MANIFEST.srt + !GROK!THIS! case "$usecrosscompile$perl" in @@ -325,7 +346,7 @@ RUN_PERL = \$(LDLIBPTH) \$(RUN) $perl\$(EXE_EXT) $spitshell >>$Makefile </dev/null ;; esac +case "$dtracexnolibs" in +define) xnolibs=-xnolibs ;; +*) xnolibs= ;; +esac + $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' -addedbyconf = UU $(shextract) pstruct +addedbyconf = UU $(shextract) # Unicode data files generated by mktables unidatafiles = lib/unicore/Decomposition.pl lib/unicore/TestProp.pl \ @@ -470,26 +501,76 @@ h5 = utf8.h warnings.h mydtrace.h op_reg_common.h l1_char_class_tab.h h6 = charclass_invlists.h h = $(h1) $(h2) $(h3) $(h4) $(h5) $(h6) -c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro.c perl.c +c1 = av.c scope.c op.c doop.c doio.c dump.c gv.c hv.c mg.c reentr.c mro_core.c perl.c c2 = perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c sv.c c3 = taint.c toke.c util.c deb.c run.c universal.c pad.c globals.c keywords.c -c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c caretx.c +c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c caretx.c dquote.c time64.c c5 = $(mallocsrc) c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c opmini.c perlmini.c -obj0 = op$(OBJ_EXT) perl$(OBJ_EXT) -obj0mini = perlmini$(OBJ_EXT) opmini$(OBJ_EXT) miniperlmain$(OBJ_EXT) -obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro$(OBJ_EXT) keywords$(OBJ_EXT) +obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) pad$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) reentr$(OBJ_EXT) mro_core$(OBJ_EXT) keywords$(OBJ_EXT) obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) -obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) caretx$(OBJ_EXT) +obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) perlapi$(OBJ_EXT) numeric$(OBJ_EXT) mathoms$(OBJ_EXT) locale$(OBJ_EXT) pp_pack$(OBJ_EXT) pp_sort$(OBJ_EXT) caretx$(OBJ_EXT) dquote$(OBJ_EXT) time64$(OBJ_EXT) + +# split the objects into 3 exclusive sets: those used by both miniperl and +# perl, and those used by just one or the other. Doesn't include the +# actual perl(mini)main.o, nor any dtrace objects. + +common_objs = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) +mini_only_objs = opmini$(OBJ_EXT) perlmini$(OBJ_EXT) +main_only_objs = op$(OBJ_EXT) perl$(OBJ_EXT) + +miniperl_objs_nodt = $(mini_only_objs) $(common_objs) miniperlmain$(OBJ_EXT) +perllib_objs_nodt = $(main_only_objs) $(common_objs) + +!NO!SUBS! + +# dtrace with -G modifies the source object files, which can cause +# dependency issues, and can cause the dtrace -G to fail on FreeBSD +# so separate the objects generated by $(CC) from those used to link +# the executable when dtrace -G is involved. +# +# $(FOO:op%os=np%ns) isn't generally portable but is portable to +# the makes on darwin, Solaris, FreeBSD and Linux, which is where we +# use dtrace + +case "$usedtrace:$dtraceobject" in +define:define) + $spitshell >>$Makefile <<'!NO!SUBS!' -minindt_obj = $(obj0mini) $(obj1) $(obj2) $(obj3) $(ARCHOBJS) -mini_obj = $(minindt_obj) $(MINIDTRACE_O) -ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS) -obj = $(ndt_obj) $(DTRACE_O) +miniperl_dtrace_objs = $(miniperl_objs_nodt:%=mpdtrace/%) +perllib_dtrace_objs = $(perllib_objs_nodt:%=libpdtrace/%) +perlmain_dtrace_objs = maindtrace/perlmain$(OBJ_EXT) -perltoc_pod_prereqs = extra.pods pod/perl5214delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod +miniperl_objs = $(miniperl_dtrace_objs) $(DTRACE_MINI_O) +perllib_objs = $(perllib_dtrace_objs) $(DTRACE_PERLLIB_O) +perlmain_objs = $(perlmain_dtrace_objs) $(DTRACE_MAIN_O) + +miniperl_dep = $(DTRACE_MINI_O) +perllib_dep = $(DTRACE_PERLLIB_O) +perlmain_dep = $(DTRACE_MAIN_O) + +!NO!SUBS! + ;; +*) + $spitshell >>$Makefile <<'!NO!SUBS!' + +miniperl_objs = $(miniperl_objs_nodt) $(DTRACE_MINI_O) +perllib_objs = $(perllib_objs_nodt) $(DTRACE_PERLLIB_O) +perlmain_objs = perlmain$(OBJ_EXT) $(DTRACE_MAIN_O) + +miniperl_dep = $(miniperl_objs) +perllib_dep = $(perllib_objs) +perlmain_dep = $(perlmain_objs) + +!NO!SUBS! + ;; +esac + +$spitshell >>$Makefile <<'!NO!SUBS!' + +perltoc_pod_prereqs = extra.pods pod/perl5277delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs) generated_headers = uudmap.h bitcount.h mg_data.h @@ -525,48 +606,27 @@ lintflags = \ -erroff=E_STATIC_UNUSED \ -erroff=E_TRUE_LOGICAL_EXPR -splintflags = \ - -I/usr/lib/gcc/i486-linux-gnu/4.0.2/include/ \ - -D__builtin_va_list=va_list \ - -Dsigjmp_buf=jmp_buf \ - -warnposix \ - \ - +boolint \ - +charintliteral \ - -fixedformalarray \ - -mustfreefresh \ - -nestedextern \ - -predboolint \ - -predboolothers \ - -preproc \ - -boolops \ - -shadow \ - -nullstate \ - +longintegral \ - +matchanyintegral \ - -type \ - \ - +line-len 999 \ - +weak - -splintfiles = $(c1) - .c$(OBJ_EXT): @echo `$(CCCMD)` $(PLDLFLAGS) $*.c @`$(CCCMD)` $(PLDLFLAGS) $*.c -.c.i: +.c.i: perl.h config.h @echo `$(CCCMDSRC)` -E $*.c \> $*.i @`$(CCCMDSRC)` -E $*.c > $*.i -.c.s: +.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." +$(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 @@ -597,7 +657,7 @@ esac $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' +perlmain.c: $(MINIPERL_EXE) ext/ExtUtils-Miniperl/pm_to_blib + $(MINIPERL) -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) + $(MINIPERL) -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 @@ -701,6 +775,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: @@ -727,9 +803,9 @@ CCDLFLAGS = `echo $ccdlflags|sed -e 's@-bE:.*/perl\.exp@-bE:perl.exp@'` LIBPERL_NONSHR = libperl_nonshr$(LIB_EXT) MINIPERL_NONSHR = miniperl_nonshr$(EXE_EXT) -$(LIBPERL_NONSHR): $(obj) +$(LIBPERL_NONSHR): $(perllib_objs) $(RMS) $(LIBPERL_NONSHR) - $(AR) rcu $(LIBPERL_NONSHR) $(obj) + $(AR) rc $(LIBPERL_NONSHR) $(perllib_objs) $(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perlmini$(OBJ_EXT) $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \ @@ -753,7 +829,7 @@ PERLEXPORT = perl.exp esac $spitshell >>$Makefile <<'!NO!SUBS!' perl.exp: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) - ./$(MINIPERLEXP) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp + $(MINIPERL) makedef.pl --sort-fold PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" > perl.exp !NO!SUBS! ;; @@ -762,7 +838,7 @@ os2) MINIPERLEXP = miniperl perl5.def: $(MINIPERLEXP) makedef.pl $(CONFIGPM) $(SYM) $(SYMH) miniperl.map - ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def + $(MINIPERL) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl5.def !NO!SUBS! ;; @@ -773,9 +849,9 @@ cygwin.c: cygwin/cygwin.c LIBPERL_NONSHR = libperl$(LIB_EXT) -$(LIBPERL_NONSHR): $(obj) +$(LIBPERL_NONSHR): $(perllib_objs) $(RMS) $(LIBPERL_NONSHR) - $(AR) rcu $(LIBPERL_NONSHR) $(obj) + $(AR) rc $(LIBPERL_NONSHR) $(perllib_objs) !NO!SUBS! ;; @@ -802,26 +878,42 @@ mydtrace.h: $(DTRACE_H) !NO!SUBS! ;; esac - case "$dtrace_o" in - ?*) + case "$dtraceobject" in + define) $spitshell >>$Makefile <<'!NO!SUBS!' -$(DTRACE_O): perldtrace.d $(ndt_obj) - $(DTRACE) -G -s perldtrace.d -o $(DTRACE_O) $(ndt_obj) - -$(MINIDTRACE_O): perldtrace.d $(minindt_obj) perlmini$(OBJ_EXT) - $(DTRACE) -G -s perldtrace.d -o $(MINIDTRACE_O) $(minindt_obj) perlmini$(OBJ_EXT) +$(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt) + -rm -rf mpdtrace + mkdir mpdtrace + cp $(miniperl_objs_nodt) mpdtrace/ + $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MINI_O) $(miniperl_dtrace_objs) + +$(DTRACE_PERLLIB_O): perldtrace.d $(perllib_objs_nodt) + -rm -rf libpdtrace + mkdir libpdtrace + cp $(perllib_objs_nodt) libpdtrace/ + $(DTRACE) -G -s perldtrace.d -o $(DTRACE_PERLLIB_O) $(perllib_dtrace_objs) + +$(DTRACE_MAIN_O): perldtrace.d perlmain$(OBJ_EXT) + -rm -rf maindtrace + mkdir maindtrace + cp perlmain$(OBJ_EXT) maindtrace/ + $(DTRACE) -G -s perldtrace.d -o $(DTRACE_MAIN_O) $(perlmain_dtrace_objs) || \ + ( $(ECHO) "No probes in perlmain$(OBJ_EXT), generating a dummy $(DTRACE_MAIN_O)" && \ + $(ECHO) >dtrace_main.c && \ + `$(CCCMD)` $(PLDLFLAGS) dtrace_main.c && \ + rm -f dtrace_main.c ) !NO!SUBS! ;; esac $spitshell >>$Makefile <<'!NO!SUBS!' -$(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) +$(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT) !NO!SUBS! case "$useshrplib" in true) $spitshell >>$Makefile <<'!NO!SUBS!' rm -f $@ - $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) + $(LD) -o $@ $(SHRPLDFLAGS) $(perllib_objs) $(DYNALOADER) $(libs) !NO!SUBS! case "$osname" in aix) @@ -836,7 +928,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) *) $spitshell >>$Makefile <<'!NO!SUBS!' rm -f $(LIBPERL) - $(AR) rcu $(LIBPERL) $(obj) $(DYNALOADER) + $(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER) @$(ranlib) $(LIBPERL) !NO!SUBS! ;; @@ -865,18 +957,28 @@ $(MINIPERL_EXE): lib/buildcustomize.pl !NO!SUBS! case "${osname}${osvers}" in + amigaos*) + $spitshell >>$Makefile <<'!NO!SUBS!' +lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl + -@rm -f miniperl.xok + $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ + $(miniperl_objs) $(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) +lib/buildcustomize.pl: $& $(miniperl_objs) + $(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(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! ;; next4*) $spitshell >>$Makefile <<'!NO!SUBS!' -lib/buildcustomize.pl: $& $(mini_obj) write ldcustomize.pl - $(CC) -o $(MINIPERL_EXE) $(mini_obj libs) +lib/buildcustomize.pl: $& $(miniperl_objs) write ldcustomize.pl + $(CC) -o $(MINIPERL_EXE) $(miniperl_objs libs) $(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! @@ -895,10 +997,10 @@ NAMESPACEFLAGS = -force_flat_namespace ;; esac $spitshell >>$Makefile <<'!NO!SUBS!' -lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl +lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl -@rm -f miniperl.xok $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \ - $(mini_obj) $(libs) + $(miniperl_objs) $(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! @@ -906,7 +1008,7 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl *) if test "X$hostperl" != X; then $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' -lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl +lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl -@rm -f miniperl.xok $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ - $(mini_obj) $(libs) + $(miniperl_objs) $(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! @@ -928,9 +1030,28 @@ lib/buildcustomize.pl: $& $(mini_obj) write_buildcustomize.pl $spitshell >>$Makefile <<'!NO!SUBS!' -$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl +$(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl -@rm -f miniperl.xok - $(SHRPENV) $(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_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs) -ldl +!NO!SUBS! + ;; + os390) $spitshell >>$Makefile <<'!NO!SUBS!' + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs) +!NO!SUBS! + ;; + *) $spitshell >>$Makefile <<'!NO!SUBS!' + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(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: @@ -999,9 +1120,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/perl5214delta.pod: pod/perldelta.pod - $(RMS) pod/perl5214delta.pod - $(LNS) perldelta.pod pod/perl5214delta.pod +pod/perl5277delta.pod: pod/perldelta.pod + $(RMS) pod/perl5277delta.pod + $(LNS) perldelta.pod pod/perl5277delta.pod extra.pods: $(MINIPERL_EXE) -@test ! -f extra.pods || rm -f `cat extra.pods` @@ -1056,50 +1177,38 @@ EOT done if test "X$hostperl" != X; then + LOCAL_PERL='$(HOST_PERL)' $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 + LOCAL_PERL='$(RUN_PERL)' $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` +!NO!SUBS! +fi + +$spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' @@ -1216,7 +1325,7 @@ printconfig: 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" @@ -1226,6 +1335,7 @@ _clobber: -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 @@ -1248,15 +1358,6 @@ _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 - -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) @@ -1286,35 +1387,41 @@ _cleaner2: rm -rf $(unidatafiles) $(unidatadirs) rm -rf lib/auto rm -f lib/.exists lib/*/.exists lib/*/*/.exists - rm -f h2ph.man pstruct + rm -f h2ph.man rm -rf .config rm -f preload rm -f pod2htmd.tmp rm -rf pod/perlfunc pod/perlipc -rmdir ext/B/lib 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/Builder/Tester lib/Test/Builder lib/Test lib/Term + -rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding + -rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS + -rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale + -rmdir lib/Unicode/Collate/CJK lib/Unicode/Collate lib/Tie/Hash + -rmdir lib/Thread lib/Text lib/Test2/Util lib/Test2/Tools + -rmdir lib/Test2/IPC/Driver lib/Test2/IPC lib/Test2/Hub/Interceptor + -rmdir lib/Test2/Hub lib/Test2/Formatter lib/Test2/EventFacet + -rmdir lib/Test2/Event/TAP lib/Test2/Event lib/Test2/API lib/Test2 + -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/Search - -rmdir lib/Scalar lib/Pod/Text lib/Pod/Simple lib/Pod/Perldoc - -rmdir lib/PerlIO/via lib/PerlIO lib/Perl lib/Parse/CPAN lib/Parse - -rmdir lib/Params lib/Net/FTP lib/Module/Load lib/Module/CoreList - -rmdir lib/Module lib/Memoize lib/Math/BigInt lib/Math/BigFloat - -rmdir lib/Math lib/MIME lib/Locale/Maketext lib/Locale/Codes - -rmdir lib/Locale lib/List/Util lib/List lib/JSON/PP lib/JSON lib/IPC - -rmdir lib/IO/Uncompress/Adapter lib/IO/Uncompress lib/IO/Socket - -rmdir lib/IO/Compress/Zlib lib/IO/Compress/Zip lib/IO/Compress/Gzip - -rmdir lib/IO/Compress/Base lib/IO/Compress/Adapter lib/IO/Compress - -rmdir lib/IO lib/I18N/LangTags lib/I18N lib/Hash/Util lib/Hash - -rmdir lib/HTTP lib/Filter/Util lib/Filter lib/File/Spec - -rmdir lib/ExtUtils/Typemaps lib/ExtUtils/ParseXS + -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 @@ -1322,11 +1429,12 @@ _cleaner2: -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/Meta - -rmdir lib/CPAN/LWP lib/CPAN/Kwalify lib/CPAN/HTTP lib/CPAN/FTP - -rmdir lib/CPAN/Exception lib/CPAN/API lib/CPAN lib/Attribute - -rmdir lib/Archive/Tar lib/Archive lib/App/Prove/State/Result - -rmdir lib/App/Prove/State lib/App/Prove lib/App + -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 @@ -1342,9 +1450,14 @@ lint: $(c) rm -f *.ln lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c) -.PHONY: splint -splint: $(c) - splint $(splintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(splintfiles) +cscopeflags = -Rb # Recursive, build-only. + +.PHONY: cscope +# To query the cscope.out "cscope -dLnsymbol" where n = 0 means uses, +# 1 = definitions, 2 = callees, 3 = callers, for example +# "cscope -dL1Perl_mg_set" or run cscope interactively (no arguments). +cscope.out cscope: $(c) $(h) + cscope $(cscopeflags) # Need to unset during recursion to go out of loop. # The README below ensures that the dependency list is never empty and @@ -1368,15 +1481,16 @@ done $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: depend -depend: makedepend $(DTRACE_H) +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 \ test_harness test_harness_notty minitest test-reonly _test +# The _test target is there just for Test::Smoke, which does a make test_prep +# always before invoking this target, thus preventing checking again _test: - echo >&2 The _test target is deprecated. Please upgrade your smoker $(RUN_TESTS) choose # Cannot delegate rebuilding of t/perl to make @@ -1498,16 +1612,23 @@ 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