# HG changeset patch # User jwe # Date 1202329334 0 # Node ID d03ae525c8944780e1164d11fa758de0f0dcf9af # Parent b1cfd33a364b4663d723bed877376e83e34355c4 [project @ 2008-02-06 20:22:14 by jwe] diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-02-06 John W. Eaton + + * Makefile.in (parse.cc): Also use --defines option for bison. + 2008-02-06 Michael Goffioul * graphics.cc (axes::properties::set_defaults): Set default axes diff --git a/src/Makefile.in b/src/Makefile.in --- a/src/Makefile.in +++ b/src/Makefile.in @@ -559,9 +559,10 @@ @$(PERL) $(top_srcdir)/mk-opts.pl --opt-handler-fcns $< > $@-t @mv $@-t $@ +## We require Bison. parse.cc : parse.y @echo "expect 14 shift/reduce conflicts" - $(YACC) $(YFLAGS) -o $@ $< + $(YACC) $(YFLAGS) --output=$@ --defines=y.tab.h $< lex.cc : lex.l $(LEX) $(LFLAGS) $< > $(@F)-t