Merge branch 'fix-pr8485-and-pr8526' into maint

* fix-pr8485-and-pr8526:
  deps: partially revert commit `v1.11-512-geeee551'

diff --cc ChangeLog
index 0836c77dfa88d6be311aaadde7b564c7c48d6e31,64284f8a935c508db5f7d925eaf1412f1369eb37..39c661c67064094afae027767e50662efeecefa1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,72 -1,17 +1,86 @@@
+ 2011-10-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       deps: partially revert commit `v1.11-512-geeee551'
+       This change partly reverts commit "Create subdirs for generated
+       sources even when not dep tracking", of 2011-04-02.
+       That commit had caused the bugs #8485 and #8526.  Since we are
+       nearing the bug-fixing automake release 1.11.2, the safest policy
+       at the moment is to just revert the problematic hunks: an older,
+       known bug is better than a regression.
+       * automake.in (handle_single_transform): Don't add a dirstamp
+       dependency, even when $object is derived and lands in a subdir.
+       * tests/Makefile.am (XFAIL_TESTS): Add lex-subobj-nodep.test,
+       remove yacc-dist-nobuild-subdir.test.
+ 
 +2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      dejagnu: allow the package developer to extend site.exp
 +      Fixes automake bug#7873.
 +      * lib/am/dejagnu.am (site.exp): Depend from the files listed in
 +      $(EXTRA_DEJAGNU_SITE_CONFIG), if any.  Append their contents to
 +      the generated site.exp (still preserving user edits).
 +      * doc/automake.texi (Dejagnu Tests): Update.
 +      * tests/dejagnu-siteexp-append.test: New test.
 +      * tests/dejagnu-siteexp-extend.test: Likewise.
 +      * tests/dejagnu-siteexp-useredit.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +      * NEWS: Update.
 +      Suggestion by Rainer Orth.
 +
 +2011-10-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      dejagnu: ensure 'srcdir' is defined as a relative directory
 +      This change fixes automake bug#7833.
 +      * lib/am/dejagnu.am (check-DEJAGNU): Prefer using plain $(srcdir)
 +      over calculating and using the absolute path of $(srcdir).
 +      * tests/dejagnu-relative-srcdir.test: New test.
 +      * tests/dejagnu-absolute-builddir.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +      Report by Ian Lance Taylor.  Suggestions by Ralf Wildenhues.
 +
 +2010-12-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix testsuite failure of check12.test without DejaGNU.
 +      * tests/check12.test: Require runtest.
 +
 +2010-12-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Extend and improve tests on DejaGnu support.
 +      * tests/dejagnu.test: Do not create useless dummy test script.
 +      Add trailing `:' command.  In heading comments, add reference
 +      to ...
 +      * tests/check12.test: ... this new "semantic" test, covering
 +      concurrent use of dejagnu tests, simple tests and `check-local'
 +      target.
 +      * tests/dejagnu2.test: Make test more reliable, by avoid weak
 +      grepping of make output.  Prefer `cat' over `echo' to append
 +      to configure.in.  Quote literal dots in grep regexps.  Prefer
 +      `grep -c ...' over `grep ... | wc -l'.  Make grepping of
 +      automake stderr slightly stricter.  Add trailing `:' command.
 +      * tests/dejagnu3.test: Prefer `cat' over `echo' to append to
 +      configure.in.  Check stderr of expected-to-fail "make" call.
 +      Remove extra blank lines from Makefile.am.
 +      * tests/dejagnu4.test: Prefer `cat' over `echo' to append to
 +      configure.in.  Prefer `mv -f' over plain `mv' when the target
 +      file already exists.  Avoid extra mkdir calls by creating more
 +      directories at once.  Better use of blank lines.  Check that
 +      the `*.log' and `*.sum' files are created by runtest also when
 +      "make check" fails.
 +      * tests/dejagnu7.test: Prefer `cat' over `echo' to append to
 +      configure.in.  Better use of blank lines.  Add a trailing `:'
 +      command.
 +      * tests/dejagnu6.test: Likewise, and give the dejagnu test a
 +      more descriptive name.
 +      * tests/dejagnu5.test: Likewise.  Also, simply define package
 +      name to `$me' rather than using a non-obvious sed script to
 +      extract it from `AC_INIT', and write the Makefile.am with only
 +      one command.
 +      * tests/Makefile.am (TESTS): Updated.
 +
 +2011-10-21  Peter Rosin  <peda@lysator.liu.se>
 +
 +      * THANKS: Fix whitespace issue.
 +
  2011-10-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix spurious failure with FreeBSD make and Yacc in VPATH

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge