git: a64729f5077d - main - Update Makefile.depend files

From: Simon J. Gerraty <sjg_at_FreeBSD.org>
Date: Mon, 14 Oct 2024 17:27:39 UTC
The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=a64729f5077d77e13b9497cb33ecb3c82e606ee8

commit a64729f5077d77e13b9497cb33ecb3c82e606ee8
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2024-10-14 17:24:54 +0000
Commit:     Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2024-10-14 17:26:17 +0000

    Update Makefile.depend files
    
    After building packages we have a number of new
    and updated Makefile.depend files
    
    Reviewed by:    stevek
---
 bin/nproc/Makefile.depend                          | 14 ++++++++++
 bin/pkill/tests/Makefile.depend                    |  3 ++
 bin/sh/Makefile.depend                             |  1 -
 bin/sleep/Makefile.depend                          |  1 +
 include/Makefile.depend                            |  2 --
 include/ssp/Makefile.depend                        | 10 +++++++
 lib/atf/libatf-c++/tests/Makefile.depend           |  1 -
 lib/atf/libatf-c/tests/Makefile.depend             |  1 -
 lib/geom/union/Makefile.depend                     |  2 --
 lib/libbe/tests/Makefile.depend                    | 17 ++++++++++++
 lib/libbsddialog/Makefile.depend                   |  1 -
 lib/libc++experimental/Makefile.depend             |  3 --
 lib/libc/Makefile.depend                           |  1 -
 lib/libcbor/Makefile.depend                        | 16 +++++++++++
 lib/libdl/Makefile.depend                          |  1 +
 lib/libedit/Makefile.depend                        |  1 -
 lib/libfido2/Makefile.depend                       | 17 ++++++++++++
 lib/libgcc_s/Makefile.depend                       |  1 -
 lib/libipt/Makefile.depend                         | 15 ++++++++++
 lib/liblzma/Makefile.depend                        |  1 -
 lib/libmagic/Makefile.depend                       |  1 +
 lib/libnetmap/Makefile.depend                      | 15 ++++++++++
 lib/libnvmf/Makefile.depend                        | 12 ++++++++
 lib/libregex/Makefile.depend                       |  1 -
 lib/librt/Makefile.depend                          |  1 +
 lib/libsmutil/Makefile.depend                      |  1 +
 lib/libssp/Makefile.depend                         |  2 ++
 lib/libsys/Makefile.depend                         |  1 -
 lib/libthr/Makefile.depend                         |  1 -
 lib/libxo/encoder/csv/Makefile.depend              |  2 ++
 lib/libxo/tests/Makefile.depend                    |  5 +---
 lib/libxo/tests/encoder/Makefile.depend            |  4 +--
 lib/libz/Makefile.depend                           |  1 -
 lib/msun/Makefile.depend                           |  1 -
 lib/ncurses/form/Makefile.depend                   |  1 +
 lib/ncurses/ncurses/Makefile.depend                |  1 -
 lib/ncurses/panel/Makefile.depend                  |  1 -
 lib/ncurses/tinfo/Makefile.depend                  |  1 -
 lib/ofed/libirdma/Makefile.depend                  | 18 ++++++++++++
 libexec/atf/atf-pytest-wrapper/Makefile.depend     | 18 ++++++++++++
 libexec/nuageinit/Makefile.depend                  | 10 +++++++
 libexec/nuageinit/tests/Makefile.depend            | 10 +++++++
 libexec/rtld-elf/Makefile.depend                   |  1 +
 sbin/bectl/Makefile.depend                         | 13 +--------
 sbin/bectl/tests/Makefile.depend                   | 10 +++++++
 sbin/camcontrol/Makefile.depend                    |  1 +
 sbin/geom/Makefile.depend                          |  2 --
 sbin/md5/Makefile.depend                           |  1 +
 sbin/md5/tests/Makefile.depend                     | 10 +++++++
 sbin/nvmecontrol/Makefile.depend                   |  1 +
 sbin/nvmecontrol/tests/Makefile.depend             | 10 +++++++
 sbin/pfctl/tests/Makefile.depend                   |  2 --
 sbin/pflowctl/Makefile.depend                      | 15 ++++++++++
 sbin/ping/tests/Makefile.depend                    | 15 ++++++++++
 sbin/route/Makefile.depend                         |  1 +
 sbin/route/tests/Makefile.depend                   | 10 +++++++
 secure/lib/libssl/Makefile.depend                  |  1 -
 targets/pseudo/bootstrap-packages/Makefile.depend  |  5 ++++
 usr.bin/asa/tests/Makefile.depend                  | 10 +++++++
 usr.bin/awk/tests/bugs-fixed/Makefile.depend       | 10 +++++++
 usr.bin/awk/tests/netbsd/Makefile.depend           | 10 +++++++
 usr.bin/bsdcat/tests/Makefile.depend               |  9 ------
 usr.bin/caesar/Makefile.depend                     |  1 -
 usr.bin/clang/clang-tblgen/Makefile.depend.host    |  1 +
 usr.bin/clang/lldb-server/Makefile.depend          | 32 ++++++++++++++++++++++
 usr.bin/clang/llvm-min-tblgen/Makefile.depend.host |  1 +
 usr.bin/clang/llvm-tblgen/Makefile.depend.host     |  1 +
 usr.bin/cpio/tests/Makefile.depend                 |  9 ------
 usr.bin/dc/tests/Makefile.depend                   | 10 +++++++
 usr.bin/du/Makefile.depend                         |  1 +
 usr.bin/env/tests/Makefile.depend                  | 10 +++++++
 usr.bin/file/tests/Makefile.depend                 | 10 +++++++
 usr.bin/gh-bc/tests/Makefile.depend                | 10 +++++++
 usr.bin/grdc/Makefile.depend                       |  4 +--
 usr.bin/head/tests/Makefile.depend                 | 10 +++++++
 usr.bin/kyua/Makefile.depend                       | 23 ++++++++++++++++
 usr.bin/locale/tests/Makefile.depend               | 10 +++++++
 usr.bin/lockf/tests/Makefile.depend                | 10 +++++++
 usr.bin/lorder/tests/Makefile.depend               | 10 +++++++
 usr.bin/mktemp/tests/Makefile.depend               | 10 +++++++
 usr.bin/ncurses/Makefile.depend                    | 17 ++++++++++++
 usr.bin/objcopy/Makefile.depend                    |  7 -----
 usr.bin/ofed/librdmacm/mckey/Makefile.depend       | 24 ++++++++++++++++
 usr.bin/ofed/librdmacm/rping/Makefile.depend       | 23 ++++++++++++++++
 usr.bin/ofed/librdmacm/ucmatose/Makefile.depend    | 23 ++++++++++++++++
 usr.bin/ofed/librdmacm/udaddy/Makefile.depend      | 23 ++++++++++++++++
 usr.bin/patch/tests/Makefile.depend                | 10 +++++++
 usr.bin/pom/Makefile.depend                        |  2 +-
 usr.bin/printenv/tests/Makefile.depend             | 10 +++++++
 usr.bin/seq/tests/Makefile.depend                  | 10 +++++++
 usr.bin/sort/tests/Makefile.depend                 | 10 +++++++
 usr.bin/split/tests/Makefile.depend                | 10 +++++++
 usr.bin/tar/tests/Makefile.depend                  |  9 ------
 usr.bin/tftp/tests/Makefile.depend                 | 10 +++++++
 usr.bin/touch/tests/Makefile.depend                | 10 +++++++
 usr.bin/tsort/tests/Makefile.depend                | 10 +++++++
 usr.bin/unifdef/tests/Makefile.depend              | 10 +++++++
 usr.bin/unzip/tests/Makefile.depend                |  9 ------
 usr.bin/vmstat/tests/Makefile.depend               | 10 +++++++
 usr.bin/wc/tests/Makefile.depend                   | 10 +++++++
 usr.sbin/apmd/Makefile.depend                      |  2 ++
 usr.sbin/bhyve/gdb/Makefile.depend                 | 10 +++++++
 usr.sbin/bhyveload/Makefile.depend                 |  2 ++
 .../bluetooth/bluetooth-config/Makefile.depend     | 10 +++++++
 usr.sbin/bsdinstall/distextract/Makefile.depend    |  2 +-
 usr.sbin/bsdinstall/distfetch/Makefile.depend      |  2 +-
 usr.sbin/bsdinstall/partedit/Makefile.depend       |  2 +-
 usr.sbin/bsdinstall/runconsoles/Makefile.depend    | 15 ++++++++++
 usr.sbin/certctl/Makefile.depend                   | 10 +++++++
 usr.sbin/ctladm/tests/Makefile.depend              | 10 +++++++
 usr.sbin/daemon/tests/Makefile.depend              | 10 +++++++
 usr.sbin/efibootmgr/Makefile.depend                | 17 ++++++++++++
 usr.sbin/efitable/Makefile.depend                  | 16 +++++++++++
 usr.sbin/efiwake/Makefile.depend                   | 15 ++++++++++
 usr.sbin/fwget/Makefile.depend                     | 10 +++++++
 usr.sbin/fwget/pci/Makefile.depend                 | 10 +++++++
 usr.sbin/gssd/Makefile.depend                      |  1 +
 usr.sbin/jail/tests/Makefile.depend                | 10 +++++++
 usr.sbin/kldxref/Makefile.depend                   |  1 +
 usr.sbin/ntp/libntp/Makefile.depend                |  1 +
 usr.sbin/ntp/libntpevent/Makefile.depend           |  1 +
 usr.sbin/ntp/libparse/Makefile.depend              |  1 +
 usr.sbin/nvmfd/Makefile.depend                     | 20 ++++++++++++++
 usr.sbin/pnfsdscopymr/Makefile.depend              | 16 +++++++++++
 usr.sbin/pnfsdsfile/Makefile.depend                | 15 ++++++++++
 usr.sbin/pnfsdskill/Makefile.depend                | 15 ++++++++++
 usr.sbin/pw/tests/Makefile.depend                  |  2 --
 usr.sbin/valectl/Makefile.depend                   | 16 +++++++++++
 usr.sbin/wpa/src/crypto/Makefile.depend            |  1 +
 129 files changed, 909 insertions(+), 98 deletions(-)

