From 4c9853551c5c480bf812236b93d9c099233ff93a Mon Sep 17 00:00:00 2001
From: Stephen Williams <steve@icarus.com>
Date: Tue, 29 Mar 2011 08:54:58 -0700
Subject: [PATCH] flex and bison handled in makefiles with variables

Greg Steuck submitted this patch.
---
 driver/Makefile.in | 6 ++++--
 ivlpp/Makefile.in  | 3 ++-
 vpi/Makefile.in    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/driver/Makefile.in b/driver/Makefile.in
index b40a614b5..39cf94ff6 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -38,6 +38,8 @@ CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+LEX = @LEX@
+YACC = @YACC@
 MAN = @MAN@
 PS2PDF = @PS2PDF@
 
@@ -66,10 +68,10 @@ iverilog@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog@EXEEXT@ @EXTRALIBS@
 
 cflexor.c: cflexor.lex
-	flex -s -Pcf -ocflexor.c $(srcdir)/cflexor.lex
+	$(LEX) -s -Pcf -ocflexor.c $(srcdir)/cflexor.lex
 
 cfparse.h cfparse.c: cfparse.y
-	bison --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y
+	$(YACC) --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y
 
 dep:
 	mkdir dep
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index de35381b2..d4b4d2cc6 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -36,6 +36,7 @@ CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+LEX = @LEX@
 
 CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
 CFLAGS = @WARNING_FLAGS@ @CFLAGS@
@@ -60,7 +61,7 @@ ivlpp@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o ivlpp@EXEEXT@ @EXTRALIBS@
 
 lexor.c: lexor.lex
-	flex -olexor.c $(srcdir)/lexor.lex
+	$(LEX) -olexor.c $(srcdir)/lexor.lex
 
 install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
 
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 3f129df7e..933709759 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -88,12 +88,12 @@ system.vpi: $O ../vvp/libvpi.a
 	$(CC) @shared@ -o $@ $O -L../vvp $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS)
 
 sys_readmem_lex.c: sys_readmem_lex.lex
-	flex -t -Preadmem $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c
+	$(LEX) -t -Preadmem $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c
 
 sdf_lexor.o: sdf_lexor.c sdf_parse.h
 
 sdf_lexor.c: sdf_lexor.lex
-	flex -t -Psdf $(srcdir)/sdf_lexor.lex > sdf_lexor.c
+	$(LEX) -t -Psdf $(srcdir)/sdf_lexor.lex > sdf_lexor.c
 
 sdf_parse.c sdf_parse.h: $(srcdir)/sdf_parse.y
 	$(YACC) --verbose -d -p sdf -o sdf_parse.c $(srcdir)/sdf_parse.y