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.
I will wait until Sunday before pushing, to allow for reviews
and objections.
Regards,
Stefano
---
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 a022b09..64284f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-20 Stefano Lattarini <stefano.lattar...@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-18 Stefano Lattarini <stefano.lattar...@gmail.com>
tests: fix spurious failure with FreeBSD make and Yacc in VPATH
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 36ac88e..45e50f8 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 8bdd107..be98a4e 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
--
1.7.2.3