diff --git a/bin/nproc/Makefile.depend b/bin/nproc/Makefile.depend
new file mode 100644
index 000000000000..93249906da4f
--- /dev/null
+++ b/bin/nproc/Makefile.depend
@@ -0,0 +1,14 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/bin/pkill/tests/Makefile.depend b/bin/pkill/tests/Makefile.depend
index 11aba52f82cf..8e1db63914e6 100644
--- a/bin/pkill/tests/Makefile.depend
+++ b/bin/pkill/tests/Makefile.depend
@@ -1,6 +1,9 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/bin/sh/Makefile.depend b/bin/sh/Makefile.depend
index 17be3d459f0c..9c93cdde3624 100644
--- a/bin/sh/Makefile.depend
+++ b/bin/sh/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libedit \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/bin/sleep/Makefile.depend b/bin/sleep/Makefile.depend
index 38d979787478..866f7ef5d25b 100644
--- a/bin/sleep/Makefile.depend
+++ b/bin/sleep/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	lib/libcapsicum \
 	lib/libcasper/libcasper \
 	lib/libcompiler_rt \
+	lib/msun \
 
 
 .include <dirdeps.mk>
diff --git a/include/Makefile.depend b/include/Makefile.depend
index 346d718d8511..d04576c4c409 100644
--- a/include/Makefile.depend
+++ b/include/Makefile.depend
@@ -2,8 +2,6 @@
 
 DIRDEPS = \
 	bin/sh.host \
