Serguey Parkhomovsky wrote:
> * renamed parse.c, parse.h, scan.c, skel.c with init prefix so compiling
>   flex outside of obj by accident wouldn't clobber the bootstrap files

Do you remember what caused you to skip using the in base yacc? The diff below
seems to work for me.

Index: Makefile
===================================================================
RCS file: /cvs/src/usr.bin/lex/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile    19 Nov 2015 23:46:55 -0000      1.14
+++ Makefile    19 Nov 2015 23:52:40 -0000
@@ -18,7 +18,7 @@ SRCS= buf.c ccl.c dfa.c ecs.c filter.c g
          scanopt.c skel.c sym.c tables.c tables_shared.c \
          tblcmp.c yylex.c
 
-CLEANFILES+=skel.c parse.h
+CLEANFILES+=skel.c parse.c parse.h
 LDADD+=-lm
 
 MAN = flex.1
@@ -29,10 +29,8 @@ MLINKS= flex.1 lex.1 flex.1 flex++.1
 
 VERSION="2.5.39"
 
-# Our yacc is too old to compile parse.y; use bootstrapped parse.c instead
-parse.h parse.c: parse.y initparse.c initparse.h
-       cp ${.CURDIR}/initparse.c parse.c
-       cp ${.CURDIR}/initparse.h parse.h
+parse.h parse.c: parse.y
+       yacc -d -o parse.c ${.CURDIR}/parse.y
 
 skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
        sed -e 's/m4_/m4postproc_/g' -e 's/m4preproc_/m4_/g' \

Reply via email to