diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-01-03 21:46:38 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-09 00:07:42 -0500 |
| commit | f15852df5f71631cfc4f03c0b8897b0a20fc79d3 (patch) | |
| tree | bc4eae3c0f0706a376378092d45494a13dfc7eff /lib/am/check.am | |
| parent | 2c0a22f9c7e05fac0c33e1e241bfc6e2d8df210b (diff) | |
| download | automake-f15852df5f71631cfc4f03c0b8897b0a20fc79d3.tar.gz | |
rm: convert more cases to am__rm_f
Fixes automake bug https://bugs.gnu.org/10828.
Clean up a few more cases where we were doing `test ... || rm ...` to
avoid calling `rm -f` without arguments by leveraging am__rm_f. These
were harder to find in the source due to their constructed nature.
The clean programs rules in particular were much more complicated than
they needed to be. This logic boiled down to two things: delete the
list of programs, and then delete the list without the exeext suffix,
but only if the list of programs is non-empty.
The check-TESTS rule was converted to am__rm_f, but a simplification
was missed where the $list variable is inlined.
* bin/automake.in: Delete test -z logic and always call am__rm_f.
* contrib/check-html.am: Use $(am__rm_f) helper.
* doc/automake.texi: Update examples to match current behavior.
* lib/am/check.am: Inline $list variable.
* lib/am/progs.am: Rewrite rule to use $(am__rm_f).
Diffstat (limited to 'lib/am/check.am')
| -rw-r--r-- | lib/am/check.am | 4 |
1 files changed, 2 insertions, 2 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 |