aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJulio Merino <jmmv@FreeBSD.org>2013-11-08 14:24:47 +0000
committerJulio Merino <jmmv@FreeBSD.org>2013-11-08 14:24:47 +0000
commite01d128a428f2d8d387a4eff6b3ec602423a1b3a (patch)
treeb24803c1f4d0f4f5e9536ebe8ff71f4dacf44b63 /usr.bin
parentee695f67a6efc46af7ee0edb5882abfd2f2feda9 (diff)
downloadsrc-e01d128a428f2d8d387a4eff6b3ec602423a1b3a.tar.gz
src-e01d128a428f2d8d387a4eff6b3ec602423a1b3a.zip
Subsume the functionality of MK_ATF into MK_TESTS.
There is no reason to keep the two knobs separate: if tests are enabled, the ATF libraries are required; and if tests are disabled, the ATF libraries are not necessary. Keeping the two just serves to complicate the build. Reviewed by: freebsd-testing Approved by: rpaulo (mentor)
Notes
Notes: svn path=/head/; revision=257850
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 92958ae55f12..cbee3fb2b056 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -210,10 +210,6 @@ SUBDIR= alias \
SUBDIR+= at
.endif
-.if ${MK_ATF} != "no"
-_atf= atf
-.endif
-
.if ${MK_ATM} != "no"
SUBDIR+= atm
.endif
@@ -332,6 +328,10 @@ SUBDIR+= vacation
SUBDIR+= telnet
.endif
+.if ${MK_TESTS} != "no"
+_atf= atf
+.endif
+
.if ${MK_TEXTPROC} != "no"
SUBDIR+= checknr
SUBDIR+= colcrt