summaryrefslogtreecommitdiffstats
path: root/targets
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-12-01 05:22:10 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-12-01 05:22:10 +0000
commit3ed6ae60128e473ae6df6eecc77fb97509dd1078 (patch)
tree03629368c2e51c535e10191cd7b3ccf40f18aa96 /targets
parent01201993d3a1c782b9e2728f35eef79306390061 (diff)
downloadFreeBSD-src-3ed6ae60128e473ae6df6eecc77fb97509dd1078.zip
FreeBSD-src-3ed6ae60128e473ae6df6eecc77fb97509dd1078.tar.gz
META MODE: Fix userland/cddl.
MK_CTF controls whether ctfmerge is ran against the binaries, not whether CTF tools should be built. Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'targets')
-rw-r--r--targets/pseudo/userland/cddl/Makefile.depend11
1 files changed, 4 insertions, 7 deletions
diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend
index 00524e9..f1224a2 100644
--- a/targets/pseudo/userland/cddl/Makefile.depend
+++ b/targets/pseudo/userland/cddl/Makefile.depend
@@ -9,19 +9,17 @@
DIRDEPS = \
cddl/lib/drti \
cddl/lib/libavl \
+ cddl/lib/libctf \
+ cddl/lib/libdtrace \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libuutil \
-
-
-DIRDEPS.CTF = \
- cddl/lib/libctf \
cddl/usr.bin/ctfconvert \
cddl/usr.bin/ctfdump \
cddl/usr.bin/ctfmerge \
- cddl/lib/libdtrace \
cddl/usr.sbin/dtrace \
cddl/usr.sbin/dtruss \
+ cddl/usr.sbin/lockstat \
DIRDEPS.ZFS = \
@@ -33,12 +31,11 @@ DIRDEPS.ZFS = \
cddl/usr.bin/zinject \
cddl/usr.bin/zstreamdump \
cddl/usr.bin/ztest \
- cddl/usr.sbin/lockstat \
cddl/usr.sbin/zdb \
cddl/usr.sbin/zhack \
-.for O in CTF ZFS
+.for O in ZFS
.if ${MK_$O} == "yes"
DIRDEPS+= ${DIRDEPS.$O}
.endif
OpenPOWER on IntegriCloud