diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-08-02 08:38:36 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-08-02 08:38:36 +0000 |
| commit | 46b37aa2c4068c1a237b0a7e61b8c2f953b3708c (patch) | |
| tree | ac857a66eb2d6f1611fb8ccbaea90c2b45b04658 /bin | |
| parent | 8c09935728787235a761b6104c91ad6885ed4cd8 (diff) | |
| parent | 4b330699f819a81d8e34d471225143ffeb321855 (diff) | |
| download | src-46b37aa2c4068c1a237b0a7e61b8c2f953b3708c.tar.gz src-46b37aa2c4068c1a237b0a7e61b8c2f953b3708c.zip | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/cat/Makefile | 4 | ||||
| -rw-r--r-- | bin/date/Makefile | 4 | ||||
| -rw-r--r-- | bin/dd/Makefile | 4 | ||||
| -rw-r--r-- | bin/echo/Makefile | 4 | ||||
| -rw-r--r-- | bin/expr/Makefile | 4 | ||||
| -rw-r--r-- | bin/ln/Makefile | 4 | ||||
| -rw-r--r-- | bin/ls/Makefile | 4 | ||||
| -rw-r--r-- | bin/mv/Makefile | 4 | ||||
| -rw-r--r-- | bin/pax/Makefile | 4 | ||||
| -rw-r--r-- | bin/pkill/Makefile | 4 | ||||
| -rw-r--r-- | bin/sh/Makefile | 2 | ||||
| -rw-r--r-- | bin/sleep/Makefile | 4 | ||||
| -rw-r--r-- | bin/test/Makefile | 4 |
13 files changed, 13 insertions, 37 deletions
diff --git a/bin/cat/Makefile b/bin/cat/Makefile index 39aaeeb4a50f..328692b30cd8 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= cat -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/date/Makefile b/bin/date/Makefile index fd7e401aeb58..5e17c5826155 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -7,8 +7,6 @@ PACKAGE=runtime PROG= date SRCS= date.c netdate.c vary.c -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/dd/Makefile b/bin/dd/Makefile index df877c854f0f..d845951616ac 100644 --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -38,8 +38,6 @@ test: ${PROG} gen @rm -f gen 1M_zeroes* obs_zeroes -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/echo/Makefile b/bin/echo/Makefile index 4b5917d912eb..2f97ea6e97e1 100644 --- a/bin/echo/Makefile +++ b/bin/echo/Makefile @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= echo -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/expr/Makefile b/bin/expr/Makefile index 471c1c099479..622f420c32e1 100644 --- a/bin/expr/Makefile +++ b/bin/expr/Makefile @@ -12,8 +12,6 @@ CFLAGS+= -fwrapv NO_WMISSING_VARIABLE_DECLARATIONS= -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/ln/Makefile b/bin/ln/Makefile index 48ef284b4f1b..36afc57d8612 100644 --- a/bin/ln/Makefile +++ b/bin/ln/Makefile @@ -10,8 +10,6 @@ MAN= ln.1 symlink.7 LINKS= ${BINDIR}/ln ${BINDIR}/link MLINKS= ln.1 link.1 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/ls/Makefile b/bin/ls/Makefile index db3fae7eb232..1653d21b0d3e 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -14,8 +14,6 @@ CFLAGS+= -DCOLORLS LIBADD+= termcapw .endif -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/mv/Makefile b/bin/mv/Makefile index e82466be296c..f51e96c498ed 100644 --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= mv -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/pax/Makefile b/bin/pax/Makefile index 210137ba1abf..03ff95de3344 100644 --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -33,8 +33,6 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile index 302ac66e2b85..59ad1561f13f 100644 --- a/bin/pkill/Makefile +++ b/bin/pkill/Makefile @@ -19,8 +19,6 @@ MLINKS= pkill.1 pgrep.1 SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 62a74f80f79c..98c0caaf671e 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -65,6 +65,6 @@ token.h: mktokens sh ${.CURDIR}/mktokens HAS_TESTS= -SUBDIR.${MK_TESTS}+= tests +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile index 9575adf62a71..20a609a44054 100644 --- a/bin/sleep/Makefile +++ b/bin/sleep/Makefile @@ -6,8 +6,6 @@ PACKAGE=runtime PROG= sleep -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> diff --git a/bin/test/Makefile b/bin/test/Makefile index 5cd91ebb288d..001b811c00c9 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -8,8 +8,6 @@ PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> |