X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=81d6df4edfca6a1d3dc402d78e868d6ee138a3aa;hb=b73edd974ff6de4630341da3b93d562a24ff05d7;hp=e36cf107466a4938e0a02cd58536000bb31c30aa;hpb=909b3858a4779b142bf2bf51d648f8d2724db345;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Makefile.SH b/Makefile.SH old mode 100644 new mode 100755 index e36cf10..81d6df4 --- a/Makefile.SH +++ b/Makefile.SH @@ -22,23 +22,20 @@ case "$d_dosuid" in *) suidperl='';; esac -shrpenv="" -case "$d_shrplib" in -*define*) - patchlevel=`egrep '^#define[ ]+PATCHLEVEL' patchlevel.h \ - | awk '{print $3}'` - case "$patchlevel" in - *[0-9]) plibsuf=.$so.$patchlevel;; - *) plibsuf=.$so;; - esac - case "$shrpdir" in - /usr/lib) ;; - "") ;; - *) shrpenv="env LD_RUN_PATH=$shrpdir";; - esac - pldlflags="$cccdlflags";; -*) plibsuf=.a - pldlflags="";; +case "$useshrplib" in +true) + pldlflags="$cccdlflags" + # NeXT-4 specific stuff. Can't we do this in the hint file? + case "${osname}${osvers}" in + next4*) + ld='libtool -dynamic -undefined warning -framework System \ + -compatibility_version 1 -current_version $(PATCHLEVEL) \ + -prebind -seg1addr 0x27000000 -install_name $(SHRPDIR)/$@' + ;; + esac + ;; +*) pldlflags='' + ;; esac : Prepare dependency lists for Makefile. @@ -50,30 +47,20 @@ for f in $dynamic_ext; do done static_list=' ' -static_ai_list=' ' for f in $static_ext; do base=`echo "$f" | sed 's/.*\///'` - static_list="$static_list lib/auto/$f/$base.a" - if test -f ext/$f/AutoInit.c; then - static_ai_list="$static_ai_list ext/$f/AutoInit.c" - fi - if test -f ext/$f/AutoInit.pl; then - static_ai_list="$static_ai_list ext/$f/AutoInit.pl" - fi + static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)" done echo "Extracting Makefile (with variable substitutions)" -$spitshell >Makefile <<'!NO!SUBS!' +$spitshell >Makefile <>Makefile <>Makefile <<'!NO!SUBS!' -CCCMD = `sh $(shellflags) cflags $(perllib) $@` +CCCMD = `sh $(shellflags) cflags $(LIBPERL) $@` private = preplibrary lib/ExtUtils/Miniperl.pm lib/Config.pm @@ -155,7 +147,7 @@ sh = Makefile.SH cflags.SH config_h.SH makeaperl.SH makedepend.SH \ makedir.SH perl_exp.SH writemain.SH shextract = Makefile cflags config.h makeaperl makedepend \ - makedir perl_exp writemain + makedir perl.exp writemain # Files to be built with variable substitution after miniperl is # available. Dependencies handled manually below (for now). @@ -169,42 +161,37 @@ addedbyconf = UU $(shextract) $(plextract) pstruct 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 +h4 = regexp.h scope.h sv.h unixish.h util.h perlio.h h = $(h1) $(h2) $(h3) $(h4) 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 -c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c globals.c +c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c universal.c globals.c perlio.c c = $(c1) $(c2) $(c3) miniperlmain.c perlmain.c -obj1 = $(mallocobj) gv.o toke.o perly.o op.o regcomp.o dump.o util.o mg.o -obj2 = hv.o av.o run.o pp_hot.o sv.o pp.o scope.o pp_ctl.o pp_sys.o -obj3 = doop.o doio.o regexec.o taint.o deb.o globals.o - +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) taint$(OBJ_EXT) deb$(OBJ_EXT) universal$(OBJ_EXT) globals$(OBJ_EXT) perlio$(OBJ_EXT) obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) # Once perl has been Configure'd and built ok you build different # perl variants (Debugging, Embedded, Multiplicity etc) by saying: -# make clean; make perllib=libperl.a +# make clean; make LIBPERL=libperl.a # where is some combination of 'd' and(or) 'e' or 'm'. # See cflags to understand how this works. # -# Eventually some form of 'make-a-perl' script will automate this -# together with linking a perl executable with any desired -# static modules. -perllib = libperl$(PLIBSUF) +# This mechanism is getting clunky and might not even work any more. +# EMBEDDING is on by default, and MULTIPLICITY doesn't work. +# lintflags = -hbvxac -# grrr -SHELL = /bin/sh - -.c.o: +.c$(OBJ_EXT): $(CCCMD) $(PLDLFLAGS) $*.c -all: makefile miniperl $(private) $(plextract) $(public) $(dynamic_ext) +all: $(FIRSTMAKEFILE) miniperl $(private) $(plextract) $(public) $(dynamic_ext) @echo " "; echo " Everything is up to date." translators: miniperl lib/Config.pm FORCE @@ -224,18 +211,24 @@ FORCE: # The $& notation tells Sequent machines that it can do a parallel make, # and is harmless otherwise. +# The miniperl -w -MExporter line is a basic cheap test to catch errors +# before make goes on to run preplibrary and then MakeMaker on extensions. +# This is very handy because later errors are often caused by miniperl +# build problems but that's not obvious to the novice. +# The Module used here must not depend on Config or any extensions. -miniperl: $& miniperlmain.o $(perllib) - $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain.o $(perllib) $(libs) +miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) + $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LIBPERL) $(libs) + @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest -miniperlmain.o: miniperlmain.c +miniperlmain$(OBJ_EXT): miniperlmain.c $(CCCMD) $(PLDLFLAGS) $*.c -perlmain.c: miniperlmain.c config.sh makefile $(static_ext_autoinit) +perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE) sh writemain $(DYNALOADER) $(static_ext) > tmp sh mv-if-diff tmp perlmain.c -perlmain.o: perlmain.c +perlmain$(OBJ_EXT): perlmain.c $(CCCMD) $(PLDLFLAGS) $*.c # The file ext.libs is a list of libraries that must be linked in @@ -244,33 +237,44 @@ perlmain.o: perlmain.c ext.libs: $(static_ext) -@test -f ext.libs || touch ext.libs -perl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs - $(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) +perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs + $(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LIBPERL) `cat ext.libs` $(libs) -pureperl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs - purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) +pureperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs + purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LIBPERL) `cat ext.libs` $(libs) -quantperl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs - quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) +quantperl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs + quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LIBPERL) `cat ext.libs` $(libs) -$(perllib): $& perl.o $(obj) !NO!SUBS! +# How to build libperl. This is still rather convoluted. +# Load up custom Makefile.SH fragments? +if test -r $osname/Makefile.SHs ; then + . $osname/Makefile.SHs + $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' - $(LD) $(LDDLFLAGS) -o $@ perl.o $(obj) +Makefile: $osname/Makefile.SHs +!GROK!THIS! +else + $spitshell >>Makefile <<'!NO!SUBS!' +$(LIBPERL): $& perl$(OBJ_EXT) $(obj) !NO!SUBS! -;; -*) -$spitshell >>Makefile <<'!NO!SUBS!' - rm -f $(perllib) - $(AR) rcu $(perllib) perl.o $(obj) - @$(ranlib) $(perllib) + case "$useshrplib" in + true) + $spitshell >>Makefile <<'!NO!SUBS!' + $(LD) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) !NO!SUBS! -;; -esac - + ;; + *) + $spitshell >>Makefile <<'!NO!SUBS!' + rm -f $(LIBPERL) + $(AR) rcu $(LIBPERL) perl$(OBJ_EXT) $(obj) + @$(ranlib) $(LIBPERL) +!NO!SUBS! + ;; + esac +fi + $spitshell >>Makefile <<'!NO!SUBS!' # This version, if specified in Configure, does ONLY those scripts which need @@ -278,10 +282,10 @@ $spitshell >>Makefile <<'!NO!SUBS!' # checks as well as the special code to validate that the script in question # has been invoked correctly. -suidperl: $& sperl.o perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs - $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain.o sperl.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) +suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs + $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) -sperl.o: perl.c perly.h patchlevel.h $(h) +sperl$(OBJ_EXT): perl.c perly.h patchlevel.h $(h) $(RMS) sperl.c $(LNS) perl.c sperl.c $(CCCMD) -DIAMSUID sperl.c @@ -291,13 +295,13 @@ sperl.o: perl.c perly.h patchlevel.h $(h) # test -d lib/auto || mkdir lib/auto # preplibrary: miniperl lib/Config.pm $(plextract) - @./makedir lib/auto + @sh ./makedir lib/auto @echo " AutoSplitting perl library" @./miniperl -Ilib -e 'use AutoSplit; \ autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm # Take care to avoid modifying lib/Config.pm without reason -lib/Config.pm: config.sh miniperl +lib/Config.pm: config.sh miniperl configpm ./miniperl configpm tmp sh mv-if-diff tmp lib/Config.pm @@ -309,14 +313,14 @@ $(plextract): miniperl lib/Config.pm install: all install.perl install.man -install.perl: all +install.perl: all installperl ./perl installperl -install.man: all +install.man: all installman ./perl installman # Not implemented yet. -#install.html: all +#install.html: all installhtml # ./perl installhtml # I now supply perly.c with the kits, so the following section is @@ -327,9 +331,10 @@ install.man: all # normally shouldn't remake perly.[ch]. run_byacc: FORCE - @ echo 'Expect' 129 shift/reduce and 1 reduce/reduce conflict + @ echo 'Expect' 130 shift/reduce and 1 reduce/reduce conflict $(BYACC) -d perly.y sh $(shellflags) ./perly.fixer y.tab.c perly.c + sed -e 's/fprintf *( *stderr *,/PerlIO_printf(Perl_debug_log,/g' perly.c >perly.tmp && mv perly.tmp perly.c mv y.tab.h perly.h echo 'extern YYSTYPE yylval;' >>perly.h - perl vms/vms_yfix.pl perly.c perly.h vms/perly_c.vms vms/perly_h.vms @@ -338,10 +343,10 @@ run_byacc: FORCE # appear out-of-date after a patch is applied or a new distribution is # made. perly.c: perly.y - -@touch perly.c + -@sh -c true perly.h: perly.y - -@touch perly.h + -@sh -c true # The following three header files are generated automatically # keywords.h: keywords.pl @@ -367,24 +372,25 @@ regen_headers: FORCE # DynaLoader may be needed for extensions that use Makefile.PL. $(DYNALOADER): miniperl preplibrary FORCE - @sh ext/util/make_ext static $@ LIBPERL_A=$(perllib) + @sh ext/util/make_ext static $@ LIBPERL_A=$(LIBPERL) d_dummy $(dynamic_ext): miniperl preplibrary $(DYNALOADER) FORCE - @sh ext/util/make_ext dynamic $@ LIBPERL_A=$(perllib) + @sh ext/util/make_ext dynamic $@ LIBPERL_A=$(LIBPERL) s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE - @sh ext/util/make_ext static $@ LIBPERL_A=$(perllib) + @sh ext/util/make_ext static $@ LIBPERL_A=$(LIBPERL) clean: - rm -f *.o *.a all perlmain.c + rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c rm -f perl.exp ext.libs + -rm -f perl.export perl.dll perl.libexp perl.map perl.def -cd pod; $(MAKE) clean -cd utils; $(MAKE) clean -cd x2p; $(MAKE) clean -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) ; do \ sh ext/util/make_ext clean $$x ; \ done - rm -f perl suidperl miniperl $(perllib) + rm -f perl suidperl miniperl $(LIBPERL) realclean: clean -cd os2; rm -f Makefile @@ -396,7 +402,7 @@ realclean: clean done rm -f *.orig */*.orig *~ */*~ core t/core t/c t/perl rm -rf $(addedbyconf) - rm -f makefile makefile.old + rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old rm -f $(private) rm -rf lib/auto rm -f lib/.exists @@ -417,25 +423,38 @@ distclean: clobber lint: perly.c $(c) lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz -makefile: Makefile - $(MAKE) depend +# Need to unset during recursion to go out of loop + +MAKEDEPEND = makedepend + +$(FIRSTMAKEFILE): Makefile $(MAKEDEPEND) + $(MAKE) depend MAKEDEPEND= config.h: config.sh - /bin/sh config_h.SH + $(SHELL) config_h.SH + +perl.exp: perl_exp.SH config.sh + $(SHELL) perl_exp.SH # When done, touch perlmain.c so that it doesn't get remade each time. depend: makedepend - ./makedepend + sh ./makedepend - test -s perlmain.c && touch perlmain.c cd x2p; $(MAKE) depend -test: miniperl perl preplibrary $(dynamic_ext) - - cd t && chmod +x TEST */*.t - - cd t && (rm -f perl; $(LNS) ../perl perl) && ./perl TEST .pllist +Makefile: Makefile.SH ./config.sh + $(SHELL) Makefile.SH + +distcheck : FORCE + perl '-MExtUtils::Manifest=&fullcheck' -e 'fullcheck()' + +manifest : + perl '-MExtUtils::Manifest=&mkmanifest' -e 'mkmanifest()' + # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE # If this runs make out of memory, delete /usr/include lines. !NO!SUBS! @@ -458,7 +486,7 @@ $eunicefix Makefile case `pwd` in *SH) $rm -f ../Makefile - ln Makefile ../Makefile + $ln Makefile ../Makefile ;; esac -rm -f makefile +$rm -f $firstmakefile