* lib/am/serial-tests.am: Adjust to use the "ifeq" built-in and the internal variable '$(am.conf.handle-exeext)' instead of the transform '%?HANDLE-EXEEXT%'.
Signed-off-by: Stefano Lattarini <[email protected]> --- automake.in | 4 +--- lib/am/serial-tests.am | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/automake.in b/automake.in index f96f21c..4799dd6 100644 --- a/automake.in +++ b/automake.in @@ -4105,9 +4105,7 @@ sub handle_tests $output_rules .= file_contents ('color-tests', new Automake::Location); if (option 'serial-tests') { - $output_rules .= - file_contents ('serial-tests', new Automake::Location, - CHECK_DEPS => "@check"); + almost_verbatim ('serial-tests'); } else { diff --git a/lib/am/serial-tests.am b/lib/am/serial-tests.am index 4a27fca..592a796 100644 --- a/lib/am/serial-tests.am +++ b/lib/am/serial-tests.am @@ -16,15 +16,15 @@ ## Obsolescent serial testsuite driver. -if %?HANDLE-EXEEXT% +ifeq ($(am.conf.handle-exeext),yes) ## This is suboptimal, but we need to preserve the order of $(TESTS). am__check_cook_with_exeext_1 = \ $(if $(filter $(am.all-progs), $1), $1$(EXEEXT), $1) am__check_cook_with_exeext = $(strip \ $(if $(EXEEXT), $(foreach t, $1, $(call $(0)_1, $t)), $1)) -else !%?HANDLE-EXEEXT% +else am__check_cook_with_exeext = $(strip $1) -endif !%?HANDLE-EXEEXT% +endif # TESTS can contain compiled programs, in which case we might have # to account for $(EXEEXT) appending. For matching purposes, we -- 1.7.12.rc0
