From b5bea7dc4e3284c0692212c90e474538860e40d4 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 2 Jun 1996 17:22:01 +0000
Subject: Backout yacc changes.

---
 usr.bin/colldef/Makefile     | 2 +-
 usr.bin/colldef/scan.l       | 4 ++--
 usr.bin/fib/Makefile         | 2 +-
 usr.bin/fib/lex.l            | 2 +-
 usr.bin/mk_cmds/Makefile     | 4 ++--
 usr.bin/mk_cmds/cmd_tbl.l    | 2 +-
 usr.bin/mklocale/Makefile    | 2 +-
 usr.bin/mklocale/lex.l       | 2 +-
 usr.bin/xlint/lint1/Makefile | 2 +-
 usr.bin/xlint/lint1/func.c   | 2 +-
 usr.bin/xlint/lint1/scan.l   | 2 +-
 usr.bin/xlint/lint1/tree.c   | 2 +-
 usr.sbin/config/Makefile     | 2 +-
 usr.sbin/config/lang.l       | 2 +-
 usr.sbin/config/main.c       | 2 +-
 usr.sbin/config/mkglue.c     | 2 +-
 usr.sbin/config/mkheaders.c  | 2 +-
 usr.sbin/config/mkioconf.c   | 2 +-
 usr.sbin/config/mkmakefile.c | 2 +-
 usr.sbin/config/mkoptions.c  | 2 +-
 usr.sbin/config/mkubglue.c   | 2 +-
 21 files changed, 23 insertions(+), 23 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];
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 14b4619..55f213e 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -7,7 +7,7 @@ SRCS=	config.c main.c lang.c mkioconf.c mkmakefile.c mkglue.c mkheaders.c \
 MAN8=	config.8
 DPADD=	${LIBL}
 LDADD=	-ll
-CLEANFILES+= config.c lang.c config.tab.h
+CLEANFILES+= config.c lang.c lex.yy.c y.tab.[ch]
 .if defined(CONFIG_NO_CLOBBER_EVER)
 CFLAGS+=-DNO_CLOBBER_EVER
 .endif
diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l
index 7ff2567..3f4f544 100644
--- a/usr.sbin/config/lang.l
+++ b/usr.sbin/config/lang.l
@@ -36,7 +36,7 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 #define tprintf if (do_trace) printf
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index ab8f929..a203769 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -49,7 +49,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #include <ctype.h>
 #include <err.h>
 #include <sysexits.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 #ifndef TRUE
diff --git a/usr.sbin/config/mkglue.c b/usr.sbin/config/mkglue.c
index 4124814..be623d1 100644
--- a/usr.sbin/config/mkglue.c
+++ b/usr.sbin/config/mkglue.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mkglue.c	8.1 (Berkeley) 6/6/93";
  */
 #include <stdio.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 #include <ctype.h>
 
 /*
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 75b0e82..bfa5692 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #include <stdio.h>
 #include <ctype.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 
 headers()
 {
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index e175b17..44fc260 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkioconf.c	8.2 (Berkeley) 1/21/94";
 #endif /* not lint */
 
 #include <stdio.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 /*
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 875f740..0f057f4 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 
 #include <stdio.h>
 #include <ctype.h>
-#include "config.tab.h"
+#include "y.tab.h"
 #include "config.h"
 
 #define next_word(fp, wd) \
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 7ee5991..f722d93 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)mkheaders.c	8.1 (Berkeley) 6/6/93";
 #include <stdio.h>
 #include <ctype.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 
 options()
 {
diff --git a/usr.sbin/config/mkubglue.c b/usr.sbin/config/mkubglue.c
index 4b2d4be..7d2b3d4 100644
--- a/usr.sbin/config/mkubglue.c
+++ b/usr.sbin/config/mkubglue.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mkubglue.c	8.1 (Berkeley) 6/6/93";
  */
 #include <stdio.h>
 #include "config.h"
-#include "config.tab.h"
+#include "y.tab.h"
 
 ubglue()
 {
-- 
cgit v1.1