-	usr.bin/awk.host \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/include/ssp/Makefile.depend b/include/ssp/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/include/ssp/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/atf/libatf-c++/tests/Makefile.depend b/lib/atf/libatf-c++/tests/Makefile.depend
index e9c46a0b722a..7886e7624456 100644
--- a/lib/atf/libatf-c++/tests/Makefile.depend
+++ b/lib/atf/libatf-c++/tests/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/lib/atf/libatf-c/tests/Makefile.depend b/lib/atf/libatf-c/tests/Makefile.depend
index 1af0c88e099c..462a1562f495 100644
--- a/lib/atf/libatf-c/tests/Makefile.depend
+++ b/lib/atf/libatf-c/tests/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/lib/geom/union/Makefile.depend b/lib/geom/union/Makefile.depend
index d07a313ea118..0dd05cace3c0 100644
--- a/lib/geom/union/Makefile.depend
+++ b/lib/geom/union/Makefile.depend
@@ -1,14 +1,12 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libgeom \
-	sbin/geom/core \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libbe/tests/Makefile.depend b/lib/libbe/tests/Makefile.depend
new file mode 100644
index 000000000000..670634e1722a
--- /dev/null
+++ b/lib/libbe/tests/Makefile.depend
@@ -0,0 +1,17 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	cddl/lib/libnvpair \
+	cddl/lib/libspl \
+	cddl/lib/libzfs \
+	lib/${CSU_DIR} \
+	lib/libbe \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libbsddialog/Makefile.depend b/lib/libbsddialog/Makefile.depend
index e61d93449db1..04dbb4f44313 100644
--- a/lib/libbsddialog/Makefile.depend
+++ b/lib/libbsddialog/Makefile.depend
@@ -6,7 +6,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/ncurses/form \
 	lib/ncurses/ncurses \
 	lib/ncurses/tinfo \
 
