Mercurial > octave-antonio
changeset 7454:d03ae525c894
[project @ 2008-02-06 20:22:14 by jwe]
| author | jwe |
|---|---|
| date | Wed, 06 Feb 2008 20:22:14 +0000 |
| parents | b1cfd33a364b |
| children | fe332ce262b5 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 06 10:46:10 2008 +0000 +++ b/src/ChangeLog Wed Feb 06 20:22:14 2008 +0000 @@ -1,3 +1,7 @@ +2008-02-06 John W. Eaton <jwe@octave.org> + + * Makefile.in (parse.cc): Also use --defines option for bison. + 2008-02-06 Michael Goffioul <michael.goffioul@gmail.com> * graphics.cc (axes::properties::set_defaults): Set default axes
--- a/src/Makefile.in Wed Feb 06 10:46:10 2008 +0000 +++ b/src/Makefile.in Wed Feb 06 20:22:14 2008 +0000 @@ -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