Re: more filename -> file_name gotchas

[Paul Eggert]

Akim Demaille <address@hidden> writes:

>>>> "Paul" == Paul Eggert <address@hidden> writes:
>
>  > My previous patch was incomplete, which caused "make check" to fail.
>  > That's what I get for trying to switch terminology!  Anyway, I
>  > installed this to fix things up:
>
> The check still fails, since in the documentation you changed some
> position::filename into position::file_name.  Since the example is
> extracted and compiled, it doesn't work.

Hmm, I can't reproduce the problem.  The documentation and lalr1.cc
both say file_name now, and "make check" works for me.  Perhaps
you were testing an intermediate state?

> Also, for some reason you appeared to have changed my compilation
> rules in example/calc++, which now launches bison several times
> instead of a single one.

Sorry about that.  The old rules had a typo and I botched the patch.
I fixed things (I hope :-) by installing the following patch.

2005-09-14  Paul Eggert  <address@hidden>

        * examples/calc++/Makefile.am ($(calc_sources_generated)): Don't
        do anything if $@ exists.  This reverts part of the 2005-07-07
        patch.

--- examples/calc++/Makefile.am 7 Jul 2005 23:16:46 -0000       1.2
+++ examples/calc++/Makefile.am 14 Sep 2005 22:10:50 -0000      1.3
@@ -62,8 +62,11 @@ $(srcdir)/calc++-parser.stamp: $(srcdir)
        @mv -f calc++-parser.tmp $@
 
 $(calc_sources_generated): $(srcdir)/calc++-parser.stamp
-       rm -f $(srcdir)/calc++-parser.stamp
-       $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/calc++-parser.stamp && \
+         $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp; \
+       fi
+
 
 ## --------------------------- ##
 ## Building & testing calc++.  ##