diff --git a/lib/libc++experimental/Makefile.depend b/lib/libc++experimental/Makefile.depend
index ecc8fe860f5e..11aba52f82cf 100644
--- a/lib/libc++experimental/Makefile.depend
+++ b/lib/libc++experimental/Makefile.depend
@@ -1,9 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/msun \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend
index fc708c6794b9..d2cb630c1bc2 100644
--- a/lib/libc/Makefile.depend
+++ b/lib/libc/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libcompiler_rt \
 	lib/libsys \
-	usr.bin/awk.host \
 	usr.bin/yacc.host \
 
 
diff --git a/lib/libcbor/Makefile.depend b/lib/libcbor/Makefile.depend
new file mode 100644
index 000000000000..9add648af17b
--- /dev/null
+++ b/lib/libcbor/Makefile.depend
@@ -0,0 +1,16 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libdl/Makefile.depend b/lib/libdl/Makefile.depend
index 6ef78fac5cbf..e0d18fcef3a4 100644
--- a/lib/libdl/Makefile.depend
+++ b/lib/libdl/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libsys \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index b9e2f5783b84..c6788a7857d3 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/ncurses/tinfo \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libfido2/Makefile.depend b/lib/libfido2/Makefile.depend
new file mode 100644
index 000000000000..3c28a8a51e2d
--- /dev/null
+++ b/lib/libfido2/Makefile.depend
@@ -0,0 +1,17 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libz \
+	secure/lib/libcrypto \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libgcc_s/Makefile.depend b/lib/libgcc_s/Makefile.depend
index ae1125555d77..77f8f90c31c3 100644
--- a/lib/libgcc_s/Makefile.depend
+++ b/lib/libgcc_s/Makefile.depend
@@ -5,7 +5,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libipt/Makefile.depend b/lib/libipt/Makefile.depend
new file mode 100644
index 000000000000..6ef78fac5cbf
--- /dev/null
+++ b/lib/libipt/Makefile.depend
@@ -0,0 +1,15 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index b5c5616d53c7..c6f50333f539 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libmd \
 	lib/libthr \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libmagic/Makefile.depend b/lib/libmagic/Makefile.depend
index 23d04fd83cf1..7bd9e2ca9bef 100644
--- a/lib/libmagic/Makefile.depend
+++ b/lib/libmagic/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libmagic.host \
 	lib/libz \
+	lib/msun \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libnetmap/Makefile.depend b/lib/libnetmap/Makefile.depend
new file mode 100644
index 000000000000..6ef78fac5cbf
--- /dev/null
+++ b/lib/libnetmap/Makefile.depend
@@ -0,0 +1,15 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libnvmf/Makefile.depend b/lib/libnvmf/Makefile.depend
new file mode 100644
index 000000000000..15a1f9c07f7c
--- /dev/null
+++ b/lib/libnvmf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libregex/Makefile.depend b/lib/libregex/Makefile.depend
index 40575a605e97..6ef78fac5cbf 100644
--- a/lib/libregex/Makefile.depend
+++ b/lib/libregex/Makefile.depend
@@ -6,7 +6,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend
index 577dc5747f1e..9ae14bd71d4f 100644
--- a/lib/librt/Makefile.depend
+++ b/lib/librt/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libsys \
 	lib/libthr \
 
 
