summaryrefslogtreecommitdiff
path: root/lib/am
diff options
context:
space:
mode:
Diffstat (limited to 'lib/am')
-rw-r--r--lib/am/check.am4
-rw-r--r--lib/am/progs.am9
2 files changed, 4 insertions, 9 deletions
diff --git a/lib/am/check.am b/lib/am/check.am
index f0c9ddfbe..eca793582 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -405,8 +405,8 @@ RECHECK_LOGS = $(TEST_LOGS)
## ------------------------------------------ ##
check-TESTS: %CHECK_DEPS%
- @list='$(RECHECK_LOGS)'; $(am__rm_f) $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; $(am__rm_f) $$list
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
## We always have to remove $(TEST_SUITE_LOG), to ensure its rule is run
## in any case even in lazy mode: otherwise, if no test needs rerunning,
## or a prior run plus reruns all happen within the same timestamp (can
diff --git a/lib/am/progs.am b/lib/am/progs.am
index 0b74cca2e..e665a1f51 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -114,13 +114,8 @@ clean-%DIR%PROGRAMS:
## Cleaning the '_libs/' or '.libs/' directory is done from clean-libtool.
## FIXME: In the future (i.e., when it works) it would be nice to delegate
## this task to "libtool --mode=clean".
-?LIBTOOL? @list='$(%DIR%_PROGRAMS)'; test -n "$$list" || exit 0; \
-?LIBTOOL? echo " rm -f" $$list; \
-?LIBTOOL? rm -f $$list || exit $$?; \
-?LIBTOOL? test -n "$(EXEEXT)" || exit 0; \
-?LIBTOOL? list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-?LIBTOOL? echo " rm -f" $$list; \
-?LIBTOOL? rm -f $$list
+?LIBTOOL? $(am__rm_f) $(%DIR%_PROGRAMS)
+?LIBTOOL? test -z "$(EXEEXT)" || $(am__rm_f) $(%DIR%_PROGRAMS:$(EXEEXT)=)
## ---------- ##