aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-12-02 00:49:45 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-12-02 00:49:45 +0000
commita9dfc956d6e526da7e2d0207ad0b0c497764c3c4 (patch)
treed98aa656ec9c337ee455e71c85d01b3ebed5c1cf
parented8addefb28e2d327db3b16123841165001f0192 (diff)
downloadsrc-a9dfc956d6e526da7e2d0207ad0b0c497764c3c4.tar.gz
src-a9dfc956d6e526da7e2d0207ad0b0c497764c3c4.zip
Fully connect cddl/usr.sbin/plockstat.
There seems to be no reason to keep this so private. Also add missing optional MK_CDDL files. Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=291627
-rw-r--r--cddl/usr.sbin/Makefile2
-rw-r--r--cddl/usr.sbin/plockstat/Makefile.depend27
-rw-r--r--targets/pseudo/userland/cddl/Makefile.depend1
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc4
4 files changed, 32 insertions, 2 deletions
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 31b55b6c4196..3610c4e337eb 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -25,10 +25,8 @@ _zhack= zhack
_dtrace= dtrace
_dtruss= dtruss
_lockstat= lockstat
-.if defined(WITH_PLOCKSTAT)
_plockstat= plockstat
.endif
-.endif
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
_dtrace= dtrace
diff --git a/cddl/usr.sbin/plockstat/Makefile.depend b/cddl/usr.sbin/plockstat/Makefile.depend
new file mode 100644
index 000000000000..819706986006
--- /dev/null
+++ b/cddl/usr.sbin/plockstat/Makefile.depend
@@ -0,0 +1,27 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ cddl/lib/libctf \
+ cddl/lib/libdtrace \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ lib/libcxxrt \
+ lib/libelf \
+ lib/libproc \
+ lib/librtld_db \
+ lib/libthr \
+ lib/libutil \
+ lib/libz \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend
index f1224a2fba96..4747c0bf4407 100644
--- a/targets/pseudo/userland/cddl/Makefile.depend
+++ b/targets/pseudo/userland/cddl/Makefile.depend
@@ -20,6 +20,7 @@ DIRDEPS = \
cddl/usr.sbin/dtrace \
cddl/usr.sbin/dtruss \
cddl/usr.sbin/lockstat \
+ cddl/usr.sbin/plockstat \
DIRDEPS.ZFS = \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 61f879554f15..0e9c955d491a 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -978,7 +978,11 @@ OLD_FILES+=usr/lib32/libuutil_p.a
OLD_LIBS+=lib/libdtrace.so.2
OLD_FILES+=usr/sbin/dtrace
OLD_FILES+=usr/sbin/lockstat
+OLD_FILES+=usr/sbin/plockstat
OLD_FILES+=usr/share/man/man1/dtrace.1.gz
+OLD_FILES+=usr/share/man/man1/dtruss.1.gz
+OLD_FILES+=usr/share/man/man1/lockstat.1.gz
+OLD_FILES+=usr/share/man/man1/plockstat.1.gz
OLD_FILES+=usr/share/dtrace/disklatency
OLD_FILES+=usr/share/dtrace/disklatencycmd
OLD_FILES+=usr/share/dtrace/hotopen