diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-07 16:38:12 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-16 10:04:57 +0200 |
| commit | a8f56923e0adc291c0b1cdd556fda17645d3b9f1 (patch) | |
| tree | a05a0d01b04c5fcdd305a318848b6fddea995731 /lib/am/check2.am | |
| parent | 12711fcc0f3dc914b7e63345a25a186b8d4e401f (diff) | |
| download | automake-a8f56923e0adc291c0b1cdd556fda17645d3b9f1.tar.gz | |
[ng] refactor: get rid of am__EXEEXT (automake conditional and %transform)
We can substitute that with a static automake conditional %HANDLE-EXEEXT%
and a make runtime check on the non-emptiness of $(EXEEXT).
* automake.in (preprocess_file): New transform '%HANDLE-EXEEXT%', TRUE
if 'EXEEXT' has been AC_SUBST'd, FALSE otherwise.
(handle_tests): Don't define the transform '%HANDLE-EXEEXT%' anymore
when processing 'check.am': that is now done transparently by the
'preprocess_file' function.
(handle_per_suffix_test): Don't process the transform '%am__EXEEXT%'
anymore when reading 'check2.am'. It's superseded by '%HANDLE-EXEEXT%'
and ...
* lib/am/check2.am [%HANDLE-EXEEXT%]: ... by a make-runtime check that
$(EXEEXT) is not empty.
* m4/init.m4 (AM_INIT_AUTOMAKE): Simplify, taking advantage of the fact
that we don't need the Automake conditional "am__EXEEXT" anymore.
* t/parallel-tests-exeext.sh: Tiny simplification.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/am/check2.am')
| -rw-r--r-- | lib/am/check2.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/am/check2.am b/lib/am/check2.am index 19aef6376..a9a4a477f 100644 --- a/lib/am/check2.am +++ b/lib/am/check2.am @@ -37,10 +37,12 @@ endif %?FIRST% @$(call am__runtest,%PFX%) ## If no programs are built in this package, then this rule is removed -## at automake time. Otherwise, %am__EXEEXT% expands to a configure time -## conditional, true if $(EXEEXT) is nonempty, thus this rule does not -## conflict with the previous one. -if %am__EXEEXT% +## at automake time. +if %HANDLE-EXEEXT% +## FIXME: spurious indentnation to avoid Automake thinking this is an +## automake conditional. + ifdef EXEEXT %.log %.trs: %%EXT%$(EXEEXT) @$(call am__runtest,%PFX%) -endif %am__EXEEXT% + endif +endif %HANDLE-EXEEXT% |