From 5b28b4a8a8e25a48cb973527462780240bb2ad66 Mon Sep 17 00:00:00 2001 From: Kevin Zheng Date: Tue, 9 Apr 2019 14:36:11 +0200 Subject: [PATCH] Fix a build error on FreeBSD 12, bison 3.3.2, automake 1.16.1 and BSD make by dropping the rules to run bison and use automake's built-in rules instead --- src/frontend/Makefile.am | 8 ++------ src/spicelib/parser/Makefile.am | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am index 6b8757c1b..b3e77b162 100644 --- a/src/frontend/Makefile.am +++ b/src/frontend/Makefile.am @@ -4,6 +4,8 @@ SUBDIRS = plotting help parser wdisp numparam trannoise DIST_SUBDIRS = plotting help parser wdisp numparam trannoise EXTRA_DIST = testcommands.c +BUILT_SOURCES = parse-bison.h + noinst_LTLIBRARIES = libfte.la libfte_la_SOURCES = \ @@ -150,7 +152,6 @@ libfte_la_SOURCES = \ parse.c \ parse.h \ parse-bison.y \ - parse-bison-y.h \ points.c \ points.h \ postcoms.c \ @@ -198,8 +199,3 @@ AM_CFLAGS = $(STATIC) AM_YFLAGS = -d MAINTAINERCLEANFILES = Makefile.in - -$(srcdir)/parse.c : parse-bison.c - -parse-bison.c : parse-bison.y - $(am__skipyacc) $(YACCCOMPILE) -o $@ $< diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am index 807b52eb7..63ed603dc 100644 --- a/src/spicelib/parser/Makefile.am +++ b/src/spicelib/parser/Makefile.am @@ -2,6 +2,8 @@ noinst_LTLIBRARIES = libinp.la +BUILT_SOURCES = inpptree-parser.h + libinp_la_SOURCES = \ ifeval.c \ ifnewuid.c \ @@ -60,18 +62,12 @@ libinp_la_SOURCES = \ inppname.c \ inpptree.c \ inpptree-parser.y \ - inpptree-parser-y.h \ inpsymt.c \ inptyplk.c \ ptfuncs.c \ sperror.c \ inpxx.h -$(srcdir)/inpptree.c : inpptree-parser.c - -inpptree-parser.c : inpptree-parser.y - $(am__skipyacc) $(YACCCOMPILE) -o $@ $< - AM_CPPFLAGS = @AM_CPPFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend AM_CFLAGS = $(STATIC) AM_YFLAGS = -d