Re: removing graphics.h from stamp-prereq in src/Makefile.in

[John W. Eaton]

On  6-Feb-2008, Michael Goffioul wrote:

| On 2/6/08, John W. Eaton <address@hidden> wrote:
| > On  6-Feb-2008, Michael Goffioul wrote:
| >
| > | OTOH, the little other patch I sent (that adds '-l' flag
| > | to YFLAGS in Makeconf.in) also avoids the problem, because bison
| > | does not produce '#line' statement anymore.
| >
| > Using -l omits all of the line directives (the ones that point to
| > parse.y as well as y.tab.c) so I don't want to use the option because
| > I'd like to  keep the line directives that mention parse.y for
| > debugging purposes.
| 
| OK, I tried the other solution on a clean hg clone, but I got a
| compilation error: lex.l includes y.tab.h, while now bison produces
| parse.hh. Does it also happen under Linux?

Oops.  For now, try the following fix.

Thanks,

jwe


src/ChangeLog:

2008-02-06  John W. Eaton  <address@hidden>

        * Makefile.in (parse.cc): Also use --defines option for bison.


Index: src/Makefile.in
===================================================================
RCS file: /cvs/octave/src/Makefile.in,v
retrieving revision 1.463
diff -u -u -r1.463 Makefile.in
--- src/Makefile.in     6 Feb 2008 10:40:02 -0000       1.463
+++ src/Makefile.in     6 Feb 2008 20:20:37 -0000
@@ -559,9 +559,10 @@
        @$(PERL) $(top_srcdir)/mk-opts.pl --opt-handler-fcns $< > address@hidden
        @mv address@hidden $@
 
+## 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