58 files changed, 10 insertions, 55 deletions

diff --git a/gnu/lib/libdialog/Makefile.depend b/gnu/lib/libdialog/Makefile.depend
index 796e9bf46bb61..4f075dab95e0e 100644
--- a/gnu/lib/libdialog/Makefile.depend
+++ b/gnu/lib/libdialog/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index 1fbfd7fffcf5e..5a788db1e041a 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -8,7 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libgomp/Makefile.depend b/gnu/lib/libgomp/Makefile.depend
index 71accaeebd526..59f451a660002 100644
--- a/gnu/lib/libgomp/Makefile.depend
+++ b/gnu/lib/libgomp/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile.depend b/gnu/lib/libreadline/readline/Makefile.depend
index 233a7c6cd0b81..c23402005508e 100644
--- a/gnu/lib/libreadline/readline/Makefile.depend
+++ b/gnu/lib/libreadline/readline/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libregex/Makefile.depend b/gnu/lib/libregex/Makefile.depend
index c64a40fd9bc11..aa86386d4c32f 100644
--- a/gnu/lib/libregex/Makefile.depend
+++ b/gnu/lib/libregex/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libstdc++/Makefile.depend b/gnu/lib/libstdc++/Makefile.depend
index e24c102fd2169..7155be6f266c6 100644
--- a/gnu/lib/libstdc++/Makefile.depend
+++ b/gnu/lib/libstdc++/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/msun \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libsupc++/Makefile.depend b/gnu/lib/libsupc++/Makefile.depend
index 1afbe8be911cf..dcb5bb9dea549 100644
--- a/gnu/lib/libsupc++/Makefile.depend
+++ b/gnu/lib/libsupc++/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
+	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile.depend b/gnu/usr.bin/binutils/addr2line/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile.depend
+++ b/gnu/usr.bin/binutils/addr2line/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/nm/Makefile.depend b/gnu/usr.bin/binutils/nm/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/nm/Makefile.depend
+++ b/gnu/usr.bin/binutils/nm/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile.depend b/gnu/usr.bin/binutils/objcopy/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile.depend
+++ b/gnu/usr.bin/binutils/objcopy/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/objdump/Makefile.depend b/gnu/usr.bin/binutils/objdump/Makefile.depend
index b21a71066e66c..ca80e98ef8592 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile.depend
+++ b/gnu/usr.bin/binutils/objdump/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/readelf/Makefile.depend b/gnu/usr.bin/binutils/readelf/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile.depend
+++ b/gnu/usr.bin/binutils/readelf/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/size/Makefile.depend b/gnu/usr.bin/binutils/size/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/size/Makefile.depend
+++ b/gnu/usr.bin/binutils/size/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/strings/Makefile.depend b/gnu/usr.bin/binutils/strings/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/strings/Makefile.depend
+++ b/gnu/usr.bin/binutils/strings/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/binutils/strip/Makefile.depend b/gnu/usr.bin/binutils/strip/Makefile.depend
index f720db2bf7fb8..4ed5ef1f4a472 100644
--- a/gnu/usr.bin/binutils/strip/Makefile.depend
+++ b/gnu/usr.bin/binutils/strip/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/dialog/Makefile.depend b/gnu/usr.bin/dialog/Makefile.depend
index 546cb43f4f041..d9cc8893dc80e 100644
--- a/gnu/usr.bin/dialog/Makefile.depend
+++ b/gnu/usr.bin/dialog/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/msun \
 	lib/ncurses/ncursesw \
diff --git a/gnu/usr.bin/diff3/Makefile.depend b/gnu/usr.bin/diff3/Makefile.depend
index ead1ad513fac8..71c3d5e9b0de9 100644
--- a/gnu/usr.bin/diff3/Makefile.depend
+++ b/gnu/usr.bin/diff3/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/gdb/gdb/Makefile.depend b/gnu/usr.bin/gdb/gdb/Makefile.depend
index c3a2af4da2f68..4572bc150e30d 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdb/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	gnu/lib/libreadline/readline \
 	gnu/lib/libregex \
