diff options
author | Peter Rosin <peda@lysator.liu.se> | 2013-02-08 09:11:45 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-14 13:28:11 +0100 |
commit | ba25a9f1c295d7799575afa39c4c9854a85ad8e3 (patch) | |
tree | ee75e29cedbe485e71800b15fd88077c0092d3a4 /t/list-of-tests.mk | |
parent | 0756a43c3a77cff0e86aa8dad7f9f4ebd90b800c (diff) | |
download | automake-ba25a9f1c295d7799575afa39c4c9854a85ad8e3.tar.gz |
preproc: add support for relative names in included fragments
The rationale for this change is that it is annoying to have
to repeat the directory name when including a Makefile fragment.
For deep directory structures these repeats can generate a lot
of bloat. It also hinders reuse and easy directory restructuring
if all Makefile fragments have to know exactly where they live.
Suggested by Bob Friesenhahn, and later discussed in bug#13524.
In the course of discussion, the following notations were rejected:
&{reldir}& - to hard to type, {reldir} - interferes with ${reldir},
{am_reldir} - short form {D} interferes with ${D}, @am_reldir@ - short
form @D@ interferes with AC_SUBST([D]) as well as invading the
config.status turf. Other notations were also suggested...
* automake.in (read_am_file): Add third argument specifying the
relative directory of this Makefile fragment compared to the
main Makefile. Replace %reldir% and %canon_reldir% in the
fragment with this relative directory (with slashes etc, or
canonicalized).
(read_main_am_file): Adjust.
* t/preproc-reldir.sh: New test.
* t/list-of-tests.mk: Augment.
* doc/automake.texi (Include): Document the new feature.
NEWS: Add new feature.
Co-authored-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/list-of-tests.mk')
-rw-r--r-- | t/list-of-tests.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 0acbdcfae..72c99eefa 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -865,6 +865,7 @@ t/pr401.sh \ t/pr401b.sh \ t/pr401c.sh \ t/prefix.sh \ +t/preproc-reldir.sh \ t/primary.sh \ t/primary2.sh \ t/primary3.sh \ |