From: Perl 5 Porters Date: Fri, 15 Mar 1996 08:23:58 +0000 (+0000) Subject: Update for OS/2 support: variable file extensions, invoke shell explicitly X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cd4d8a96676fd8970c63e82cff8a91a3a3c4d545;p=p5sagit%2Fp5-mst-13.2.git Update for OS/2 support: variable file extensions, invoke shell explicitly --- diff --git a/Makefile.SH b/Makefile.SH index 41e30e3..7eaa4e4 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -31,13 +31,14 @@ case "$d_shrplib" in *[0-9]) plibsuf=.$so.$patchlevel;; *) plibsuf=.$so;; esac + if test "x$plibext" != "x" ; then plibsuf=$plibext d_shrplib=custom ; fi case "$shrpdir" in /usr/lib) ;; "") ;; *) shrpenv="env LD_RUN_PATH=$shrpdir";; esac pldlflags="$cccdlflags";; -*) plibsuf=.a +*) plibsuf=$lib_ext pldlflags="";; esac @@ -53,7 +54,7 @@ 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" + static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)" if test -f ext/$f/AutoInit.c; then static_ai_list="$static_ai_list ext/$f/AutoInit.c" fi @@ -115,8 +116,7 @@ dynamic_ext = $dynamic_list static_ext = $static_list ext = \$(dynamic_ext) \$(static_ext) static_ext_autoinit = $static_ai_list -DYNALOADER = lib/auto/DynaLoader/DynaLoader.a - +DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) libs = $libs $cryptlib @@ -140,6 +140,8 @@ FIRSTMAKEFILE = $firstmakefile # Any special object files needed by this architecture, e.g. os2/os2.obj ARCHOBJS = $archobjs +.SUFFIXES: .c \$(OBJ_EXT) + !GROK!THIS! ## In the following dollars and backticks do not need the extra backslash. @@ -178,11 +180,10 @@ c3 = gv.c sv.c taint.c toke.c util.c deb.c run.c globals.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) globals$(OBJ_EXT) + obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) # Once perl has been Configure'd and built ok you build different @@ -201,7 +202,7 @@ lintflags = -hbvxac # grrr SHELL = /bin/sh -.c.o: +.c$(OBJ_EXT): $(CCCMD) $(PLDLFLAGS) $*.c all: makefile miniperl $(private) $(plextract) $(public) $(dynamic_ext) @@ -230,18 +231,18 @@ FORCE: # 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) $(perllib) + $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(perllib) $(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) 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 @@ -250,28 +251,40 @@ 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) $(perllib) $(DYNALOADER) $(static_ext) ext.libs + $(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `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) $(perllib) $(DYNALOADER) $(static_ext) ext.libs + purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `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) $(perllib) $(DYNALOADER) $(static_ext) ext.libs + quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) -$(perllib): $& perl.o $(obj) +$(perllib): $& perl$(OBJ_EXT) $(obj) !NO!SUBS! case "$d_shrplib" in *define*) $spitshell >>Makefile <<'!NO!SUBS!' - $(LD) $(LDDLFLAGS) -o $@ perl.o $(obj) + $(LD) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) !NO!SUBS! ;; +custom) +if test -r $osname/Makefile.SHs ; then + . $osname/Makefile.SHs + $spitshell >>Makefile <>Makefile <<'!NO!SUBS!' rm -f $(perllib) - $(AR) rcu $(perllib) perl.o $(obj) + $(AR) rcu $(perllib) perl$(OBJ_EXT) $(obj) @$(ranlib) $(perllib) !NO!SUBS! ;; @@ -284,10 +297,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) $(perllib) $(DYNALOADER) $(static_ext) ext.libs + $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(perllib) $(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 @@ -297,7 +310,7 @@ 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 @@ -315,14 +328,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 @@ -344,10 +357,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 @@ -382,8 +395,9 @@ s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE @sh ext/util/make_ext static $@ LIBPERL_A=$(perllib) clean: - rm -f *.o *.a all perlmain.c + rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c rm -f perl.exp ext.libs + -rm perl.export perl.dll perl.libexp perl.map perl.def -cd pod; $(MAKE) clean -cd utils; $(MAKE) clean -cd x2p; $(MAKE) clean @@ -402,7 +416,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 @@ -423,25 +437,33 @@ 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 # 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 +# Cannot postpone this until $firstmakefile is ready ;-) +makedepend: makedepend.SH config.sh + sh ./makedepend.SH + test: miniperl perl preplibrary $(dynamic_ext) - cd t && chmod +x TEST */*.t - - cd t && (rm -f perl; $(LNS) ../perl perl) && ./perl TEST