Merging 'yacc-work' into master

[Stefano Lattarini]

I have cloned 'master' into a temporary branch 'yl-work-for-master',
merged master in there, and pushed.  You can find the resulting branch
here:

  http://git.savannah.gnu.org/cgit/automake.git/log/?h=yl-work-for-master

Below are the commit message and the stats of the merge, and attached
is the (compressed) result of:

  git diff --stat master yl-work-for-master

I will merge the 'yl-work-for-master' branch back into master in 72
hours or so if there is no objection by then.

Regards,
  Stefano

-*-*-

Merge branch 'yacc-work' into yl-work-for-master

    * yacc-work: (37 commits)
      fixup: list of yacc/lex tests was botched
      tests: work around bug#7884 in many yacc/lex tests
      yacc/lex tests: remove an unneeded workaround for bug#8485
      yacc/lex tests: avoid too much failures with FreeBSD make
      yacc-dist-nobuild.test: add reference to bug#7884
      yacc tests: fix bug in 'yacc-cxx.test'
      lex tests: fix spurious link errors on Solaris
      lex: "make clean" removes .c files from non-distributed .l
      lex tests: make test on Lex dependency tracking more "semantic"
      lex tests: remove erroneous check about ylwrap distribution
      yacc tests: "make clean" removes C++ files from non-distributed .y
      tests: add a workaround for automake bug#8485
      tests: add a couple of inter-tests reference
      lex tests: require just `lex' instead of `flex'
      fix typo in ChangeLog (2011-05-04)
      tests defs: use `skip_' for skipping yacc/lex related tests
      lex/yacc tests: remove redundant $distdir definition
      coverage: test lex-generated "#line" directives postprocessing
      tests: minor improvements to a couple of yacc tests
      tests: fix spurious failure in test 'yacc-d-cxx.test'
      ...

+ Extra non-trivial edits:

    * tests/defs.in: Delete; the differences from maint has been
    merged into 'tests/defs' and 'tests/defs-static.in'.
    * tests/defs (yacc, lex): Use 'skip_all_', not 'skip_', to
    skip the whole test case if yacc (resp. lex) is missing.
    (bison): New, set up the environment so that 'bison -y' will
    be used as the yacc program.
    (useless_vpath_rebuild, yl_distcheck): Moved in from
    'tests/defs.in'.
    * tests/defs-static.in ($YACC, $LEX): Default to the values
    determined at configure time, and allow them to be overridden
    by the more namespace-safe variables '$AM_TESTSUITE_YACC' and
    '$AM_TESTSUITE_LEX' respectively.
    * tests/Makefile.am (do_subst): Also substitute '@YACC@' and
    '@LEX@'.
    * Several tests: Fix requirements declarations, by preferring
    'lex' and 'yacc' over 'flex' and 'bison' whenever possible.

-*-*-

 60 files changed, 3523 insertions(+), 812 deletions(-)

 ChangeLog.11                              |  590 ++++++++++++++++++++++++++++-
 NEWS                                      |   20 +-
 automake.in                               |   33 ++-
 configure.ac                              |   19 +
 doc/automake.texi                         |   16 +-
 lib/am/yacc.am                            |   11 +-
 tests/Makefile.am                         |    4 +
 tests/cond35.test                         |    2 +-
 tests/defs                                |   83 +++--
 tests/defs-static.in                      |    2 +
 tests/lex-clean-cxx.test                  |  124 ++++++
 tests/lex-clean.test                      |  107 ++++++
 tests/lex-depend-cxx.test                 |   94 +++++
 tests/{lex4.test => lex-depend-grep.test} |   16 +-
 tests/lex-depend.test                     |   83 ++++
 tests/lex-line.test                       |  116 ++++++
 tests/lex-nodist.test                     |   83 ++++
 tests/lex-pr204.test                      |   88 +++++
 tests/lex-subobj-nodep.test               |    4 +-
 tests/lex3.test                           |    4 +-
 tests/lex5.test                           |   11 +-
 tests/lexvpath.test                       |    4 +-
 tests/list-of-tests.mk                    |   43 ++-
 tests/silent-lex-gcc.test                 |  144 -------
 tests/silent-lex-generic.test             |  148 -------
 tests/silent-lex.test                     |  138 +++++++
 tests/silent-many-gcc.test                |   16 +-
 tests/silent-many-generic.test            |   17 +-
 tests/silent-yacc-gcc.test                |  143 -------
 tests/silent-yacc-generic.test            |  143 -------
 tests/silent-yacc-headers.test            |  175 +++++++++
 tests/silent-yacc.test                    |  138 +++++++
 tests/subpkg-yacc.test                    |   25 +-
 tests/subpkg.test                         |    4 +-
 tests/{yacc6.test => yacc-auxdir.test}    |   77 +---
 tests/yacc-basic.test                     |   44 ++-
 tests/yacc-bison-skeleton-cxx.test        |  100 +++++
 tests/yacc-bison-skeleton.test            |   74 ++++
 tests/yacc-clean-cxx.test                 |  165 ++++++++
 tests/yacc-clean.test                     |   10 +-
 tests/yacc-cxx.test                       |  138 +++++++
 tests/yacc-d-basic.test                   |   13 +-
 tests/yacc-d-cxx.test                     |  233 ++++++++++++
 tests/yacc-d-vpath.test                   |    8 +-
 tests/yacc-deleted-headers.test           |  165 ++++++++
 tests/yacc-depend.test                    |   85 ++++
 tests/yacc-depend2.test                   |   89 +++++
 tests/yacc-dist-nobuild-subdir.test       |    6 +-
 tests/yacc-dist-nobuild.test              |    3 +-
 tests/yacc-line.test                      |  116 ++++++
 tests/yacc-mix-c-cxx.test                 |  208 ++++++++++
 tests/yacc-nodist.test                    |   17 +-
 tests/{pr204.test => yacc-pr204.test}     |   14 +-
 tests/yacc-weirdnames.test                |   56 +++
 tests/yacc4.test                          |    5 +-
 tests/yacc8.test                          |    4 +-
 tests/yaccdry.test                        |    2 +-
 tests/yaccpp.test                         |   41 ++-
 tests/yaccvpath.test                      |   12 +-
 tests/yflags-force-override.test          |    2 -

yl.diff.xz
Description: Binary data