;;
esac
-# H.Merijn Brand [17 Feb 2004]
-# This comment is just to ensure that Configure will find variables that
-# are removed/replaced in patches on blead, but are still needed in the
-# 5.8.x, 5.6.x and 5.005.x maintainance tracks.
-# metaconfig -m will scan all .SH files on this level (not deeper), and
-# not in x2p and other subfolders. This file is as good as any .SH
-# patch references
-# #22227 $baserev
-# #22302 $yacc $byacc
-
-# H.Merijn Brand [30 Oct 2004]
-# Mentioned for the same reason for future reference
-# #23434 $d_strlcat $d_strlcpy
-
: 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
dtrace_h=''
dtrace_o=''
+minidtrace_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)'
+ && rm -f perldtrace.tmp && dtrace_o='perldtrace$(OBJ_EXT)' \
+ && minidtrace_o='miniperldtrace$(OBJ_EXT)'
;;
esac
DTRACE = $dtrace
DTRACE_H = $dtrace_h
DTRACE_O = $dtrace_o
+MINIDTRACE_O = $minidtrace_o
FIRSTMAKEFILE = $firstmakefile
# Files to be built with variable substitution before miniperl
# is available.
-sh = Makefile.SH cflags.SH config_h.SH makeaperl.SH makedepend.SH \
- myconfig.SH writemain.SH pod/Makefile.SH
-
-shextract = Makefile cflags config.h makeaperl makedepend \
- makedir myconfig writemain pod/Makefile
-
-# Files to be built with variable substitution after miniperl is
-# available. Dependencies handled manually below (for now).
+sh = Makefile.SH cflags.SH config_h.SH makedepend.SH myconfig.SH pod/Makefile.SH
-pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
- pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
+shextract = Makefile cflags config.h makedepend makedir myconfig pod/Makefile
-plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
- pod/pod2usage pod/podchecker pod/podselect
-
-addedbyconf = UU $(shextract) $(plextract) pstruct
+addedbyconf = UU $(shextract) pstruct
# Unicode data files generated by mktables
unidatafiles = lib/unicore/Decomposition.pl lib/unicore/TestProp.pl \
h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h opcode.h
h3 = pad.h patchlevel.h perl.h perlapi.h perly.h pp.h proto.h regcomp.h
h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h
-h5 = utf8.h warnings.h mydtrace.h op_reg_common.h
+h5 = utf8.h warnings.h mydtrace.h op_reg_common.h l1_char_class_tab.h
h = $(h1) $(h2) $(h3) $(h4) $(h5)
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
c4 = perlio.c perlapi.c numeric.c mathoms.c locale.c pp_pack.c pp_sort.c
c5 = $(madlysrc) $(mallocsrc)
-c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c perlmain.c opmini.c perlmini.c
+c = $(c1) $(c2) $(c3) $(c4) $(c5) miniperlmain.c opmini.c perlmini.c
obj0 = op$(OBJ_EXT) perl$(OBJ_EXT)
obj1 = $(madlyobj) $(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)
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)
-mini_obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) $(DTRACE_O)
+minindt_obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
+mini_obj = $(minindt_obj) $(MINIDTRACE_O)
ndt_obj = $(obj0) $(obj1) $(obj2) $(obj3) $(ARCHOBJS)
obj = $(ndt_obj) $(DTRACE_O)
-perltoc_pod_prereqs = extra.pods pod/perl5136delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
+perltoc_pod_prereqs = extra.pods pod/perl5139delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod
generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs)
Icwd = -Idist/Cwd -Idist/Cwd/lib
# make sure that we recompile perl.c if the git version changes
perl$(OBJ_EXT): git_version.h
-translators: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE
- @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
-
!NO!SUBS!
+# Making utilities and translators require 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" in
+define)
+ util_deps='$(MINIPERL_EXE) $(CONFIGPM) lib/auto/Cwd/Cwd$(DLSUFFIX) FORCE'
+ x2p_deps='$(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) FORCE'
+ ;;
+*) util_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
+ x2p_deps='$(PERL_EXE) $(CONFIGPM) FORCE'
+ ;;
+esac
+
$spitshell >>$Makefile <<!GROK!THIS!
-utilities: \$(MINIPERL_EXE) \$(CONFIGPM) \$(plextract) FORCE lib/auto/Cwd/Cwd.$dlext
+translators: $x2p_deps
+ @echo " "; echo " Making x2p stuff"; cd x2p; \$(LDLIBPTH) \$(MAKE) all
+
+x2p/s2p: $x2p_deps
+ cd x2p; \$(LDLIBPTH) \$(MAKE) s2p
+
+utilities: $util_deps
@echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
!GROK!THIS!
+
$spitshell >>$Makefile <<'!NO!SUBS!'
# This is now done by installman only if you actually want the man pages.
miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
$(CCCMD) $(PLDLFLAGS) $*.c
-perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE)
- sh writemain $(DYNALOADER) $(static_ext) > perlmain.c
+perlmain.c: $(MINIPERL_EXE) lib/ExtUtils/Miniperl.pm
+ $(MINIPERL) -Ilib -MExtUtils::Miniperl -e 'writemain(@ARGV)' DynaLoader $(static_ext) > perlmain.c
perlmain$(OBJ_EXT): perlmain.c
$(CCCMD) $(PLDLFLAGS) $*.c
case "$dtrace_o" in
?*)
$spitshell >>$Makefile <<'!NO!SUBS!'
-$(DTRACE_O): perldtrace.d
+$(DTRACE_O): perldtrace.d $(ndt_obj)
$(DTRACE) -G -s perldtrace.d -o $(DTRACE_O) $(ndt_obj)
+$(MINIDTRACE_O): perldtrace.d $(minindt_obj)
+ $(DTRACE) -G -s perldtrace.d -o $(MINIDTRACE_O) $(minindt_obj)
+
!NO!SUBS!
;;
esac
@-rm -f $@
cp ext/re/re.pm lib/re.pm
-$(plextract): $(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext)
- @-rm -f $@
- $(MINIPERL) $@.PL
-
-x2p/s2p: $(MINIPERL_EXE) $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
- cd x2p; $(LDLIBPTH) $(MAKE) s2p
-
unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)
pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST
$(MINIPERL) $(Icwd) pod/perlmodlib.PL -q
-pod/perl5136delta.pod: pod/perldelta.pod
- $(LNS) perldelta.pod pod/perl5136delta.pod
+pod/perl5139delta.pod: pod/perldelta.pod
+ $(LNS) perldelta.pod pod/perl5139delta.pod
extra.pods: $(MINIPERL_EXE)
-@test ! -f extra.pods || rm -f `cat extra.pods`
# No compat3.sym here since and including the 5.004_50.
# No interp.sym since 5.005_03.
-SYM = global.sym globvar.sym perlio.sym pp.sym
+SYM = global.sym globvar.sym perlio.sym
SYMH = perlvars.h intrpvar.h
# The following files are generated automatically
# embed.pl: proto.h embed.h embedvar.h global.sym
# perlapi.h perlapi.c
-# [* embed.pl needs pp.sym generated by opcode.pl! *]
# keywords.pl: keywords.h
-# opcode.pl: opcode.h opnames.h pp.sym
+# opcode.pl: opcode.h opnames.h pp_proto.h
# regcomp.pl: regnodes.h
# warnings.pl: warnings.h lib/warnings.pm
# The correct versions should be already supplied with the perl kit,
# with your existing copy of perl
# (make regen_headers is kept for backwards compatibility)
-AUTOGEN_FILES = keywords.h opcode.h opnames.h pp.sym proto.h \
+AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h proto.h \
embed.h embedvar.h global.sym \
perlapi.h perlapi.c regnodes.h \
warnings.h lib/warnings.pm
-rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
- -rm -f opcode.h-old opnames.h-old pp.sym-old
+ -rm -f opcode.h-old opnames.h-old pp_proto.h-old
-rm -f config.arch config.over $(DTRACE_H) runtests
# Do not 'make _tidy' directly.
-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
+ -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
config.h: config_h.SH config.sh
$(SHELL) config_h.SH
-# When done, touch perlmain.c so that it doesn't get remade each time.
.PHONY: depend
depend: makedepend
sh ./makedepend MAKE=$(MAKE)
- - test -s perlmain.c && touch perlmain.c
cd x2p; $(MAKE) depend
# Cannot postpone this until $firstmakefile is ready ;-)
test_prep_pre: preplibrary utilities $(nonxs_ext)
-test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p
+test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) runtests x2p/s2p $(generated_pods)
cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
nokfilenack: utilities
$(RUN_PERL) -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok -A
-.PHONY: clist hlist shlist pllist
+.PHONY: clist hlist shlist
clist: $(c)
echo $(c) | tr ' ' $(TRNL) >.clist
shlist: $(sh)
echo $(sh) | tr ' ' $(TRNL) >.shlist
-pllist: $(pl)
- echo $(pl) | tr ' ' $(TRNL) >.pllist
-
Makefile: Makefile.SH ./config.sh
$(SHELL) Makefile.SH