aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-08-02 08:35:51 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-08-02 08:35:51 +0000
commit4b330699f819a81d8e34d471225143ffeb321855 (patch)
tree3794bbf32b858fa79c3e362a4b95adc8a7863010 /sbin
parentcd155b56033ab2693464bdade23e2ccd623e9936 (diff)
downloadsrc-4b330699f819a81d8e34d471225143ffeb321855.tar.gz
src-4b330699f819a81d8e34d471225143ffeb321855.zip
Convert traditional ${MK_TESTS} conditional idiom for including test
directories to SUBDIR.${MK_TESTS} idiom This is being done to pave the way for future work (and homogenity) in ^/projects/make-check-sandbox . No functional change intended. MFC after: 1 weeks
Notes
Notes: svn path=/head/; revision=321912
Diffstat (limited to 'sbin')
-rw-r--r--sbin/devd/Makefile4
-rw-r--r--sbin/dhclient/Makefile4
-rw-r--r--sbin/growfs/Makefile4
-rw-r--r--sbin/ifconfig/Makefile4
-rw-r--r--sbin/mdconfig/Makefile4
-rw-r--r--sbin/pfctl/Makefile4
6 files changed, 6 insertions, 18 deletions
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 4e5fa4710e03..3701e6e9457d 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -18,8 +18,6 @@ CFLAGS+=-I. -I${.CURDIR}
CLEANFILES= y.output
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 2e9881f191cd..f4a9a331ca66 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -46,8 +46,6 @@ LIBADD= util
WARNS?= 2
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index bf3a8f2358e3..1adb0199e735 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -22,8 +22,6 @@ NO_WCAST_ALIGN= yes
LIBADD= util
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 543392600395..567734781b35 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -67,8 +67,6 @@ MAN= ifconfig.8
CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
WARNS?= 2
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 21db48a5ef1e..eeb2a93d2023 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -8,8 +8,6 @@ MAN= mdconfig.8
LIBADD= util geom
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index 2e9c17a05548..f182dde1790e 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -31,8 +31,6 @@ YFLAGS=
LIBADD= m md
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>