[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-520-gcb9f2c2

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=cb9f2c28b2cb8bdcc942468008765598f87f425c

The branch, maint has been updated
       via  cb9f2c28b2cb8bdcc942468008765598f87f425c (commit)
       via  40c34328d1e5d3ab6885f046ce27517332413c13 (commit)
      from  9b5ced02fd41130d408d95808855a067eb82dd68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cb9f2c28b2cb8bdcc942468008765598f87f425c
Merge: 9b5ced0 40c3432
Author: Stefano Lattarini <address@hidden>
Date:   Mon Oct 24 19:45:42 2011 +0200

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

commit 40c34328d1e5d3ab6885f046ce27517332413c13
Author: Stefano Lattarini <address@hidden>
Date:   Thu Oct 20 22:25:45 2011 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   14 ++++++++++++++
 automake.in       |    9 ---------
 tests/Makefile.am |    2 +-
 tests/Makefile.in |    2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0836c77..39c661c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-20  Stefano Lattarini  <address@hidden>
+
+       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  <address@hidden>
 
        dejagnu: allow the package developer to extend site.exp
diff --git a/automake.in b/automake.in
index 516e594..db7f3c6 100755
--- a/automake.in
+++ b/automake.in
@@ -2053,15 +2053,6 @@ sub handle_single_transform ($$$$$%)
            # derived from is not.
            &push_dist_common ($object)
              unless ($topparent =~ /^(?:nobase_)?nodist_/);
-
-           # If resulting derived source is in a subdir, we need to make
-           # sure the subdir exists at build time.
-           if ($object =~ /\//)
-             {
-               my $dirstamp = require_build_directory_maybe ($object);
-               depend ($object, $dirstamp)
-                 if ($dirstamp);
-             }
            next;
          }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index efb4fea..c16eb9f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,7 +25,7 @@ dist-auxfile-2.test \
 gcj6.test \
 java-nobase.test \
 pr8365-remake-timing.test \
-yacc-dist-nobuild-subdir.test \
+lex-subobj-nodep.test \
 vala-vpath.test \
 txinfo5.test
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f12b81d..65e8d7f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -296,7 +296,7 @@ dist-auxfile-2.test \
 gcj6.test \
 java-nobase.test \
 pr8365-remake-timing.test \
-yacc-dist-nobuild-subdir.test \
+lex-subobj-nodep.test \
 vala-vpath.test \
 txinfo5.test
 


hooks/post-receive
-- 
GNU Automake