diff options
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/colldef/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/colldef/scan.l | 4 | ||||
-rw-r--r-- | usr.bin/fib/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/fib/lex.l | 2 | ||||
-rw-r--r-- | usr.bin/mk_cmds/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/mk_cmds/cmd_tbl.l | 2 | ||||
-rw-r--r-- | usr.bin/mklocale/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/mklocale/lex.l | 2 | ||||
-rw-r--r-- | usr.bin/xlint/lint1/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/xlint/lint1/func.c | 2 | ||||
-rw-r--r-- | usr.bin/xlint/lint1/scan.l | 2 | ||||
-rw-r--r-- | usr.bin/xlint/lint1/tree.c | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile index 56baf0c..6ee8624 100644 --- a/usr.bin/colldef/Makefile +++ b/usr.bin/colldef/Makefile @@ -7,7 +7,7 @@ CFLAGS += -I. -I${.CURDIR}/../../lib/libc/locale SRCS = parse.c scan.c LDADD = -ll DPADD = ${LIBL} -CLEANFILES += parse.c scan.c parse.tab.h +CLEANFILES += lex.yy.c parse.c scan.c y.tab.[ch] SUBDIR = data .include <bsd.prog.mk> diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l index f39b18b..d3e7243 100644 --- a/usr.bin/colldef/scan.l +++ b/usr.bin/colldef/scan.l @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scan.l,v 1.1.1.1 1995/02/17 17:29:50 ache Exp $ + * $Id: scan.l,v 1.1 1995/02/17 17:29:49 ache Exp $ */ #include <err.h> @@ -34,7 +34,7 @@ #include <string.h> #include <sysexits.h> #include "collate.h" -#include "parse.tab.h" +#include "y.tab.h" int line_no = 1; u_char buf[STR_LEN], *ptr; diff --git a/usr.bin/fib/Makefile b/usr.bin/fib/Makefile index 082c9d7..66d8177 100644 --- a/usr.bin/fib/Makefile +++ b/usr.bin/fib/Makefile @@ -4,7 +4,7 @@ NOMAN=notyet SRCS = fib.c parser.c lex.l LDADD = -ll DPADD = ${LIBL} ${LIBFORMS} -CLEANFILES= parser.c lex.c parser.tab.h +CLEANFILES= parser.c lex.c y.tab.h CFLAGS += -I${.CURDIR} -I. -g diff --git a/usr.bin/fib/lex.l b/usr.bin/fib/lex.l index 8f4dfcb..18c96d5 100644 --- a/usr.bin/fib/lex.l +++ b/usr.bin/fib/lex.l @@ -32,7 +32,7 @@ * SUCH DAMAGE. * */ -#include "parser.tab.h" +#include "y.tab.h" extern int lineno; extern int charno; extern int off; diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile index f9c2878..ef9a00e 100644 --- a/usr.bin/mk_cmds/Makefile +++ b/usr.bin/mk_cmds/Makefile @@ -2,12 +2,12 @@ PROG= mk_cmds # -# NB: ct.c must come before cmd_tbl.c so that ct.tab.h will be generated. +# 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 CFLAGS+= -I. -I${.CURDIR}/../../lib/libss -DIN_MK_CMDS LFLAGS= -l -CLEANFILES+= ct.tab.h cmd_tbl.c ct.c +CLEANFILES+= y.tab.c y.tab.h lex.yy.c cmd_tbl.c ct.c NOMAN= # XXX LDADD+= -ll diff --git a/usr.bin/mk_cmds/cmd_tbl.l b/usr.bin/mk_cmds/cmd_tbl.l index 03d05bd..15b31c6 100644 --- a/usr.bin/mk_cmds/cmd_tbl.l +++ b/usr.bin/mk_cmds/cmd_tbl.l @@ -6,7 +6,7 @@ */ #include <string.h> -#include "ct.tab.h" +#include "y.tab.h" #include "copyright.h" extern char *last_token, *ds(); diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile index 3235b05..f07bf46 100644 --- a/usr.bin/mklocale/Makefile +++ b/usr.bin/mklocale/Makefile @@ -3,7 +3,7 @@ PROG= mklocale SRCS= yacc.c lex.c CFLAGS+=-I. -CLEANFILES+=yacc.tab.h yacc.c lex.c +CLEANFILES+=y.tab.h yacc.c lex.c MAN1= mklocale.1 SUBDIR= data diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l index 11da3d5..0e2f1a9 100644 --- a/usr.bin/mklocale/lex.l +++ b/usr.bin/mklocale/lex.l @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 6/6/93"; #include <stdlib.h> #include "ldef.h" -#include "yacc.tab.h" +#include "y.tab.h" %} ODIGIT [0-7] diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile index 4868019..d5e519a 100644 --- a/usr.bin/xlint/lint1/Makefile +++ b/usr.bin/xlint/lint1/Makefile @@ -9,7 +9,7 @@ DPADD+= ${LIBL} YFLAGS= -d CFLAGS+=-I. LINTFLAGS=-aehpz -CLEANFILES+=cgram.tab.h cgram.c scan.c +CLEANFILES+=y.tab.h cgram.c scan.c BINDIR= /usr/libexec diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c index 5f6b989..5d3a172 100644 --- a/usr.bin/xlint/lint1/func.c +++ b/usr.bin/xlint/lint1/func.c @@ -39,7 +39,7 @@ static char rcsid[] = "$NetBSD: func.c,v 1.7 1995/10/02 17:31:40 jpo Exp $"; #include <string.h> #include "lint1.h" -#include "cgram.tab.h" +#include "y.tab.h" /* * Contains a pointer to the symbol table entry of the current function diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l index 3306dec..53f0083 100644 --- a/usr.bin/xlint/lint1/scan.l +++ b/usr.bin/xlint/lint1/scan.l @@ -45,7 +45,7 @@ static char rcsid[] = "$NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $"; #include <err.h> #include "lint1.h" -#include "cgram.tab.h" +#include "y.tab.h" #define CHAR_MASK (~(~0 << CHAR_BIT)) diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c index 0fbf162..36dda83 100644 --- a/usr.bin/xlint/lint1/tree.c +++ b/usr.bin/xlint/lint1/tree.c @@ -41,7 +41,7 @@ static char rcsid[] = "$NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $"; #include <limits.h> #include "lint1.h" -#include "cgram.tab.h" +#include "y.tab.h" /* Various flags for each operator. */ static mod_t modtab[NOPS]; |