diff options
author | jmmv <jmmv@FreeBSD.org> | 2013-11-08 14:24:47 +0000 |
---|---|---|
committer | jmmv <jmmv@FreeBSD.org> | 2013-11-08 14:24:47 +0000 |
commit | 627bb4f0bd2020972732244313ae50700ad26af2 (patch) | |
tree | b24803c1f4d0f4f5e9536ebe8ff71f4dacf44b63 /share | |
parent | 74f0db8200d4bd28326cec2dad424441e91523ed (diff) | |
download | FreeBSD-src-627bb4f0bd2020972732244313ae50700ad26af2.zip FreeBSD-src-627bb4f0bd2020972732244313ae50700ad26af2.tar.gz |
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)
Diffstat (limited to 'share')
-rw-r--r-- | share/doc/Makefile | 2 | ||||
-rw-r--r-- | share/man/man1/Makefile | 2 | ||||
-rw-r--r-- | share/man/man4/Makefile | 2 | ||||
-rw-r--r-- | share/mk/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/share/doc/Makefile b/share/doc/Makefile index 1ec57e8..a4fe61d 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -9,7 +9,7 @@ SUBDIR= ${_IPv6} \ ${_llvm} \ ${_roffdocs} -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" _atf= atf .endif diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index 23bc1d8..97885a6 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -5,7 +5,7 @@ MAN= builtin.1 intro.1 -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc MAN+= atf-test-program.1 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index cdb1c48..bc26f13 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -829,7 +829,7 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc _atf_test_case.4= atf-test-case.4 diff --git a/share/mk/Makefile b/share/mk/Makefile index 2110b26..549f5ea 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -43,7 +43,7 @@ FILES= \ NO_OBJ= FILESDIR= ${BINDIR}/mk -.if ${MK_ATF} != "no" +.if ${MK_TESTS} != "no" FILES+= atf.test.mk .endif |