X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=11799f56819532169ce3fb6d56dd9397c4cda860;hb=33773f1a6c844b2c59f262a2b0f9af000d7d13b7;hp=3d60f1048bccc5b30f43ce66a2e6370e3a927c56;hpb=cb3fc4263509f28c87c21a0ddac50efa1bb80122;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index 3d60f10..11799f5 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -9,6 +9,21 @@ case $PERL_CONFIG_SH in . $TOP/config.sh ;; 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 @@ -58,9 +73,13 @@ true) sunos*) linklibperl="-lperl" ;; - netbsd*|freebsd[234]*|openbsd*) + netbsd*|freebsd[234]*|openbsd*|dragonfly*) linklibperl="-L. -lperl" ;; + interix*) + linklibperl="-L. -lperl" + shrpldflags="$shrpldflags -Wl,--image-base,0x57000000" + ;; aix*) shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" case "$osvers" in @@ -76,7 +95,7 @@ true) linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl" ;; os390*) - shrpldflags='-W l,dll' + shrpldflags='-W l,XPLINK,dll' linklibperl='libperl.x' DPERL_EXTERNAL_GLOB='' ;; @@ -104,17 +123,25 @@ true) case "$osname" in linux) + # If there is a pre-existing $libperl from a previous + # installation, Linux needs to use LD_PRELOAD to + # override the LD_LIBRARY_PATH setting. See the + # INSTALL file, under "Building a shared perl library". + # If there is no pre-existing $libperl, we don't need + # to do anything further. + if test -f $archlib/CORE/$libperl; then rm -f preload - cat <<-'EOT' > preload - #! /bin/sh - lib=$1 - shift - test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" - exec "$@" - EOT + cat <<'EOT' > preload +#! /bin/sh +lib=$1 +shift +test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" +exec "$@" +EOT chmod 755 preload ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" - ;; + fi + ;; os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" ;; esac @@ -128,10 +155,27 @@ esac : Prepare dependency lists for Makefile. dynamic_list=' ' +extra_dep='' +case "$d_cplusplus" in +define) + : delete as a function name will not work. + dynamic_ext=`echo $dynamic_ext | sed 's/ODBM_File//'` + static_ext=`echo $static_ext | sed 's/ODBM_File//'` + ;; +esac for f in $dynamic_ext; do : the dependency named here will never exist base=`echo "$f" | sed 's/.*\///'` - dynamic_list="$dynamic_list 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 + case $f in + Math/BigInt/FastCalc) extra_dep="$extra_dep +$this_target: lib/auto/List/Util/Util.$dlext" ;; + Unicode/Normalize) extra_dep="$extra_dep +$this_target: uni.data" ;; + esac done static_list=' ' @@ -146,15 +190,6 @@ for f in $nonxs_ext; do nonxs_list="$nonxs_list ext/$f/pm_to_blib" done -# Handle the usage of different yaccs in posix-bc (During Configure we -# us yacc for perly.y and byacc for a2p.y. The makefiles must use the -# same configuration for run_byacc!): -case "$osname" in - posix-bc) - byacc=$yacc - ;; -esac - echo "Extracting Makefile (with variable substitutions)" $spitshell >Makefile <Makefile < testcompile; - cd utils; $(MAKE) compile; - cd x2p; $(MAKE) compile; - cd pod; $(MAKE) compile; +.PHONY: all translators utilities -translators: miniperl$(EXE_EXT) lib/Config.pm FORCE +translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all -utilities: miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE +utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all @@ -377,11 +474,12 @@ $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' @@ -389,8 +487,7 @@ miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h $(CCCMD) $(PLDLFLAGS) $*.c perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE) - sh writemain $(DYNALOADER) $(static_ext) > writemain.tmp - sh mv-if-diff writemain.tmp perlmain.c + sh writemain $(DYNALOADER) $(static_ext) > perlmain.c !NO!SUBS! case "$osname" in @@ -438,9 +535,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): perl$(OBJ_EXT) $(obj) +$(LIBPERL_NONSHR): $(obj) $(RMS) $(LIBPERL_NONSHR) - $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj) + $(AR) rcu $(LIBPERL_NONSHR) $(obj) $(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \ @@ -464,8 +561,7 @@ PERLEXPORT = perl.exp esac $spitshell >>Makefile <<'!NO!SUBS!' perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) - ./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp.tmp - sh mv-if-diff perl.exp.tmp perl.exp + ./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp !NO!SUBS! ;; @@ -474,8 +570,7 @@ os2) MINIPERLEXP = miniperl perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map - ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl.exp.tmp - sh mv-if-diff perl.exp.tmp perl5.def + ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl.exp !NO!SUBS! ;; @@ -489,12 +584,12 @@ Makefile: $Makefile_s !GROK!THIS! else $spitshell >>Makefile <<'!NO!SUBS!' -$(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) +$(LIBPERL): $& $(obj) $(DYNALOADER) $(LIBPERLEXPORT) !NO!SUBS! case "$useshrplib" in true) $spitshell >>Makefile <<'!NO!SUBS!' - $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) + $(LD) -o $@ $(SHRPLDFLAGS) $(obj) $(DYNALOADER) $(libs) !NO!SUBS! case "$osname" in aix) @@ -509,7 +604,7 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) *) $spitshell >>Makefile <<'!NO!SUBS!' rm -f $(LIBPERL) - $(AR) rcu $(LIBPERL) perl$(OBJ_EXT) $(obj) + $(AR) rcu $(LIBPERL) $(obj) $(DYNALOADER) @$(ranlib) $(LIBPERL) !NO!SUBS! ;; @@ -529,20 +624,20 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) !NO!SUBS! case "${osname}${osvers}" in - aix*) + aix*|beos*) $spitshell >>Makefile <<'!NO!SUBS!' -miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) +miniperl: $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT) $(CC) -o miniperl $(CLDFLAGS) \ `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; - beos*|next4*) + next4*) $spitshell >>Makefile <<'!NO!SUBS!' -miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) +miniperl: $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT) $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; @@ -550,27 +645,31 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) case "$osvers" in [1-6].*) ;; *) case "$ldflags" in - *"-flat_namespace"*) ;; - *) # to allow opmini.o to override stuff in libperl.dylib - namespaceflags="-force_flat_namespace" ;; - esac - ;; + *"-flat_namespace"*) ;; + *) # to allow opmini.o to override stuff in libperl.dylib + $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' -miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) +miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT) -@rm -f miniperl.xok - $(CC) $(CLDFLAGS) $(namespaceflags) -o miniperl \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) + $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \ + `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest - $spitshell >>Makefile <<'!NO!SUBS!' !NO!SUBS! ;; *) $spitshell >>Makefile <<'!NO!SUBS!' -miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) +miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(obj) opmini$(OBJ_EXT) -@rm -f miniperl.xok - $(CC) $(CLDFLAGS) -o miniperl \ - miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) + $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ + `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(libs) $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest !NO!SUBS! ;; @@ -578,27 +677,38 @@ miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) $spitshell >>Makefile <<'!NO!SUBS!' -perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) +perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) -@rm -f miniperl.xok - $(SHRPENV) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) + $(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # Purify/Quantify Perls. -pureperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) - $(SHRPENV) purify $(CC) -o pureperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) +pureperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) + $(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) + +purecovperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) + $(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -purecovperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) - $(SHRPENV) purecov $(CC) -o purecovperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) +quantperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) + $(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -quantperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) - $(SHRPENV) quantify $(CC) -o quantperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) +# Valgrind perl (currently Linux only) + +perl.valgrind.config: config.sh + @echo "To build perl.valgrind you must Configure -Doptimize=-g -Uusemymalloc, checking..." + @$(MAKE) perl.config.dashg + @echo "Checking usemymalloc='n' in config.sh..." + @grep "^usemymalloc=" config.sh + @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1 + @echo "And of course you have to have valgrind..." + $(VALGRIND) ./perl -e 1 2>/dev/null || exit 1 # Third Degree Perl (Tru64 only) perl.config.dashg: @echo "Checking optimize='-g' in config.sh..." - @grep "^optimize=" config.sh - @grep "^optimize='-g'" config.sh >/dev/null || exit 1 + @grep "^optimize=" config.sh + @egrep "^optimize='(.*-g.*)'" config.sh >/dev/null || exit 1 perl.third.config: config.sh @echo "To build perl.third you must Configure -Doptimize=-g -Uusemymalloc, checking..." @@ -677,8 +787,8 @@ microperl: # checks as well as the special code to validate that the script in question # has been invoked correctly. -suidperl$(EXE_EXT): $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) - $(SHRPENV) $(CC) -o suidperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) +suidperl$(EXE_EXT): $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) + $(SHRPENV) $(LDLIBPTH) $(CC) -o suidperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) !NO!SUBS! @@ -697,7 +807,7 @@ sperl$(OBJ_EXT): perl.c $(h) # We need to autosplit in two steps because VOS can't handle so many args # .PHONY: preplibrary -preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) +preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) @sh ./makedir lib/auto @echo " AutoSplitting perl library" $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ @@ -706,34 +816,41 @@ preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) autosplit_lib_modules(@ARGV)' lib/*/*.pm $(MAKE) lib/re.pm -# Take care to avoid modifying lib/Config.pm without reason -# (If trying to create a new port and having problems with the configpm script, -# try 'make minitest' and/or commenting out the tests at the end of configpm.) -lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary - $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp - sh mv-if-diff configpm.tmp $@ +.PHONY: makeppport +makeppport: miniperl$(EXE_EXT) $(CONFIGPM) + $(LDLIBPTH) ./miniperl -Ilib mkppport + +lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary + $(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm + +$(CONFIGPM): lib/Config.pod -lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm - $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp - sh mv-if-diff minimod.tmp $@ - -touch lib/ExtUtils/Miniperl.pm +lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM) + $(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm lib/re.pm: ext/re/re.pm - cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm + @-rm -f $@ + cp ext/re/re.pm lib/re.pm -$(plextract): miniperl$(EXE_EXT) lib/Config.pm x2p/s2p +$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p @-rm -f $@ - $(LDLIBPTH) ./miniperl -Ilib $@.PL + $(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL -x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL +x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL cd x2p; $(LDLIBPTH) $(MAKE) s2p -lib/lib.pm: miniperl$(EXE_EXT) lib/Config.pm +lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM) @-rm -f $@ $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL +unidatafiles $(unidatafiles): uni.data + +uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables + cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w + touch uni.data + extra.pods: miniperl$(EXE_EXT) - -@test -f extra.pods && rm -f `cat extra.pods` + -@test ! -f extra.pods || rm -f `cat extra.pods` -@rm -f extra.pods -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ nx=`echo $$x | sed -e "s/README\.//"`; \ @@ -742,85 +859,78 @@ extra.pods: miniperl$(EXE_EXT) done -@rm -f pod/perlvms.pod -@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods + -@rm -f pod/perldelta.pod + -@test -f pod/perl595delta.pod && cd pod && $(LNS) perl595delta.pod perldelta.pod && cd .. && echo "pod/perldelta.pod" >> extra.pods # See buildtoc extras.make: perl$(EXE_EXT) - -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` + -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` extras.test: perl$(EXE_EXT) - -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` + -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` extras.install: perl$(EXE_EXT) - -@test -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` + -@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -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 +META.yml: Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm + $(LDLIBPTH) ./miniperl -Ilib Porting/makemeta + install-strip: - $(MAKE) STRIPFLAGS=-s install + $(MAKE) STRIPFLAGS=-s install DESTDIR="$(DESTDIR)" install install-all: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) DESTDIR="$(DESTDIR)" install-verbose: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-V + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-V DESTDIR="$(DESTDIR)" install-silent: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-S + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-S DESTDIR="$(DESTDIR)" no-install: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n - -install.perl: all installperl - if [ -n "$(COMPILE)" ]; \ - then \ - cd utils; $(MAKE) compile; \ - cd ../x2p; $(MAKE) compile; \ - cd ../pod; $(MAKE) compile; \ - else :; \ - fi - $(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS) + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n DESTDIR="$(DESTDIR)" + +# Set this to an empty string to avoid an attempt of rebuild before install +INSTALL_DEPENDENCE = all + +install.perl: $(INSTALL_DEPENDENCE) installperl + $(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) $(MAKE) extras.install install.man: all installman - $(LDLIBPTH) ./perl installman $(INSTALLFLAGS) + $(LDLIBPTH) ./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 .. - $(LDLIBPTH) ./perl installhtml \ + $(LDLIBPTH) ./perl installhtml \ --podroot=. --podpath=. --recurse \ - --htmldir=$(privlib)/html \ - --htmlroot=$(privlib)/html \ + --htmldir=$(privlib)/html \ + --htmlroot=$(privlib)/html \ --splithead=pod/perlipc \ --splititem=pod/perlfunc \ --libpods=perlfunc:perlguts:perlvar:perlrun:perlop \ + --ignore=Porting/Maintainers.pm,Porting/patching.pod,Porting/pumpkin.pod,Porting/repository.pod \ --verbose # I now supply perly.c with the kits, so the following section is -# used only if you force byacc to run by saying -# make run_byacc -# Since we patch up the byacc output, the perly.fixer script needs -# to run with precisely the same version of byacc as I use. You -# normally shouldn't remake perly.[ch]. - -.PHONY: check_byacc run_byacc - -check_byacc: - @$(BYACC) -V 2>&1 | grep 'version 1\.8\.2' - -run_byacc: FORCE check_byacc - $(BYACC) -d perly.y - -chmod 664 perly.c perly.h - sh $(shellflags) ./perly.fixer y.tab.c perly.c - sed -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \ - -e 's/y\.tab/perly/g' perly.c >perly.tmp && mv perly.tmp perly.c - sed -e '/^extern YYSTYPE yy/D' y.tab.h >yh.tmp && mv yh.tmp y.tab.h - cmp -s y.tab.h perly.h && rm -f y.tab.h || mv y.tab.h perly.h - perl -i.old perlyline.pl perly.c - chmod 664 vms/perly_c.vms vms/perly_h.vms - perl vms/vms_yfix.pl perly.c perly.h vms/perly_c.vms vms/perly_h.vms +# used only if you force bison to run by saying +# make regen_perly +# You normally shouldn't remake perly.[ch]. + +.PHONY: regen_perly + +run_byacc: + @echo "run_byacc is obsolete; try 'make regen_perly' instead" + +# this outputs perly.h, perly.act, perly.tab, madly.h, madly.act and madly.tab +regen_perly: + perl regen_perly.pl + perl regen_perly.pl madly.y # We don't want to regenerate perly.c and perly.h, but they might # appear out-of-date after a patch is applied or a new distribution is @@ -831,10 +941,12 @@ perly.c: perly.y perly.h: perly.y -@sh -c true -PERLYVMS = vms/perly_c.vms vms/perly_h.vms +# Similary for madly. +madly.c: madly.y + -@sh -c true -$(PERLYVMS): perly.c perly.h vms/vms_yfix.pl - perl vms/vms_yfix.pl perly.c perly.h vms/perly_c.vms vms/perly_h.vms +madly.h: madly.y + -@sh -c true # No compat3.sym here since and including the 5.004_50. # No interp.sym since 5.005_03. @@ -846,8 +958,6 @@ CHMOD_W = chmod +w # The following files are generated automatically # autodoc.pl: pod/perlapi.pod pod/perlintern.pod -# bytecode.pl: ext/ByteLoader/byterun.h ext/ByteLoader/byterun.c -# ext/B/B/Asmdata.pm # embed.pl: proto.h embed.h embedvar.h global.sym # perlapi.h perlapi.c # [* embed.pl needs pp.sym generated by opcode.pl! *] @@ -865,8 +975,7 @@ CHMOD_W = chmod +w AUTOGEN_FILES = keywords.h opcode.h opnames.h pp_proto.h pp.sym proto.h \ embed.h embedvar.h global.sym \ pod/perlintern.pod pod/perlapi.pod \ - perlapi.h perlapi.c ext/ByteLoader/byterun.h \ - ext/ByteLoader/byterun.c ext/B/B/Asmdata.pm regnodes.h \ + perlapi.h perlapi.c regnodes.h \ warnings.h lib/warnings.pm .PHONY: regen_headers regen_pods regen_all @@ -877,13 +986,13 @@ regen regen_headers: FORCE regen_pods: FORCE -cd pod; $(LDLIBPTH) $(MAKE) regen_pods -regen_all: $(PERLYVMS) regen regen_pods +regen_all: regen regen_pods .PHONY: manisort manicheck manisort: FORCE - LC_ALL=C sort -fc MANIFEST || (echo "WARNING: re-sorting MANIFEST"; \ - LC_ALL=C sort -fo MANIFEST MANIFEST) + LC_ALL=C sort -fdc MANIFEST || (echo "WARNING: re-sorting MANIFEST"; \ + LC_ALL=C sort -fdo MANIFEST MANIFEST) manicheck: FORCE perl Porting/manicheck @@ -901,14 +1010,25 @@ manicheck: FORCE $(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE +d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) -s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE +s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) +!NO!SUBS! + +$spitshell >>Makefile <>Makefile <<'!NO!SUBS!' + +.PHONY: printconfig +printconfig: + @eval `$(LDLIBPTH) ./perl -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR) .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ realclean _realcleaner clobber _clobber \ @@ -933,11 +1053,11 @@ veryclean: _verycleaner _mopup _clobber # Do not 'make _mopup' directly. _mopup: - rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c + rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c -rmdir .depending -@test -f extra.pods && rm -f `cat extra.pods` -@test -f vms/README_vms.pod && rm -f vms/README_vms.pod - -rm -f perl.exp ext.libs extra.pods opmini.o + -rm -f perl.exp ext.libs extra.pods uni.data opmini.o -rm -f perl.export perl.dll perl.libexp perl.map perl.def -rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap -rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log @@ -946,6 +1066,7 @@ _mopup: -rm -f perlld cygwin.c ld2 libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump -rm -f perl$(EXE_EXT) suidperl$(EXE_EXT) miniperl$(EXE_EXT) $(LIBPERL) libperl.* microperl -rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old + -rm -f config.over # Do not 'make _tidy' directly. _tidy: @@ -955,7 +1076,6 @@ _tidy: -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) sh ext/util/make_ext clean $$x MAKE=$(MAKE) ; \ done - rm -f testcompile compilelog _cleaner1: -cd os2; rm -f Makefile @@ -965,27 +1085,32 @@ _cleaner1: -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) sh ext/util/make_ext $(CLEAN) $$x MAKE=$(MAKE) ; \ done + $(LDLIBPTH) ./miniperl -Ilib mkppport --clean # Some systems do not support "?", so keep these files separate. _cleaner2: -rm -f core.*perl.*.? t/core.perl.*.? .?*.c - rm -f core *perl.core t/core t/*perl.core + rm -f core *perl.core t/core t/*perl.core core.* t/core.* rm -f t/misctmp* t/forktmp* t/tmp* t/c t/perl$(EXE_EXT) t/rantests rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old - rm -f $(private) lib/Config.pod + rm -f $(private) + rm -rf $(unidatafiles) $(unidatadirs) rm -rf lib/auto rm -f lib/.exists lib/*/.exists lib/*/*/.exists rm -f h2ph.man pstruct rm -rf .config rm -f preload - rm -f testcompile compilelog - -rmdir lib/B lib/Data lib/Digest - rm -rf lib/Encode - -rmdir lib/IO/Socket lib/IO/t lib/IO - -rmdir lib/Filter/Util lib/List lib/MIME lib/PerlIO lib/Scalar lib/Sys - -rmdir lib/Thread lib/XS lib/threads/shared lib/threads t/lib/B + rm -rf lib/Encode lib/Compress lib/Hash + 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) + -rmdir lib/B lib/Data + -rmdir lib/Filter/Util lib/IO/Socket + -rmdir lib/List lib/MIME lib/Scalar lib/Sys + -rmdir lib/threads lib/XS _realcleaner: @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean @@ -996,14 +1121,14 @@ _verycleaner: @$(LDLIBPTH) $(MAKE) _cleaner2 -rm -f *~ *.orig */*~ */*.orig */*/*~ */*/*.orig -# The following lint has practically everything turned on. Unfortunately, -# you have to wade through a lot of mumbo jumbo that can't be suppressed. -# If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message -# for that spot. - .PHONY: lint lint: $(c) - lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz + 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) # Need to unset during recursion to go out of loop. # The README below ensures that the dependency list is never empty and @@ -1031,9 +1156,10 @@ makedepend: makedepend.SH config.sh .PHONY: test check test_prep test_prep_nodll test_prep_pre _test_prep \ test_tty test-tty _test_tty test_notty test-notty _test_notty \ utest ucheck test.utf8 check.utf8 test.torture torturetest \ + test.utf16 check.utf16 utest.utf16 ucheck.utf16 \ test.third check.third utest.third ucheck.third test_notty.third \ - test.deparse test_notty.deparse test_harness \ - minitest coretest + test.deparse test_notty.deparse test_harness test_harness_notty \ + minitest coretest test.taintwarn # Cannot delegate rebuilding of t/perl to make # to allow interlaced test and minitest @@ -1047,14 +1173,14 @@ _test_prep: test_prep_pre: preplibrary utilities $(nonxs_ext) -test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) +test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) PERL=./perl $(MAKE) _test_prep _test_tty: - cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) $(TESTFILE) $(TEST_ARGS) tags +ctags: + ctags -f Tags -N --totals --languages=c --langmap=c:+.h --exclude=opmini.c *.c *.h + # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE # If this runs make out of memory, delete /usr/include lines. !NO!SUBS! @@ -1220,49 +1383,11 @@ $rm -f $firstmakefile # Now do any special processing required before building. case "$ebcdic" in -$define) +define) xxx='' - echo "This is an EBCDIC system, checking if any parser files need regenerating." >&4 + echo "This is an EBCDIC system, checking if any parser files need regenerating." >&2 case "$osname" in os390|posix-bc) - rm -f y.tab.c y.tab.h - # yacc must be a reentrant ("pure") Bison in BS2000 Posix! - yacc -d perly.y >/dev/null 2>&1 - if cmp -s y.tab.c perly.c; then - rm -f y.tab.c - else - echo "perly.y -> perly.c" >&2 - mv -f y.tab.c perly.c - chmod u+w perly.c - sed -e '/^#include "perl\.h"/a\ -\ -#define yydebug PL_yydebug\ -#define yynerrs PL_yynerrs\ -#define yyerrflag PL_yyerrflag\ -#define yychar PL_yychar\ -#define yyval PL_yyval\ -#define yylval PL_yylval' \ - -e '/YYSTYPE *yyval;/D' \ - -e '/YYSTYPE *yylval;/D' \ - -e '/int yychar,/,/yynerrs;/D' \ - -e 's/int yydebug = 0;/yydebug = 0;/' \ - -e 's/[^_]realloc(/PerlMem_realloc(/g' \ - -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' \ - -e 's/y\.tab/perly/g' perly.c >perly.tmp && mv perly.tmp perly.c - xxx="$xxx perly.c" - fi - case "$osname:$usethreads" in - os390:define) - sed -e 's@^extern int yychar, yyerrflag;@/* extern int yychar, yyerrflag; */@' perly.c > perly.tmp && mv perly.tmp perly.c - ;; - esac - if cmp -s y.tab.h perly.h; then - rm -f y.tab.h - else - echo "perly.y -> perly.h" >&2 - mv -f y.tab.h perly.h - xxx="$xxx perly.h" - fi if cd x2p then rm -f y.tab.c y.tab.h @@ -1315,3 +1440,4 @@ esac ;; esac +# ex: set ts=8 sts=4 sw=4 noet: