[ng] refactor: read 'serial-tests.am' more verbatim

* 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%'.
* automake.in (handle_tests): Use '&almost_verbatim' rather than
'&file_contents' to read and process 'serial-tests.am'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index f96f21ce6327dff3da144678d349b326578dee46..4799dd6907289e9b3230af7e3e5486ee68ffd973 100644 (file)
--- 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 4a27fcad0ba9727c26b53be593d077449fe8a080..592a796a124f309dee7ec5fafde0fa3c5343b89f 100644 (file)
--- 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