diff --git a/lib/libsmutil/Makefile.depend b/lib/libsmutil/Makefile.depend
index f2b0559818dd..f527c2585bed 100644
--- a/lib/libsmutil/Makefile.depend
+++ b/lib/libsmutil/Makefile.depend
@@ -4,6 +4,7 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libssp/Makefile.depend b/lib/libssp/Makefile.depend
index 6ef78fac5cbf..9e22de8ed182 100644
--- a/lib/libssp/Makefile.depend
+++ b/lib/libssp/Makefile.depend
@@ -2,10 +2,12 @@
 
 DIRDEPS = \
 	include \
+	include/ssp \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libsys \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libsys/Makefile.depend b/lib/libsys/Makefile.depend
index b623a86fc1ce..fcba9c64f270 100644
--- a/lib/libsys/Makefile.depend
+++ b/lib/libsys/Makefile.depend
@@ -5,7 +5,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libcompiler_rt \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index 2f0697372a4a..e0d18fcef3a4 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libsys \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libxo/encoder/csv/Makefile.depend b/lib/libxo/encoder/csv/Makefile.depend
index 6ef78fac5cbf..b915f0b12d3b 100644
--- a/lib/libxo/encoder/csv/Makefile.depend
+++ b/lib/libxo/encoder/csv/Makefile.depend
@@ -6,6 +6,8 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libutil \
+	lib/libxo/libxo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libxo/tests/Makefile.depend b/lib/libxo/tests/Makefile.depend
index 1032566579a2..5d2f1f63e4fc 100644
--- a/lib/libxo/tests/Makefile.depend
+++ b/lib/libxo/tests/Makefile.depend
@@ -1,14 +1,11 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libutil \
-	lib/libxo \
+	lib/libxo/libxo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libxo/tests/encoder/Makefile.depend b/lib/libxo/tests/encoder/Makefile.depend
index 07e2f00360c2..b95024e29443 100644
--- a/lib/libxo/tests/encoder/Makefile.depend
+++ b/lib/libxo/tests/encoder/Makefile.depend
@@ -1,12 +1,12 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libxo \
+	lib/libxo/libxo \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend
index 40575a605e97..6ef78fac5cbf 100644
--- a/lib/libz/Makefile.depend
+++ b/lib/libz/Makefile.depend
@@ -6,7 +6,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend
index 40575a605e97..6ef78fac5cbf 100644
--- a/lib/msun/Makefile.depend
+++ b/lib/msun/Makefile.depend
@@ -6,7 +6,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index 04dbb4f44313..534afd77673d 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -1,6 +1,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	bin/sh.host \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index b9e2f5783b84..c6788a7857d3 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/ncurses/tinfo \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index bafa0452da91..534afd77673d 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/ncurses/ncurses \
 	lib/ncurses/tinfo \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ncurses/tinfo/Makefile.depend b/lib/ncurses/tinfo/Makefile.depend
index 2be5fb18fb00..996a149f6041 100644
--- a/lib/ncurses/tinfo/Makefile.depend
+++ b/lib/ncurses/tinfo/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/ncurses/tinfo.host \
-	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/ofed/libirdma/Makefile.depend b/lib/ofed/libirdma/Makefile.depend
new file mode 100644
index 000000000000..a13ef992ecf9
--- /dev/null
+++ b/lib/ofed/libirdma/Makefile.depend
@@ -0,0 +1,18 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libthr \
+	lib/ofed/include \
+	lib/ofed/libibverbs \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/libexec/atf/atf-pytest-wrapper/Makefile.depend b/libexec/atf/atf-pytest-wrapper/Makefile.depend
new file mode 100644
index 000000000000..76a8d2cdc8ca
--- /dev/null
+++ b/libexec/atf/atf-pytest-wrapper/Makefile.depend
@@ -0,0 +1,18 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libcxxrt \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/libexec/nuageinit/Makefile.depend b/libexec/nuageinit/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/libexec/nuageinit/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/libexec/nuageinit/tests/Makefile.depend b/libexec/nuageinit/tests/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/libexec/nuageinit/tests/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/libexec/rtld-elf/Makefile.depend b/libexec/rtld-elf/Makefile.depend
index af61cd6d0584..bcfe960e8abe 100644
--- a/libexec/rtld-elf/Makefile.depend
+++ b/libexec/rtld-elf/Makefile.depend
@@ -2,6 +2,7 @@
 
 DIRDEPS = \
 	include \
