From 482ae3288be653188f7395ae7216e91cc36b8548 Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 14 Dec 1995 03:47:19 +0000 Subject: [PATCH] update from netbsd --- share/mk/Makefile | 4 ++-- share/mk/bsd.README | 12 +++++++++++- share/mk/bsd.lib.mk | 3 ++- share/mk/bsd.man.mk | 19 +++++++++---------- share/mk/bsd.own.mk | 7 +------ share/mk/bsd.sys.mk | 30 ++++++++++++++++++++++++++++++ 6 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 share/mk/bsd.sys.mk diff --git a/share/mk/Makefile b/share/mk/Makefile index e2239e44e43..1ae420145fe 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 1995/04/26 22:30:57 jtc Exp $ +# $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $ # @(#)Makefile 5.3 (Berkeley) 6/22/90 FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \ - bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.subdir.mk sys.mk + bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.subdir.mk bsd.sys.mk sys.mk NOOBJ= noobj install: diff --git a/share/mk/bsd.README b/share/mk/bsd.README index b3f2e59b999..b9c153a6dac 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.12 1995/09/24 23:49:06 christos Exp $ +# $NetBSD: bsd.README,v 1.13 1995/10/22 00:45:54 christos Exp $ # @(#)bsd.README 5.1 (Berkeley) 5/11/90 This is the README file for the new make "include" files for the BSD @@ -274,6 +274,16 @@ SUBDIRS. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +The include file is used by and +. It contains a set of rules for lex and yacc that +can be used when multiple lex and yacc files are present in the +same directory, and their respective targets are made in parallel. +Since it renames the yacc output include files these rules are not +used by default. They can be enabled by setting the PARALLEL variable +in the Makefile. + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + The include file has support for building libraries. It has the same seven targets as : all, clean, cleandir, depend, install, lint, and tags. It has a limited number of suffixes, consistent diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index d40f1b9b053..4b459428469 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.65 1995/09/30 12:21:33 pk Exp $ +# $NetBSD: bsd.lib.mk,v 1.66 1995/10/22 00:45:56 christos Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 .if exists(${.CURDIR}/../Makefile.inc) @@ -223,3 +223,4 @@ realinstall: beforeinstall .include .include .include +.include diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 8c0ffcc19fb..9fd3f6e21df 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,8 +1,7 @@ -# $NetBSD: bsd.man.mk,v 1.20 1995/06/07 01:15:20 cgd Exp $ +# $NetBSD: bsd.man.mk,v 1.21 1995/11/25 19:53:33 perry Exp $ # @(#)bsd.man.mk 5.2 (Berkeley) 5/11/90 MANTARGET?= cat -NROFF?= nroff .if !target(.MAIN) .if exists(${.CURDIR}/../Makefile.inc) @@ -12,15 +11,15 @@ NROFF?= nroff .MAIN: all .endif -.SUFFIXES: .1 .2 .3 .4 .5 .6 .7 .8 .cat1 .cat2 .cat3 .cat4 .cat5 .cat6 \ - .cat7 .cat8 +.SUFFIXES: .1 .2 .3 .4 .5 .6 .7 .8 .9 .cat1 .cat2 .cat3 .cat4 .cat5 .cat6 \ + .cat7 .cat8 .cat9 -.8.cat8 .7.cat7 .6.cat6 .5.cat5 .4.cat4 .3.cat3 .2.cat2 .1.cat1: - @echo "${NROFF} -mandoc ${.IMPSRC} > ${.TARGET}" - @${NROFF} -mandoc ${.IMPSRC} > ${.TARGET} || ( rm -f ${.TARGET} ; false ) +.9.cat9 .8.cat8 .7.cat7 .6.cat6 .5.cat5 .4.cat4 .3.cat3 .2.cat2 .1.cat1: + @echo "nroff -mandoc ${.IMPSRC} > ${.TARGET}" + @nroff -mandoc ${.IMPSRC} > ${.TARGET} || ( rm -f ${.TARGET} ; false ) .if defined(MAN) && !empty(MAN) -MANALL= ${MAN:S/.1$/.cat1/g:S/.2$/.cat2/g:S/.3$/.cat3/g:S/.4$/.cat4/g:S/.5$/.cat5/g:S/.6$/.cat6/g:S/.7$/.cat7/g:S/.8$/.cat8/g} +MANALL= ${MAN:S/.1$/.cat1/g:S/.2$/.cat2/g:S/.3$/.cat3/g:S/.4$/.cat4/g:S/.5$/.cat5/g:S/.6$/.cat6/g:S/.7$/.cat7/g:S/.8$/.cat8/g:S/.9$/.cat9/g} .endif MINSTALL= install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} @@ -33,8 +32,8 @@ MCOMPRESSSUFFIX= .gz maninstall: .if defined(MANALL) @for page in ${MANALL}; do \ - dir=${DESTDIR}${MANDIR}`expr $$page : '.*\.cat\([1-8]\)'`; \ - instpage=$${dir}${MANSUBDIR}/`expr $$page : '\(.*\)\.cat[1-8]'`.0${MCOMPRESSSUFFIX}; \ + dir=${DESTDIR}${MANDIR}`expr $$page : '.*\.cat\([1-9]\)'`; \ + instpage=$${dir}${MANSUBDIR}/`expr $$page : '\(.*\)\.cat[1-9]'`.0${MCOMPRESSSUFFIX}; \ if [ X"${MCOMPRESS}" = X ]; then \ echo ${MINSTALL} $$page $$instpage; \ ${MINSTALL} $$page $$instpage; \ diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 3daaf9de15f..1a8f850b942 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.21.2.1 1995/10/12 06:27:48 cgd Exp $ +# $NetBSD: bsd.own.mk,v 1.23 1995/11/03 23:33:33 cgd Exp $ # Defining `SKEY' causes support for S/key authentication to be compiled in. SKEY= yes @@ -58,10 +58,5 @@ STRIP?= -s NOPIC= .endif -# Alpha doesn't have a working profiling support -.if (${MACHINE_ARCH} == "alpha") -NOPROFILE= -.endif - # No lint, for now. NOLINT= diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk new file mode 100644 index 00000000000..0117215cb4d --- /dev/null +++ b/share/mk/bsd.sys.mk @@ -0,0 +1,30 @@ +# $NetBSD: bsd.sys.mk,v 1.1 1995/10/22 00:45:59 christos Exp $ +# +# Parallel make rule overrides + +.if defined(PARALLEL) +# Lex +.l: + ${LEX.l} -o${.TARGET:R}.yy.c ${.IMPSRC} + ${LINK.c} -o ${.TARGET} ${.TARGET:R}.yy.c ${LDLIBS} -ll + rm -f ${.TARGET:R}.yy.c +.l.c: + ${LEX.l} -o${.TARGET} ${.IMPSRC} +.l.o: + ${LEX.l} -o${.TARGET:R}.yy.c ${.IMPSRC} + ${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.yy.c + rm -f ${.TARGET:R}.yy.c + +# Yacc +.y: + ${YACC.y} -b ${.TARGET:R} ${.IMPSRC} + ${LINK.c} -o ${.TARGET} ${.TARGET:R}.tab.c ${LDLIBS} + rm -f ${.TARGET:R}.tab.c +.y.c: + ${YACC.y} -b ${.TARGET:R} ${.IMPSRC} + mv ${.TARGET:R}.tab.c ${.TARGET} +.y.o: + ${YACC.y} -b ${.TARGET:R} ${.IMPSRC} + ${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.tab.c + rm -f ${.TARGET:R}.tab.c +.endif -- 2.20.1