From badaccf0f269a2b990c5534f316e478de8bb736d Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Mon, 4 May 1998 16:22:30 +0000 Subject: [PATCH] Fixed races in `make -jN' using new yacc rules. Fixed slightly wrong order of -I's in CFLAGS. FIxed the usual style bugs in DPADD and LDADD. --- gnu/usr.bin/bc/Makefile | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile index 50dc7082b76..ca06c990d73 100644 --- a/gnu/usr.bin/bc/Makefile +++ b/gnu/usr.bin/bc/Makefile @@ -1,28 +1,15 @@ -# $Id: Makefile,v 1.12 1998/05/01 10:01:00 andreas Exp $ +# $Id: Makefile,v 1.13 1998/05/01 19:13:41 ache Exp $ .PATH: ${.CURDIR}/../../../contrib/bc/bc \ ${.CURDIR}/../../../contrib/bc/lib \ ${.CURDIR}/../../../contrib/bc/doc PROG= bc -BCSRCS= execute.c global.c load.c main.c storage.c util.c \ +SRCS= bc.y execute.c global.c load.c main.c scan.l storage.c util.c \ number.c getopt.c getopt1.c -GENSRCS=bc.c scan.c -SRCS= ${GENSRCS} ${BCSRCS} - YACC= bison -y - -CFLAGS+=-I${.CURDIR} -I. -I${.CURDIR}/../../../contrib/bc/h -DHAVE_CONFIG_H - -bc.h: bc.c - mv y.tab.h bc.h - -beforedepend: bc.h -scan.o: bc.h - -CLEANFILES+= ${GENSRCS} y.tab.h bc.h - -DPADD+= ${LIBREADLINE} ${LIBTERMCAP} -LDADD+= -lreadline -ltermcap +CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../../contrib/bc/h -DHAVE_CONFIG_H +DPADD= ${LIBREADLINE} ${LIBTERMCAP} +LDADD= -lreadline -ltermcap .include