diff --git a/gnu/usr.bin/gdb/gdbserver/Makefile.depend b/gnu/usr.bin/gdb/gdbserver/Makefile.depend
index 5269280d143cc..b68b4bb5daf93 100644
--- a/gnu/usr.bin/gdb/gdbserver/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdbserver/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile.depend b/gnu/usr.bin/gdb/gdbtui/Makefile.depend
index 8ba7b928ece24..1d50acab904e5 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	gnu/lib/libreadline/readline \
 	gnu/lib/libregex \
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
index d2192d3b2971d..165f4f0ff7804 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
+++ b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	gnu/lib/libreadline/readline \
 	gnu/lib/libregex \
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
index 97cb0bdfd01e7..b5a6296105ba8 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend b/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
index 97cb0bdfd01e7..b5a6296105ba8 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
index 97cb0bdfd01e7..b5a6296105ba8 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
index 97cb0bdfd01e7..b5a6296105ba8 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
index 97cb0bdfd01e7..b5a6296105ba8 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
index 97cb0bdfd01e7..b5a6296105ba8 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
index f380135722553..78b43b7136d40 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile.depend b/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
index aea5b2d8cc45a..dd0bc4c6445ac 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
index 345d8fbb2d229..661e26a334fdf 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
index 80cfb86ca689b..093a8eec5e78f 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
index 5f92b0df5f81c..48d82090baa7b 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
index 5f92b0df5f81c..48d82090baa7b 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
index 5f92b0df5f81c..48d82090baa7b 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
index b4de749641064..fd3efc3ce774c 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	include \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
index 6936f25a9e7a6..df023f12a0d1c 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libc++ \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
diff --git a/gnu/usr.bin/rcs/ci/Makefile.depend b/gnu/usr.bin/rcs/ci/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/ci/Makefile.depend
+++ b/gnu/usr.bin/rcs/ci/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/co/Makefile.depend b/gnu/usr.bin/rcs/co/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/co/Makefile.depend
+++ b/gnu/usr.bin/rcs/co/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/ident/Makefile.depend b/gnu/usr.bin/rcs/ident/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/ident/Makefile.depend
+++ b/gnu/usr.bin/rcs/ident/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/merge/Makefile.depend b/gnu/usr.bin/rcs/merge/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/merge/Makefile.depend
+++ b/gnu/usr.bin/rcs/merge/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/rcs/Makefile.depend b/gnu/usr.bin/rcs/rcs/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcs/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/rcsclean/Makefile.depend b/gnu/usr.bin/rcs/rcsclean/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/rcsclean/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsclean/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile.depend b/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile.depend b/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/rcs/rlog/Makefile.depend b/gnu/usr.bin/rcs/rlog/Makefile.depend
index 0e57857f4e80d..12b27259d9a01 100644
--- a/gnu/usr.bin/rcs/rlog/Makefile.depend
+++ b/gnu/usr.bin/rcs/rlog/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/sdiff/Makefile.depend b/gnu/usr.bin/sdiff/Makefile.depend
index 3c6803038b80a..243191967bf4a 100644
--- a/gnu/usr.bin/sdiff/Makefile.depend
+++ b/gnu/usr.bin/sdiff/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/texinfo/info/Makefile.depend b/gnu/usr.bin/texinfo/info/Makefile.depend
index 4300e83bcc164..1afa811efa51e 100644
--- a/gnu/usr.bin/texinfo/info/Makefile.depend
+++ b/gnu/usr.bin/texinfo/info/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
diff --git a/gnu/usr.bin/texinfo/infokey/Makefile.depend b/gnu/usr.bin/texinfo/infokey/Makefile.depend
index adec3fdafec65..ffe9a50f84007 100644
--- a/gnu/usr.bin/texinfo/infokey/Makefile.depend
+++ b/gnu/usr.bin/texinfo/infokey/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile.depend b/gnu/usr.bin/texinfo/install-info/Makefile.depend
index adec3fdafec65..ffe9a50f84007 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile.depend
+++ b/gnu/usr.bin/texinfo/install-info/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile.depend b/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
index adec3fdafec65..ffe9a50f84007 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile.depend b/gnu/usr.bin/texinfo/texindex/Makefile.depend
index adec3fdafec65..ffe9a50f84007 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile.depend
+++ b/gnu/usr.bin/texinfo/texindex/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \