From 1819d65461b152aaed745e4ef79c4483c863ce1d Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Mon, 4 May 1998 19:10:20 +0000
Subject: Simplified by using new yacc rules.  The new lex rules can't be used
 here, at least without ifdefs for the bootstrap.

---
 usr.bin/lex/Makefile | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'usr.bin/lex')

diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index a63599f..5d98811 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 1997/02/22 19:55:34 peter Exp $
+# $Id: Makefile,v 1.11 1997/10/05 09:39:58 jkh Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -14,8 +14,7 @@ LINKS+=	${BINDIR}/lex ${BINDIR}/lex++
 LINKS+=	${BINDIR}/lex ${BINDIR}/flex
 LINKS+=	${BINDIR}/lex ${BINDIR}/flex++
 
-SRCS=		scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.c \
-		parse.h \
+SRCS=		scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \
 		skel.c sym.c tblcmp.c yylex.c
 LFLAGS+=	-is
 CFLAGS+=	-I. -I${.CURDIR}
@@ -24,7 +23,7 @@ MLINKS+=	lex.1 flex.1
 MLINKS+=	lex.1 flex++.1
 MLINKS+=	lex.1 lex++.1
 
-CLEANFILES+=	parse.c parse.h scan.c y.tab.h y.tab.c
+CLEANFILES=	scan.c
 
 .if !defined(NOLIB)
 SUBDIR=		lib
@@ -34,13 +33,6 @@ beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${.CURDIR}/FlexLexer.h ${DESTDIR}/usr/include/g++
 
-
-.ORDER:	parse.c parse.h
-parse.c parse.h: parse.y
-	$(YACC) -d $(.CURDIR)/parse.y
-	mv -f y.tab.c parse.c
-	mv -f y.tab.h parse.h
-
 bootstrap: initscan.c
 	@cmp -s ${.CURDIR}/initscan.c scan.c || { \
 		echo "Bootstrapping flex" ; \
@@ -48,8 +40,6 @@ bootstrap: initscan.c
 		cp -f ${.CURDIR}/initscan.c scan.c ; \
 	}
 
-scan.o:	parse.h
-
 test: check
 check: $(PROG)
 	./$(PROG) $(LFLAGS) -t $(COMPRESSION) $(.CURDIR)/scan.l \
-- 
cgit v1.1