]> git.ipfire.org Git - thirdparty/automake.git/commit
dist: auxiliary files can be distributed from subdir Makefiles
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 30 Sep 2011 10:12:43 +0000 (12:12 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sat, 8 Oct 2011 19:07:42 +0000 (21:07 +0200)
commit326ecba2f886bac40063d8d14d99065bc15317af
tree99b56b83334839cc8bbbfc854222d40738fa7d7a
parenta3d1cdbc30755257b4a0f001c4cc8e6acaba72d1
dist: auxiliary files can be distributed from subdir Makefiles

With this change, we make it possible for a subdir Makefile.am
to distribute files in the config auxdir; while this means that
some files might be copied multiple times, it simplify some logic
in the automake script, and fix at least one important bug.  In
fact, before this change, the auxiliary script `test-driver' was
not being distributed as expected when TESTS was defined only in
a subdir Makefile (which is a pretty common setup indeed).  Now
this does not happen anymore: so the present change fixes automake
bug#9546.

Another welcome collateral effect is that `dist-auxfile-2.test'
now passes.

OTOH, the present changes *breaks threaded automake*.  The reason
is that automake needs to serialize file installations spawned
by `--add-missing' (this isn't for cosmetic reasons, but is
really needed to avoid possible race conditions and botched output
files).  Currently the code that installs required files is
intertwined with the code that declares the DIST_COMMON variables;
so, upon de-serialization, the definition of DIST_COMMON might get
emitted in the wrong Makefile.in.

Some follow-up refactoring in automake will soon take care of
remedying this situation.  For the moment, we just declare some
"parallel-am" tests as xfailing.

* automake.in (maybe_push_required_file): Add ad-hoc handling for
the case where the directory part of the required file is different
from the subdir where the current Makefile.am resides, but is equal
to the "config-aux directory" ($config_auxdir).  This is needed to
allow a construct in a non-top-level Makefile.am to require a file
in the config-aux directory.
* tests/test-driver-is-distributed.test: Extend and adjust.  This
test now passes.
* tests/java-compile-run-nested.test: Call automake with the `-a'
option to ensure that the `test-driver' auxiliary script gets
correctly installed.  This test now passes.
* tests/distcom-subdir.test: New test.
* tests/dist-readonly.test: Likewise.
* tests/dist-repeated.test: Likewise.
* tests/dist-auxdir-many-subdirs.test: Likewise.
* tests/distcom7.test: Removed, it's obsolete now.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
17 files changed:
ChangeLog
Makefile.in
automake.in
doc/Makefile.in
lib/Automake/Makefile.in
lib/Automake/tests/Makefile.in
lib/am/Makefile.in
lib/am/distdir.am
m4/Makefile.in
tests/Makefile.am
tests/Makefile.in
tests/dist-auxdir-many-subdirs.test [new file with mode: 0755]
tests/dist-readonly.test [new file with mode: 0755]
tests/dist-repeated.test [new file with mode: 0755]
tests/distcom-subdir.test [moved from tests/distcom7.test with 58% similarity]
tests/java-compile-run-nested.test
tests/test-driver-is-distributed.test