diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 1d573d3be40f..138bc05a5a1b 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,12 +1,12 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $Id: Makefile,v 1.23 1997/10/05 09:38:43 jkh Exp $ +# $Id: Makefile,v 1.24 1998/04/26 16:12:23 bde Exp $ PROG= sh -SHSRCS= alias.c cd.c echo.c error.c eval.c exec.c expand.c \ +SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ mystring.c options.c output.c parser.c printf.c redir.c show.c \ trap.c var.c -GENSRCS= arith.c arith_lex.c builtins.c init.c nodes.c syntax.c +GENSRCS= builtins.c init.c nodes.c syntax.c GENHDRS= builtins.h nodes.h syntax.h token.h SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} @@ -21,11 +21,9 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} .PATH: ${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \ - mksyntax mksyntax.o \ - y.tab.h + mksyntax mksyntax.o CLEANFILES+= ${GENSRCS} ${GENHDRS} - .ORDER: builtins.c builtins.h builtins.c builtins.h: mkbuiltins builtins.def cd ${.CURDIR}; sh mkbuiltins ${.OBJDIR} @@ -57,6 +55,4 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens -y.tab.h: arith.c - .include diff --git a/games/atc/Makefile b/games/atc/Makefile index f129096f13de..8ff9e4649aa1 100644 --- a/games/atc/Makefile +++ b/games/atc/Makefile @@ -2,13 +2,12 @@ PROG= atc CFLAGS+=-DBSD -I${.CURDIR} -I. -SRCS= extern.c grammar.c graphics.c input.c lex.c list.c log.c \ +SRCS= extern.c grammar.y graphics.c input.c lex.l list.c log.c \ main.c tunable.c update.c MAN6= atc.6 DPADD= ${LIBL} ${LIBM} ${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT} LDADD= -ll -lm -lcurses -ltermcap -lcompat GAMES= Game_List Killer crossover default easy game_2 -CLEANFILES=grammar.c y.tab.h lex.c HIDEGAME=hidegame beforeinstall: diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile index 7293a3baa538..4add2fee96b8 100644 --- a/gnu/usr.bin/perl/x2p/Makefile +++ b/gnu/usr.bin/perl/x2p/Makefile @@ -1,9 +1,9 @@ +# $Id$ PROG= a2p -SRCS+= a2p.c hash.c str.c walk.c util.c +SRCS= a2p.y hash.c str.c walk.c util.c CFLAGS+= -I${.CURDIR}/../perl -CLEANFILES+= y.tab.h a2p.c LDADD= -lm DPADD= ${LIBM} diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile index 295fe3f53aaf..9fe2f68ead35 100644 --- a/usr.bin/colldef/Makefile +++ b/usr.bin/colldef/Makefile @@ -1,13 +1,11 @@ -# $Id$ +# $Id: Makefile,v 1.11 1997/02/22 19:54:30 peter Exp $ PROG = colldef LFLAGS = -8 -i -YFLAGS = -d CFLAGS += -I. -I${.CURDIR}/../../lib/libc/locale -DCOLLATE_DEBUG -SRCS = parse.c scan.c +SRCS = parse.y scan.l LDADD = -ll DPADD = ${LIBL} -CLEANFILES += lex.yy.c parse.c scan.c y.tab.[ch] SUBDIR = data .include diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile index a240c05b1fa5..74a72624aac2 100644 --- a/usr.bin/mk_cmds/Makefile +++ b/usr.bin/mk_cmds/Makefile @@ -1,13 +1,9 @@ -# $Id$ +# $Id: Makefile,v 1.5 1997/02/22 19:56:09 peter Exp $ PROG= mk_cmds -# -# NB: ct.c must come before cmd_tbl.c so that y.tab.h will be generated. -# -SRCS= mk_cmds.c options.c utils.c ct.c cmd_tbl.c +SRCS= mk_cmds.c options.c utils.c ct.y cmd_tbl.l CFLAGS+= -I. -I${.CURDIR}/../../lib/libss -DIN_MK_CMDS LFLAGS= -l -CLEANFILES+= y.tab.c y.tab.h lex.yy.c cmd_tbl.c ct.c NOMAN= # XXX LDADD+= -ll diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile index f07bf46d7f6b..e3ca24cf325c 100644 --- a/usr.bin/mklocale/Makefile +++ b/usr.bin/mklocale/Makefile @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/7/93 +# $Id$ PROG= mklocale -SRCS= yacc.c lex.c +SRCS= yacc.y lex.l CFLAGS+=-I. -CLEANFILES+=y.tab.h yacc.c lex.c MAN1= mklocale.1 SUBDIR= data diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile index e20938eb4994..56d3830d7ecf 100644 --- a/usr.bin/xlint/lint1/Makefile +++ b/usr.bin/xlint/lint1/Makefile @@ -1,21 +1,17 @@ # $NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $ PROG= lint1 -SRCS= cgram.c scan.c mem1.c mem.c err.c main1.c decl.c tree.c func.c \ - init.c emit.c emit1.c y.tab.h +SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \ + init.c emit.c emit1.c NOMAN= LDADD+= -ll DPADD+= ${LIBL} -YFLAGS= -d CFLAGS+=-I. LINTFLAGS=-aehpz -CLEANFILES+=y.tab.h cgram.c scan.c BINDIR= /usr/libexec # XXX: -O causes the gcc to die on the i386, when compiling tree.o CFLAGS+= -DXXX_BROKEN_GCC -y.tab.h: cgram.c - .include diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 47439a9c6f6d..5aef3cb0f92a 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -1,15 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $Id$ PROG= config CFLAGS+=-I. -I${.CURDIR} -SRCS= config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \ - mkoptions.c mkswapconf.c y.tab.h +SRCS= config.y main.c lang.l mkioconf.c mkmakefile.c mkglue.c mkheaders.c \ + mkoptions.c mkswapconf.c MAN8= config.8 DPADD= ${LIBL} LDADD= -ll -CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch] - -y.tab.h: config.c .include diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile index 2b320b484a89..167d5089a3e6 100644 --- a/usr.sbin/pcvt/kbdio/Makefile +++ b/usr.sbin/pcvt/kbdio/Makefile @@ -10,7 +10,7 @@ error: .else PROG= kbdio -SRCS= kbdio.c lex.c +SRCS= kbdio.y lex.l #YACC= bison #YFLAGS+= -yd # Bison only @@ -26,7 +26,6 @@ NOMAN= CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g -CLEANFILES+= kbdio.c lex.c lex.yy.c y.tab.[ch] CLEANFILES+= y.output # comment file from bison install: diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile index 53083e052a22..e9674dedfb57 100644 --- a/usr.sbin/pcvt/vgaio/Makefile +++ b/usr.sbin/pcvt/vgaio/Makefile @@ -12,7 +12,7 @@ error: PROG= vgaio MAN8= vgaio.${MAN8EXT} -SRCS= vgaio.c lex.c +SRCS= vgaio.y lex.l YACC= yacc #YFLAGS+= -yd # Bison @@ -26,7 +26,6 @@ LDADD= -lm -ly -ll CFLAGS= -O2 # due to a gcc bug, it compiles only with -O2! CFLAGS+= -I${.OBJDIR} -I${.CURDIR} -CLEANFILES+= lex.c lex.yy.c vgaio.c y.tab.[ch] CLEANFILES+= y.output # comment file from bison install: