aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-12-01 05:22:10 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-12-01 05:22:10 +0000
commita0eb270b125e75d3e36c2533749c4c196d4dbc39 (patch)
tree03629368c2e51c535e10191cd7b3ccf40f18aa96
parent3bed45ab81b42ff4029368ec778cd8700723c535 (diff)
downloadsrc-a0eb270b125e75d3e36c2533749c4c196d4dbc39.tar.gz
src-a0eb270b125e75d3e36c2533749c4c196d4dbc39.zip
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
Notes
Notes: svn path=/head/; revision=291562
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile.depend2
-rw-r--r--cddl/usr.bin/ctfdump/Makefile.depend2
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile.depend3
-rw-r--r--cddl/usr.sbin/dtrace/Makefile.depend3
-rw-r--r--targets/pseudo/userland/cddl/Makefile.depend11
5 files changed, 4 insertions, 17 deletions
diff --git a/cddl/usr.bin/ctfconvert/Makefile.depend b/cddl/usr.bin/ctfconvert/Makefile.depend
index 5331c43050fe..9dafcb6af276 100644
--- a/cddl/usr.bin/ctfconvert/Makefile.depend
+++ b/cddl/usr.bin/ctfconvert/Makefile.depend
@@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libctf \
gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdwarf \
lib/libelf \
diff --git a/cddl/usr.bin/ctfdump/Makefile.depend b/cddl/usr.bin/ctfdump/Makefile.depend
index fcfe6acceeca..ff9d79528313 100644
--- a/cddl/usr.bin/ctfdump/Makefile.depend
+++ b/cddl/usr.bin/ctfdump/Makefile.depend
@@ -8,10 +8,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
- lib/libthr \
lib/libz \
diff --git a/cddl/usr.bin/ctfmerge/Makefile.depend b/cddl/usr.bin/ctfmerge/Makefile.depend
index 5331c43050fe..e94f8d4ba875 100644
--- a/cddl/usr.bin/ctfmerge/Makefile.depend
+++ b/cddl/usr.bin/ctfmerge/Makefile.depend
@@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- cddl/lib/libctf \
gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
- lib/libdwarf \
lib/libelf \
lib/libthr \
lib/libz \
diff --git a/cddl/usr.sbin/dtrace/Makefile.depend b/cddl/usr.sbin/dtrace/Makefile.depend
index 9971af124aba..819706986006 100644
--- a/cddl/usr.sbin/dtrace/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
@@ -18,9 +17,7 @@ DIRDEPS = \
lib/librtld_db \
lib/libthr \
lib/libutil \
- lib/liby \
lib/libz \
- usr.bin/lex/lib \
.include <dirdeps.mk>
diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend
index 00524e9f5281..f1224a2fba96 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