Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests make(1): clean up cleaning of test f...



details:   https://anonhg.NetBSD.org/src/rev/30e1eb1c1879
branches:  trunk
changeset: 974914:30e1eb1c1879
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Aug 16 17:58:48 2020 +0000

description:
make(1): clean up cleaning of test files

The variables CLEANFILES and CLEANDIRS are not supposed to be
user-settable, thus use a simple "=" instead of "+=".

Since CLEANDIRS is always set, there is no point in making the rm
conditional.

diffstat:

 usr.bin/make/unit-tests/Makefile |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 56cdf22b6ca8 -r 30e1eb1c1879 usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile  Sun Aug 16 16:48:08 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile  Sun Aug 16 17:58:48 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2020/08/16 12:30:45 rillig Exp $
+# $NetBSD: Makefile,v 1.95 2020/08/16 17:58:48 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -345,16 +345,14 @@
 
 all: ${OUTFILES}
 
-CLEANFILES+=           *.rawout *.out *.status *.tmp *.core *.tmp
+CLEANFILES=            *.rawout *.out *.status *.tmp *.core *.tmp
 CLEANFILES+=           obj*.[och] lib*.a       # posix1.mk
 CLEANFILES+=           issue* .[ab]*           # suffixes.mk
-CLEANRECURSIVE+=       dir dummy               # posix1.mk
+CLEANDIRS=             dir dummy               # posix1.mk
 
 clean:
        rm -f ${CLEANFILES}
-.if !empty(CLEANRECURSIVE)
-       rm -rf ${CLEANRECURSIVE}
-.endif
+       rm -rf ${CLEANDIRS}
 
 TEST_MAKE?=    ${.MAKE}
 TOOL_SED?=     sed



Home | Main Index | Thread Index | Old Index