X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/9b2c64f15d3926b938688f7990ff65d783115fe7..0d40ea5e98ce5de7a1a2facb17e53e315155a577:/Makefile.SH?ds=sidebyside diff --git a/Makefile.SH b/Makefile.SH index d877c72..d5a710a 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -67,8 +67,16 @@ true) -compatibility_version \ ${api_revision}.${api_version}.${api_subversion} \ -current_version \ - ${revision}.${patchlevel}.${subversion} \ - -install_name \$(shrpdir)/\$@" + ${revision}.${patchlevel}.${subversion}" + case "$osvers" in + 1[5-9]*|[2-9]*) + shrpldflags="$shrpldflags -install_name `pwd`/\$@ -Xlinker -headerpad_max_install_names" + exeldflags="-Xlinker -headerpad_max_install_names" + ;; + *) + shrpldflags="$shrpldflags -install_name \$(shrpdir)/\$@" + ;; + esac ;; cygwin*) shrpldflags="$shrpldflags -Wl,--out-implib=libperl.dll.a -Wl,--image-base,0x52000000" @@ -180,7 +188,7 @@ list_util_dep='$(PERL_EXE)' for f in $dynamic_ext; do case $f in Cwd) static_cwd='undef' ;; - List/Util) list_util_dep=lib/auto/List/Util/Util.$dlext + List/Util) list_util_dep=lib/auto/List/Util/Util.$dlext ;; esac done @@ -189,11 +197,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 @@ -230,15 +239,20 @@ 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' case "$dtraceobject" in define) - dtrace_o='perldtrace$(OBJ_EXT)' - minidtrace_o='miniperldtrace$(OBJ_EXT)' + dtrace_perllib_o='dtrace_perllib$(OBJ_EXT)' + dtrace_mini_o='dtrace_mini$(OBJ_EXT)' + dtrace_main_o='dtrace_main$(OBJ_EXT)' ;; esac ;; @@ -328,6 +342,14 @@ MANIFEST_SRT = MANIFEST.srt !GROK!THIS! +case "$useshrplib$osname" in +truedarwin) + $spitshell >>$Makefile <>$Makefile <>$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 \ @@ -496,18 +525,68 @@ 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_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) dquote$(OBJ_EXT) time64$(OBJ_EXT) -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) +# 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!' + +miniperl_dtrace_objs = $(miniperl_objs_nodt:%=mpdtrace/%) +perllib_dtrace_objs = $(perllib_objs_nodt:%=libpdtrace/%) +perlmain_dtrace_objs = maindtrace/perlmain$(OBJ_EXT) + +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/perl5239delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod +perltoc_pod_prereqs = extra.pods pod/perl52910delta.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 @@ -543,32 +622,6 @@ 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 @@ -581,7 +634,7 @@ splintfiles = $(c1) @echo `$(CCCMDSRC)` -S $*.c @`$(CCCMDSRC)` -S $*.c -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) +all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) common_build @echo " "; @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." @@ -620,7 +673,7 @@ esac $spitshell >>$Makefile <>$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 @@ -729,7 +782,7 @@ ext.libs: $(static_ext) *) $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 @@ -766,9 +819,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) rc $(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) \ @@ -792,7 +845,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! ;; @@ -801,7 +854,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! ;; @@ -812,9 +865,9 @@ cygwin.c: cygwin/cygwin.c LIBPERL_NONSHR = libperl$(LIB_EXT) -$(LIBPERL_NONSHR): $(obj) +$(LIBPERL_NONSHR): $(perllib_objs) $(RMS) $(LIBPERL_NONSHR) - $(AR) rc $(LIBPERL_NONSHR) $(obj) + $(AR) rc $(LIBPERL_NONSHR) $(perllib_objs) !NO!SUBS! ;; @@ -841,26 +894,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) @@ -875,7 +944,7 @@ $(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) *) $spitshell >>$Makefile <<'!NO!SUBS!' rm -f $(LIBPERL) - $(AR) rc $(LIBPERL) $(obj) $(DYNALOADER) + $(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER) @$(ranlib) $(LIBPERL) !NO!SUBS! ;; @@ -906,26 +975,26 @@ $(MINIPERL_EXE): lib/buildcustomize.pl case "${osname}${osvers}" in amigaos*) $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) -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! ;; 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! @@ -944,10 +1013,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! @@ -955,7 +1024,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! @@ -977,7 +1046,7 @@ 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 !NO!SUBS! @@ -985,15 +1054,29 @@ $(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPOR # 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 + $(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$(OBJ_EXT) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs) + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(LLIBPERL) $(static_ext) `cat ext.libs` $(libs) !NO!SUBS! ;; + + darwin) + case "$useshrplib$osvers" in + true1[5-9]*|true[2-9]*) $spitshell >>$Makefile <<'!NO!SUBS!' + $(SHRPENV) $(CC) -o perl $(PERL_EXE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `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!' - $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) + $(SHRPENV) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) !NO!SUBS! ;; esac @@ -1037,7 +1120,7 @@ esac $spitshell >>$Makefile <<'!NO!SUBS!' -.PHONY: preplibrary +.PHONY: preplibrary common_build preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL) $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD) @@ -1056,7 +1139,7 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) # $(PERL_EXE) and ext because pod_lib.pl needs Digest::MD5 # 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 +pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc $(RUN_PERL) -f pod/buildtoc -q pod/perlapi.pod: pod/perlintern.pod @@ -1067,9 +1150,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/perl5239delta.pod: pod/perldelta.pod - $(RMS) pod/perl5239delta.pod - $(LNS) perldelta.pod pod/perl5239delta.pod +pod/perl52910delta.pod: pod/perldelta.pod + $(RMS) pod/perl52910delta.pod + $(LNS) perldelta.pod pod/perl52910delta.pod extra.pods: $(MINIPERL_EXE) -@test ! -f extra.pods || rm -f `cat extra.pods` @@ -1100,7 +1183,6 @@ no_install no-install: install-notify install: install-all !NO!SUBS! - for name in all notify silent strip verbose; do flags="--$name"; flags=`echo $flags | sed -e 's/--all//'` @@ -1124,50 +1206,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!' @@ -1213,10 +1283,6 @@ CHMOD_W = chmod +w # with your existing copy of perl # (make regen_headers is kept for backwards compatibility) -AUTOGEN_FILES = opcode.h opnames.h pp_proto.h proto.h embed.h embedvar.h \ - perlapi.h perlapi.c regnodes.h warnings.h lib/warnings.pm \ - lib/feature.pm feature.h - .PHONY: regen_headers regen_all regen: FORCE @@ -1335,6 +1401,14 @@ _cleaner1: # run once if nothhing is passed in. It is such a great help. # Some systems do not support "?", so keep these files separate. + +# The Time::HiRes Makefile *should* remove dist/Time-HiRes/xdefine for 'clean', +# but it's possible to get a rebuilt checkout into a state where it can't run +# distclean, and can't recover until the file is gone. +# There's no harm in adding it to the top level 'distclean' target - it should +# anyway by then, and miniperl is long gone. +# Add new rules before that line - the next line (rm -f so_locations ...) is +# used as a placeholder by a regen script. _cleaner2: -rm -f core.*perl.*.? t/core.perl.*.? .?*.c rm -f core *perl.core t/core t/*perl.core core.* t/core.* @@ -1346,33 +1420,38 @@ _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 dist/Time-HiRes/xdefine 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/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/Info + -rmdir lib/Test2/EventFacet lib/Test2/Event/TAP lib/Test2/Event + -rmdir lib/Test2/API lib/Test2 lib/Test/use lib/Test/Tester + -rmdir lib/Test/Builder/Tester lib/Test/Builder/IO lib/Test/Builder + -rmdir lib/Test lib/Term lib/TAP/Parser/YAMLish + -rmdir lib/TAP/Parser/SourceHandler lib/TAP/Parser/Scheduler + -rmdir lib/TAP/Parser/Result lib/TAP/Parser/Iterator lib/TAP/Parser + -rmdir lib/TAP/Harness lib/TAP/Formatter/File + -rmdir lib/TAP/Formatter/Console lib/TAP/Formatter lib/TAP + -rmdir lib/Sys/Syslog lib/Sys lib/Sub lib/Search lib/Scalar + -rmdir lib/Pod/Text lib/Pod/Simple lib/Pod/Perldoc lib/PerlIO/via + -rmdir lib/PerlIO lib/Perl lib/Parse/CPAN lib/Parse lib/Params + -rmdir lib/Net/FTP lib/Module/Load lib/Module/CoreList lib/Module + -rmdir lib/Memoize lib/Math/BigInt lib/Math/BigFloat lib/Math lib/MIME + -rmdir lib/Locale/Maketext lib/Locale lib/List/Util lib/List + -rmdir lib/JSON/PP lib/JSON lib/IPC lib/IO/Uncompress/Adapter + -rmdir lib/IO/Uncompress lib/IO/Socket lib/IO/Compress/Zlib + -rmdir lib/IO/Compress/Zip 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 @@ -1405,10 +1484,6 @@ 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 @@ -1447,8 +1522,9 @@ depend: makedepend $(DTRACE_H) $(generated_headers) 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 @@ -1462,7 +1538,7 @@ test_prep_pre: preplibrary utilities $(nonxs_ext) 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 $(generated_pods) + $(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) common_build cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) !NO!SUBS! @@ -1470,7 +1546,7 @@ test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \ *) $spitshell >>$Makefile <>$Makefile <>$Makefile <<'!NO!SUBS!' + # Handy way to run perlbug -ok without having to install and run the # installed perlbug. We don't re-run the tests here - we trust the user. # Please *don't* use this unless all tests pass.