ln ../../config.sh . || \
ln ../../../config.sh . || \
(echo "Can't find config.sh."; exit 1)
- fi
+ fi 2>/dev/null
. ./config.sh
;;
esac
echo "Extracting Makefile (with variable substitutions)"
cat >Makefile <<!GROK!THIS!
-# $Header: Makefile.SH,v 3.0.1.6 90/03/27 15:27:15 lwall Locked $
+# $RCSfile: Makefile.SH,v $$Revision: 4.0.1.3 $$Date: 91/11/05 15:48:11 $
#
# $Log: Makefile.SH,v $
-# Revision 3.0.1.6 90/03/27 15:27:15 lwall
-# patch16: MSDOS support
+# Revision 4.0.1.3 91/11/05 15:48:11 lwall
+# patch11: saberized perl
+# patch11: added support for dbz
#
-# Revision 3.0.1.5 90/03/12 16:15:17 lwall
-# patch13: some dependencies missing on perly.h
-# patch13: some relief for buggy parallel makes
-# patch13: bison doesn't declare extern YYSTYPE yylval;
+# Revision 4.0.1.2 91/06/07 10:14:43 lwall
+# patch4: cflags now emits entire cc command except for the filename
+# patch4: alternate make programs are now semi-supported
+# patch4: uperl.o no longer tries to link in libraries prematurely
+# patch4: installperl now installs x2p stuff too
#
-# Revision 3.0.1.4 90/02/28 16:19:43 lwall
-# patch9: extraneous $ on suidperl in Makefile
+# Revision 4.0.1.1 91/04/11 17:30:39 lwall
+# patch1: C flags are now settable on a per-file basis
#
-# Revision 3.0.1.3 89/12/21 19:09:26 lwall
-# patch7: Configure now lets you pick between yacc or bison
+# Revision 4.0 91/03/20 00:58:54 lwall
+# 4.0 baseline.
#
-# Revision 3.0.1.2 89/11/11 04:07:30 lwall
-# patch2: $sockethdr incorporated into $ccflags
-# patch2: $libs now has most of the -l libraries
-#
-# Revision 3.0.1.1 89/10/26 23:00:38 lwall
-# patch1: Makefile.SH needed some more .h dependecies
-#
-# Revision 3.0 89/10/18 15:06:43 lwall
-# 3.0 baseline
#
CC = $cc
YACC = $yacc
-bin = $bin
-privlib = $privlib
+bin = $installbin
+scriptdir = $scriptdir
+privlib = $installprivlib
mansrc = $mansrc
manext = $manext
-CFLAGS = $ccflags $optimize
LDFLAGS = $ldflags
+CLDFLAGS = $ldflags
SMALL = $small
LARGE = $large $split
mallocsrc = $mallocsrc
mallocobj = $mallocobj
SLN = $sln
+RMS = rm -f
-libs = $libs -lm
+libs = $libs $cryptlib
public = perl taintperl $suidperl
+# To use an alternate make, set $altmake in config.sh.
+MAKE = ${altmake-make}
+
!GROK!THIS!
cat >>Makefile <<'!NO!SUBS!'
+
+CCCMD = `sh cflags $@`
+
private =
-MAKE = make
+scripts = h2ph
-manpages = perl.man
+manpages = perl.man h2ph.man
util =
-sh = Makefile.SH makedepend.SH
+sh = Makefile.SH makedepend.SH h2ph.SH
h1 = EXTERN.h INTERN.h arg.h array.h cmd.h config.h form.h handy.h
h2 = hash.h perl.h regcomp.h regexp.h spat.h stab.h str.h util.h
h = $(h1) $(h2)
c1 = array.c cmd.c cons.c consarg.c doarg.c doio.c dolist.c dump.c
-c2 = eval.c form.c hash.c $(mallocsrc) perly.c regcomp.c regexec.c
-c3 = stab.c str.c toke.c util.c
+c2 = eval.c form.c hash.c $(mallocsrc) perl.c regcomp.c regexec.c
+c3 = stab.c str.c toke.c util.c usersub.c
c = $(c1) $(c2) $(c3)
+s1 = array.c cmd.c cons.c consarg.c doarg.c doio.c dolist.c dump.c
+s2 = eval.c form.c hash.c perl.c regcomp.c regexec.c
+s3 = stab.c str.c toke.c util.c usersub.c perly.c
+
+saber = $(s1) $(s2) $(s3)
+
obj1 = array.o cmd.o cons.o consarg.o doarg.o doio.o dolist.o dump.o
-obj2 = eval.o form.o hash.o $(mallocobj) perly.o regcomp.o regexec.o
+obj2 = eval.o form.o $(mallocobj) perl.o regcomp.o regexec.o
obj3 = stab.o str.o toke.o util.o
obj = $(obj1) $(obj2) $(obj3)
SHELL = /bin/sh
.c.o:
- $(CC) -c $(CFLAGS) $(LARGE) $*.c
+ $(CCCMD) $*.c
-all: $(public) $(private) $(util) perl.man
+all: $(public) $(private) $(util) uperl.o $(scripts)
cd x2p; $(MAKE) all
touch all
# This is the standard version that contains no "taint" checks and is
# used for all scripts that aren't set-id or running under something set-id.
+# The $& notation is tells Sequent machines that it can do a parallel make,
+# and is harmless otherwise.
-perl: perl.o $(obj)
- $(CC) $(LARGE) $(LDFLAGS) $(obj) perl.o $(libs) -o perl
+perl: $& perly.o $(obj) hash.o usersub.o
+ $(CC) $(LARGE) $(CLDFLAGS) $(obj) hash.o perly.o usersub.o $(libs) -o perl
+
+# This command assumes that /usr/include/dbz.h and /usr/lib/dbz.o exist.
+
+dbzperl: $& perly.o $(obj) zhash.o usersub.o
+ $(CC) $(LARGE) $(CLDFLAGS) $(obj) zhash.o /usr/lib/dbz.o perly.o usersub.o $(libs) -o dbzperl
+
+zhash.o: hash.c $(h)
+ $(RMS) zhash.c
+ $(SLN) hash.c zhash.c
+ $(CCCMD) -DWANT_DBZ zhash.c
+ $(RMS) zhash.c
+
+uperl.o: $& perly.o $(obj) hash.o
+ -ld $(LARGE) $(LDFLAGS) -r $(obj) hash.o perly.o -o uperl.o
+
+saber: $(saber)
+ # load $(saber)
+ # load /lib/libm.a
# This version, if specified in Configure, does ONLY those scripts which need
# set-id emulation. Suidperl must be setuid root. It contains the "taint"
# checks as well as the special code to validate that the script in question
# has been invoked correctly.
-suidperl: tperl.o sperly.o $(tobj)
- $(CC) $(LARGE) $(LDFLAGS) sperly.o $(tobj) tperl.o $(libs) -o suidperl
+suidperl: $& tperly.o sperl.o $(tobj) usersub.o
+ $(CC) $(LARGE) $(CLDFLAGS) sperl.o $(tobj) tperly.o usersub.o $(libs) \
+ -o suidperl
# This version interprets scripts that are already set-id either via a wrapper
# or through the kernel allowing set-id scripts (bad idea). Taintperl must
# NOT be setuid to root or anything else. The only difference between it
# and normal perl is the presence of the "taint" checks.
-taintperl: tperl.o tperly.o $(tobj)
- $(CC) $(LARGE) $(LDFLAGS) tperly.o $(tobj) tperl.o $(libs) -o taintperl
+taintperl: $& tperly.o tperl.o $(tobj) usersub.o
+ $(CC) $(LARGE) $(CLDFLAGS) tperl.o $(tobj) tperly.o usersub.o $(libs) \
+ -o taintperl
# Replicating all this junk is yucky, but I don't see a portable way to fix it.
-tperl.o: perl.c perly.h $(h)
- /bin/rm -f tperl.c
- $(SLN) perl.c tperl.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tperl.c
- /bin/rm -f tperl.c
-
tperly.o: perly.c perly.h $(h)
- /bin/rm -f tperly.c
+ $(RMS) tperly.c
$(SLN) perly.c tperly.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tperly.c
- /bin/rm -f tperly.c
+ $(CCCMD) -DTAINT tperly.c
+ $(RMS) tperly.c
+
+tperl.o: perl.c perly.h patchlevel.h perl.h $(h)
+ $(RMS) tperl.c
+ $(SLN) perl.c tperl.c
+ $(CCCMD) -DTAINT tperl.c
+ $(RMS) tperl.c
-sperly.o: perly.c perly.h patchlevel.h $(h)
- /bin/rm -f sperly.c
- $(SLN) perly.c sperly.c
- $(CC) -c -DTAINT -DIAMSUID $(CFLAGS) $(LARGE) sperly.c
- /bin/rm -f sperly.c
+sperl.o: perl.c perly.h patchlevel.h $(h)
+ $(RMS) sperl.c
+ $(SLN) perl.c sperl.c
+ $(CCCMD) -DTAINT -DIAMSUID sperl.c
+ $(RMS) sperl.c
tarray.o: array.c $(h)
- /bin/rm -f tarray.c
+ $(RMS) tarray.c
$(SLN) array.c tarray.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tarray.c
- /bin/rm -f tarray.c
+ $(CCCMD) -DTAINT tarray.c
+ $(RMS) tarray.c
tcmd.o: cmd.c $(h)
- /bin/rm -f tcmd.c
+ $(RMS) tcmd.c
$(SLN) cmd.c tcmd.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tcmd.c
- /bin/rm -f tcmd.c
+ $(CCCMD) -DTAINT tcmd.c
+ $(RMS) tcmd.c
tcons.o: cons.c $(h) perly.h
- /bin/rm -f tcons.c
+ $(RMS) tcons.c
$(SLN) cons.c tcons.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tcons.c
- /bin/rm -f tcons.c
+ $(CCCMD) -DTAINT tcons.c
+ $(RMS) tcons.c
tconsarg.o: consarg.c $(h)
- /bin/rm -f tconsarg.c
+ $(RMS) tconsarg.c
$(SLN) consarg.c tconsarg.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tconsarg.c
- /bin/rm -f tconsarg.c
+ $(CCCMD) -DTAINT tconsarg.c
+ $(RMS) tconsarg.c
tdoarg.o: doarg.c $(h)
- /bin/rm -f tdoarg.c
+ $(RMS) tdoarg.c
$(SLN) doarg.c tdoarg.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tdoarg.c
- /bin/rm -f tdoarg.c
+ $(CCCMD) -DTAINT tdoarg.c
+ $(RMS) tdoarg.c
tdoio.o: doio.c $(h)
- /bin/rm -f tdoio.c
+ $(RMS) tdoio.c
$(SLN) doio.c tdoio.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tdoio.c
- /bin/rm -f tdoio.c
+ $(CCCMD) -DTAINT tdoio.c
+ $(RMS) tdoio.c
tdolist.o: dolist.c $(h)
- /bin/rm -f tdolist.c
+ $(RMS) tdolist.c
$(SLN) dolist.c tdolist.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tdolist.c
- /bin/rm -f tdolist.c
+ $(CCCMD) -DTAINT tdolist.c
+ $(RMS) tdolist.c
tdump.o: dump.c $(h)
- /bin/rm -f tdump.c
+ $(RMS) tdump.c
$(SLN) dump.c tdump.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tdump.c
- /bin/rm -f tdump.c
+ $(CCCMD) -DTAINT tdump.c
+ $(RMS) tdump.c
teval.o: eval.c $(h)
- /bin/rm -f teval.c
+ $(RMS) teval.c
$(SLN) eval.c teval.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) teval.c
- /bin/rm -f teval.c
+ $(CCCMD) -DTAINT teval.c
+ $(RMS) teval.c
tform.o: form.c $(h)
- /bin/rm -f tform.c
+ $(RMS) tform.c
$(SLN) form.c tform.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tform.c
- /bin/rm -f tform.c
+ $(CCCMD) -DTAINT tform.c
+ $(RMS) tform.c
thash.o: hash.c $(h)
- /bin/rm -f thash.c
+ $(RMS) thash.c
$(SLN) hash.c thash.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) thash.c
- /bin/rm -f thash.c
+ $(CCCMD) -DTAINT thash.c
+ $(RMS) thash.c
tregcomp.o: regcomp.c $(h)
- /bin/rm -f tregcomp.c
+ $(RMS) tregcomp.c
$(SLN) regcomp.c tregcomp.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tregcomp.c
- /bin/rm -f tregcomp.c
+ $(CCCMD) -DTAINT tregcomp.c
+ $(RMS) tregcomp.c
tregexec.o: regexec.c $(h)
- /bin/rm -f tregexec.c
+ $(RMS) tregexec.c
$(SLN) regexec.c tregexec.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tregexec.c
- /bin/rm -f tregexec.c
+ $(CCCMD) -DTAINT tregexec.c
+ $(RMS) tregexec.c
tstab.o: stab.c $(h)
- /bin/rm -f tstab.c
+ $(RMS) tstab.c
$(SLN) stab.c tstab.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tstab.c
- /bin/rm -f tstab.c
+ $(CCCMD) -DTAINT tstab.c
+ $(RMS) tstab.c
tstr.o: str.c $(h) perly.h
- /bin/rm -f tstr.c
+ $(RMS) tstr.c
$(SLN) str.c tstr.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tstr.c
- /bin/rm -f tstr.c
+ $(CCCMD) -DTAINT tstr.c
+ $(RMS) tstr.c
ttoke.o: toke.c $(h) perly.h
- /bin/rm -f ttoke.c
+ $(RMS) ttoke.c
$(SLN) toke.c ttoke.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) ttoke.c
- /bin/rm -f ttoke.c
+ $(CCCMD) -DTAINT ttoke.c
+ $(RMS) ttoke.c
tutil.o: util.c $(h)
- /bin/rm -f tutil.c
+ $(RMS) tutil.c
$(SLN) util.c tutil.c
- $(CC) -c -DTAINT $(CFLAGS) $(LARGE) tutil.c
- /bin/rm -f tutil.c
+ $(CCCMD) -DTAINT tutil.c
+ $(RMS) tutil.c
-perly.h: perl.c
+perly.h: perly.c
@ echo Dummy dependency for dumb parallel make
touch perly.h
-perl.c: perl.y
- @ echo Expect 25 shift/reduce errors...
- $(YACC) -d perl.y
- mv y.tab.c perl.c
+perly.c: perly.y perly.fixer
+ @ echo 'Expect either' 29 shift/reduce and 59 reduce/reduce conflicts...
+ @ echo ' or' 27 shift/reduce and 61 reduce/reduce conflicts...
+ $(YACC) -d perly.y
+ sh ./perly.fixer y.tab.c perly.c
mv y.tab.h perly.h
echo 'extern YYSTYPE yylval;' >>perly.h
-perl.o: perl.c perly.h $(h)
- $(CC) -c $(CFLAGS) $(LARGE) perl.c
-
-perl.man: perl_man.1 perl_man.2 perl_man.3 perl_man.4 patchlevel.h perl
- ./perl -e '($$r,$$p)=$$]=~/(\d+\.\d+).*\n\D*(\d+)/;' \
- -e 'print ".ds RP Release $$r Patchlevel $$p\n";' >perl.man
- cat perl_man.[1-4] >>perl.man
+perly.o: perly.c perly.h $(h)
+ $(CCCMD) perly.c
install: all
-# won't work with csh
- export PATH || exit 1
- - rm -f $(bin)/perl.old $(bin)/suidperl $(bin)/taintperl
- - mv $(bin)/perl $(bin)/perl.old 2>/dev/null
- - if test `pwd` != $(bin); then cp $(public) $(bin); fi
- - cd $(bin); \
-for pub in $(public); do \
-chmod +x `basename $$pub`; \
-done
- - chmod 755 $(bin)/taintperl 2>/dev/null
-!NO!SUBS!
-
-case "$d_dosuid" in
-*define*)
- cat >>Makefile <<'!NO!SUBS!'
- - chmod 4711 $(bin)/suidperl 2>/dev/null
-!NO!SUBS!
- ;;
-esac
-
-cat >>Makefile <<'!NO!SUBS!'
- - test $(bin) = /usr/bin || rm -f /usr/bin/perl
- - test $(bin) = /usr/bin || $(SLN) $(bin)/perl /usr/bin || cp $(bin)/perl /usr/bin
- - sh ./makedir $(privlib)
- - \
-if test `pwd` != $(privlib); then \
-cp $(private) lib/*.pl $(privlib); \
-fi
-# cd $(privlib); \
-#for priv in $(private); do \
-#chmod +x `basename $$priv`; \
-#done
- - if test `pwd` != $(mansrc); then \
-for page in $(manpages); do \
-cp $$page $(mansrc)/`basename $$page .man`.$(manext); \
-done; \
-fi
- cd x2p; $(MAKE) install
+ ./perl installperl
clean:
- rm -f *.o all perl taintperl suidperl perl.man
+ rm -f *.o all perl taintperl suidperl
cd x2p; $(MAKE) clean
-realclean:
+realclean: clean
cd x2p; $(MAKE) realclean
- rm -f perl *.orig */*.orig *~ */*~ *.o core $(addedbyconf) perl.man
- rm -f perl.c perly.h t/perl Makefile config.h makedepend makedir
- rm -f x2p/Makefile
+ rm -f *.orig */*.orig *~ */*~ core $(addedbyconf) h2ph h2ph.man
+ rm -f perly.c perly.h t/perl Makefile config.h makedepend makedir
+ rm -f makefile x2p/Makefile x2p/makefile cflags x2p/cflags
+ rm -f c2ph pstruct
# 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.
-lint: perl.c $(c)
- lint $(lintflags) $(defs) perl.c $(c) > perl.fuzz
+lint: perly.c $(c)
+ lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz
depend: makedepend
- test -f perly.h || cp /dev/null perly.h
cd x2p; $(MAKE) depend
test: perl
- - chmod +x t/TEST t/base.* t/comp.* t/cmd.* t/io.* t/op.*; \
- cd t && (rm -f perl; $(SLN) ../perl .) && ./perl TEST
+ - cd t && chmod +x TEST */*.t
+ - cd t && (rm -f perl; $(SLN) ../perl .) && ./perl TEST </dev/tty
clist:
echo $(c) | tr ' ' '\012' >.clist
echo $(sh) | tr ' ' '\012' >.shlist
# AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
-$(obj):
+$(obj) hash.o:
@ echo "You haven't done a "'"make depend" yet!'; exit 1
makedepend: makedepend.SH
/bin/sh makedepend.SH
ln Makefile ../Makefile
;;
esac
+rm -f makefile