X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=347ee7e2cb227c749cd94f31c8382a7e75213655;hb=6f7d0078e68bc6a1f2a59d66e229fb67ce3fbb40;hp=cf3372a3f753f581a0dc2c8460a7c257e6fba607;hpb=43039de73e9f6e7f5c6b05087b44cc6c45f595b2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH index cf3372a..347ee7e 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -29,29 +29,20 @@ ldlibpth='' case "$useshrplib" in true) # Prefix all runs of 'miniperl' and 'perl' with - # $ldlibpth so that ./perl finds *this* libperl.so. + # $ldlibpth so that ./perl finds *this* shared libperl. ldlibpth="LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH" pldlflags="$cccdlflags" - # NeXT-4 specific stuff. Can't we do this in the hint file? case "${osname}${osvers}" in next4*) ld=libtool lddlflags="-dynamic -undefined warning -framework System \ -compatibility_version 1 -current_version $patchlevel \ -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" - # NeXT uses a different name. - ldlibpth="DYLD_LIBRARY_PATH=`pwd`:$DYLD_LIBRARY_PATH" ;; - rhapsody*) - ldlibpth="DYLD_LIBRARY_PATH=`pwd`/Perl:$DYLD_LIBRARY_PATH" - ;; - cygwin*) ldlibpth="PATH='`pwd`:$PATH'" + cygwin*) linklibperl="-lperl" ;; - os2*) # OS/2 doesn't need anything special for LD_LIBRARY_PATH. - ldlibpth='' - ;; sunos*) linklibperl="-lperl" ;; @@ -61,24 +52,34 @@ true) aix*) shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" case "$osvers" in - 3*) - shrpldflags="$shrpldflags -e _nostart $ldflags $libs $cryptlib" + 3*) shrpldflags="$shrpldflags -e _nostart" ;; - *) - shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib" + *) shrpldflags="$shrpldflags -b noentry" ;; esac - aixinstdir=`pwd | sed 's/\/UU$//'` - linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl" - ldlibpth="LIBPATH=`pwd`:${LIBPATH}" + shrpldflags="$shrpldflags $ldflags $libs $cryptlib" + linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl" ;; hpux*) linklibperl="-L `pwd | sed 's/\/UU$//'` -Wl,+s -Wl,+b$archlibexp/CORE -lperl" - ldlibpth="SHLIB_PATH=`pwd`:${SHLIB_PATH}" - ;; - beos*) ldlibpth="LIBRARY_PATH=`pwd`:$LIBRARY_PATH" ;; esac + case "$ldlibpthname" in + '') ;; + *) + case "$osname" in + os2) + ldlibpth='' + ;; + rhapsody) + eval "ldlibpth=\"$ldlibpthname=`pwd`/Perl:\$$ldlibpthname\"" + ;; + *) + eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\"" + ;; + esac + ;; + esac ;; *) pldlflags='' ;; @@ -154,7 +155,7 @@ LLIBPERL= $linklibperl SHRPENV = $shrpenv # The following is used to include the current directory in -# LD_LIBRARY_PATH if you are building a shared libperl.so. +# the dynamic loader path you are building a shared libperl. LDLIBPTH = $ldlibpth dynamic_ext = $dynamic_list @@ -193,6 +194,10 @@ SHELL = $sh # how to tr(anslate) newlines TRNL = '$trnl' +# not used by Makefile but by installperl; +# mentioned here so that metaconfig picks it up +INSTALL_USR_BIN_PERL = $installusrbinperl + !GROK!THIS! ## In the following dollars and backticks do not need the extra backslash. @@ -205,10 +210,10 @@ private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm # Files to be built with variable substitution before miniperl # is available. sh = Makefile.SH cflags.SH config_h.SH makeaperl.SH makedepend.SH \ - makedir.SH perl_exp.SH writemain.SH + makedir.SH myconfig.SH writemain.SH shextract = Makefile cflags config.h makeaperl makedepend \ - makedir perl.exp writemain + makedir myconfig writemain # Files to be built with variable substitution after miniperl is # available. Dependencies handled manually below (for now). @@ -225,18 +230,19 @@ h1 = EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h dosish.h h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h h3 = opcode.h patchlevel.h perl.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 warning.h +h5 = utf8.h warnings.h h = $(h1) $(h2) $(h3) $(h4) $(h5) c1 = $(mallocsrc) av.c scope.c op.c doop.c doio.c dump.c hv.c mg.c c2 = perl.c perly.c pp.c pp_hot.c pp_ctl.c pp_sys.c regcomp.c regexec.c utf8.c -c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c universal.c globals.c perlio.c +c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c universal.c xsutils.c +c4 = globals.c perlio.c -c = $(c1) $(c2) $(c3) miniperlmain.c perlmain.c +c = $(c1) $(c2) $(c3) $(c4) miniperlmain.c perlmain.c obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(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) +obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) xsutils$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) @@ -255,7 +261,7 @@ lintflags = -hbvxac .c$(OBJ_EXT): $(CCCMD) $(PLDLFLAGS) $*.c -all: $(FIRSTMAKEFILE) miniperl $(private) $(plextract) $(public) $(dynamic_ext) $(nonxs_ext) +all: $(FIRSTMAKEFILE) miniperl extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) @echo " "; @echo " Everything is up to date. 'make test' to run test suite." @@ -268,7 +274,7 @@ compile: all translators: miniperl lib/Config.pm FORCE @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all -utilities: miniperl lib/Config.pm FORCE +utilities: miniperl lib/Config.pm $(plextract) FORCE @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all @@ -280,6 +286,9 @@ utilities: miniperl lib/Config.pm FORCE FORCE: @sh -c true +opmini$(OBJ_EXT): op.c + $(CCCMD) $(PLDLFLAGS) -DPERL_EXTERNAL_GLOB -o opmini$(OBJ_EXT) op.c + miniperlmain$(OBJ_EXT): miniperlmain.c $(CCCMD) $(PLDLFLAGS) $*.c @@ -302,13 +311,73 @@ ext.libs: $(static_ext) # Load up custom Makefile.SH fragment for shared loading and executables: case "$osname" in cygwin*) - Makefile_s="cygwin32/Makefile.SHs" + Makefile_s="cygwin/Makefile.SHs" ;; *) Makefile_s="$osname/Makefile.SHs" ;; esac +case "$osname" in +aix) + $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' + +LIBPERL_NONSHR = libperl_nonshr$(LIB_EXT) +MINIPERL_NONSHR = miniperl_nonshr$(EXE_EXT) + +$(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj) + $(RMS) $(LIBPERL_NONSHR) + $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj) + +$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) + $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \ + opmini$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS) + +MINIPERLEXP = $(MINIPERL_NONSHR) + +LIBPERLEXPORT = perl.exp + +!NO!SUBS! + + ;; + *) + $spitshell >>Makefile <<'!NO!SUBS!' +MINIPERLEXP = miniperl$(EXE_EXT) + +PERLEXPORT = perl.exp + +!NO!SUBS! + ;; + esac + $spitshell >>Makefile <<'!NO!SUBS!' +perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) + ./$(MINIPERLEXP) makedef.pl PLATFORM=aix | sort -u | sort -f > perl.exp.tmp + sh mv-if-diff perl.exp.tmp perl.exp + +!NO!SUBS! + ;; +os2) + $spitshell >>Makefile <<'!NO!SUBS!' +MINIPERLEXP = miniperl + +perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map + ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) > perl.exp.tmp + sh mv-if-diff perl.exp.tmp perl5.def + +!NO!SUBS! + ;; +esac + if test -r $Makefile_s ; then . $Makefile_s $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' -$(LIBPERL): $& perl$(OBJ_EXT) $(obj) +$(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) !NO!SUBS! case "$useshrplib" in true) @@ -354,20 +423,39 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) # build problems but that's not obvious to the novice. # The Module used here must not depend on Config or any extensions. -miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) - $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs) - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest +!NO!SUBS! -perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs + case "${osname}${osvers}" in + next4*) + $spitshell >>Makefile <<'!NO!SUBS!' +miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) + $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) + $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest +!NO!SUBS! + ;; + *) + $spitshell >>Makefile <<'!NO!SUBS!' +miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT) + $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl \ + miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) + $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '' || $(MAKE) minitest +!NO!SUBS! + ;; + esac + + $spitshell >>Makefile <<'!NO!SUBS!' + +perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +purecovperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purecov $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o purecovperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # This version, if specified in Configure, does ONLY those scripts which need @@ -375,7 +463,7 @@ quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs # checks as well as the special code to validate that the script in question # has been invoked correctly. -suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs +suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) !NO!SUBS! @@ -393,7 +481,7 @@ sperl$(OBJ_EXT): perl.c perly.h patchlevel.h $(h) # We have to call our ./makedir because Ultrix 4.3 make can't handle the line # test -d lib/auto || mkdir lib/auto # -preplibrary: miniperl lib/Config.pm $(plextract) +preplibrary: miniperl lib/Config.pm @sh ./makedir lib/auto @echo " AutoSplitting perl library" $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ @@ -402,7 +490,7 @@ preplibrary: miniperl lib/Config.pm $(plextract) # 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 configpm +lib/Config.pm: config.sh miniperl configpm lib/re.pm $(LDLIBPTH) ./miniperl configpm configpm.tmp sh mv-if-diff configpm.tmp $@ @@ -414,9 +502,18 @@ lib/re.pm: ext/re/re.pm rm -f $@ cat ext/re/re.pm > $@ -$(plextract): miniperl lib/Config.pm lib/re.pm +$(plextract): miniperl lib/Config.pm $(LDLIBPTH) ./miniperl -Ilib $@.PL - + +extra.pods: miniperl + -@test -f extra.pods && rm -f `cat extra.pods` + -@rm -f extra.pods + -@for x in `grep -l '^=[a-z]' README.*` ; do \ + nx=`echo $$x | sed -e "s/README\.//"`; \ + $(LNS) ../$$x "pod/perl"$$nx".pod" ; \ + echo "pod/perl"$$nx".pod" >> extra.pods ; \ + done + install: all install.perl install.man install.perl: all installperl @@ -453,7 +550,6 @@ install.html: all installhtml # normally shouldn't remake perly.[ch]. run_byacc: FORCE - @ echo 'Expect' 113 shift/reduce and 1 reduce/reduce conflict $(BYACC) -d perly.y chmod 664 perly.c sh $(shellflags) ./perly.fixer y.tab.c perly.c @@ -479,6 +575,8 @@ SYM = global.sym globvar.sym perlio.sym pp.sym SYMH = perlvars.h intrpvar.h thrdvar.h +CHMOD_W = chmod +w + # The following files are generated automatically # keywords.h: keywords.pl # opcode.h: opcode.pl @@ -489,19 +587,21 @@ SYMH = perlvars.h intrpvar.h thrdvar.h # ext/ByteLoader/byterun.h: bytecode.pl # ext/ByteLoader/byterun.c: bytecode.pl # ext/B/Asmdata.pm: bytecode.pl +# global.sym: embed.pl # regnodes.h: regcomp.pl -# warning.h lib/warning.pm: warning.pl +# warnings.h lib/warnings.pm: warnings.pl # The correct versions should be already supplied with the perl kit, # in case you don't have perl available. # To force them to run, type # make regen_headers regen_headers: FORCE + $(CHMOD_W) proto.h warnings.h lib/warnings.pm perl keywords.pl perl opcode.pl perl embed.pl perl bytecode.pl perl regcomp.pl - perl warning.pl + perl warnings.pl # Extensions: # Names added to $(dynamic_ext) or $(static_ext) or $(nonxs_ext) will @@ -538,7 +638,8 @@ distclean: clobber # Do not 'make _mopup' directly. _mopup: rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c - rm -f perl.exp ext.libs + -@test -f extra.pods && rm -f `cat extra.pods` + -rm -f perl.exp ext.libs extra.pods -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 suidperl miniperl $(LIBPERL) @@ -562,7 +663,7 @@ _cleaner: -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \ done - rm -f *.orig */*.orig *~ */*~ core core.perl.*.? core.miniperl.*.? perl.core miniperl.core t/core t/core.perl.*.? t/perl.core t/tmp???? t/c t/perl so_locations t/nonexistent1 + rm -f *.orig */*.orig *~ */*~ core core.*perl.*.? *perl.core t/core t/core.perl.*.? t/*perl.core t/misctmp* t/tmp* t/c t/perl so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old rm -f $(private) @@ -571,6 +672,7 @@ _cleaner: rm -f h2ph.man pstruct rm -rf .config rm -f testcompile compilelog + -rmdir lib/B lib/Data lib/IO/Socket lib/IO # The following lint has practically everything turned on. Unfortunately, # you have to wade through a lot of mumbo jumbo that can't be suppressed. @@ -592,10 +694,6 @@ $(FIRSTMAKEFILE): README $(MAKEDEPEND) config.h: config_h.SH config.sh $(SHELL) config_h.SH -# This is an AIXism. -perl.exp: perl_exp.SH config.sh $(SYM) $(SYMH) - $(SHELL) perl_exp.SH - # When done, touch perlmain.c so that it doesn't get remade each time. depend: makedepend sh ./makedepend MAKE=$(MAKE)