+	include/ssp \
 	include/xlocale \
 	lib/libc \
 	lib/libcompiler_rt \
diff --git a/sbin/bectl/Makefile.depend b/sbin/bectl/Makefile.depend
index f04ca630e059..bcc4f32f88da 100644
--- a/sbin/bectl/Makefile.depend
+++ b/sbin/bectl/Makefile.depend
@@ -1,28 +1,17 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	cddl/lib/libavl \
 	cddl/lib/libnvpair \
 	cddl/lib/libspl \
-	cddl/lib/libumem \
-	cddl/lib/libuutil \
-	cddl/lib/libzfs \
-	cddl/lib/libzfs_core \
+	cddl/lib/libzfsbootenv \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libbe \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libexpat \
-	lib/libgeom \
 	lib/libjail \
-	lib/libmd \
-	lib/libsbuf \
-	lib/libthr \
 	lib/libutil \
-	lib/libz \
-	lib/msun \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/bectl/tests/Makefile.depend b/sbin/bectl/tests/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/sbin/bectl/tests/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/camcontrol/Makefile.depend b/sbin/camcontrol/Makefile.depend
index 0ef6390836dd..bef65a3c03d5 100644
--- a/sbin/camcontrol/Makefile.depend
+++ b/sbin/camcontrol/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcam \
 	lib/libcompiler_rt \
+	lib/libnvmf \
 	lib/libsbuf \
 	lib/libutil \
 
diff --git a/sbin/geom/Makefile.depend b/sbin/geom/Makefile.depend
index 082d59a0b0f6..08cfc713d335 100644
--- a/sbin/geom/Makefile.depend
+++ b/sbin/geom/Makefile.depend
@@ -6,9 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libexpat \
 	lib/libgeom \
-	lib/libsbuf \
 	lib/libutil \
 
 
diff --git a/sbin/md5/Makefile.depend b/sbin/md5/Makefile.depend
index e442dca35596..61733f6b057b 100644
--- a/sbin/md5/Makefile.depend
+++ b/sbin/md5/Makefile.depend
@@ -7,6 +7,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcapsicum \
 	lib/libcasper/libcasper \
+	lib/libcasper/services/cap_fileargs \
 	lib/libcompiler_rt \
 	lib/libmd \
 
diff --git a/sbin/md5/tests/Makefile.depend b/sbin/md5/tests/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/sbin/md5/tests/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/nvmecontrol/Makefile.depend b/sbin/nvmecontrol/Makefile.depend
index 678747db6f2c..4eaed14a78cc 100644
--- a/sbin/nvmecontrol/Makefile.depend
+++ b/sbin/nvmecontrol/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libnvmf \
 	lib/libutil \
 
 
diff --git a/sbin/nvmecontrol/tests/Makefile.depend b/sbin/nvmecontrol/tests/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/sbin/nvmecontrol/tests/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/pfctl/tests/Makefile.depend b/sbin/pfctl/tests/Makefile.depend
index 74196cedd525..a59dba5bf1aa 100644
--- a/sbin/pfctl/tests/Makefile.depend
+++ b/sbin/pfctl/tests/Makefile.depend
@@ -1,8 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	include \
-	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/atf/libatf-c \
 	lib/libc \
diff --git a/sbin/pflowctl/Makefile.depend b/sbin/pflowctl/Makefile.depend
new file mode 100644
index 000000000000..6ef78fac5cbf
--- /dev/null
+++ b/sbin/pflowctl/Makefile.depend
@@ -0,0 +1,15 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/ping/tests/Makefile.depend b/sbin/ping/tests/Makefile.depend
new file mode 100644
index 000000000000..b372e6d58e9f
--- /dev/null
+++ b/sbin/ping/tests/Makefile.depend
@@ -0,0 +1,15 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/libc \
+	lib/libcompiler_rt \
+	sbin/ping \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/route/Makefile.depend b/sbin/route/Makefile.depend
index 344a5d0e9310..672ec75190c6 100644
--- a/sbin/route/Makefile.depend
*** 1319 LINES SKIPPED ***