summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/apply/Makefile.depend1
-rw-r--r--usr.bin/ar/Makefile.depend1
-rw-r--r--usr.bin/asa/Makefile.depend1
-rw-r--r--usr.bin/at/Makefile.depend1
-rw-r--r--usr.bin/atf/atf-sh/Makefile.depend5
-rw-r--r--usr.bin/atm/sscop/Makefile.depend1
-rw-r--r--usr.bin/awk/Makefile.depend1
-rw-r--r--usr.bin/banner/Makefile.depend1
-rw-r--r--usr.bin/basename/Makefile.depend1
-rw-r--r--usr.bin/bc/Makefile.depend1
-rw-r--r--usr.bin/biff/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/bthost/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/btsockstat/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/Makefile.depend1
-rw-r--r--usr.bin/brandelf/Makefile.depend1
-rw-r--r--usr.bin/bsdiff/bsdiff/Makefile.depend1
-rw-r--r--usr.bin/bsdiff/bspatch/Makefile.depend1
-rw-r--r--usr.bin/bzip2/Makefile.depend1
-rw-r--r--usr.bin/bzip2recover/Makefile.depend1
-rw-r--r--usr.bin/c89/Makefile.depend1
-rw-r--r--usr.bin/c99/Makefile.depend1
-rw-r--r--usr.bin/calendar/Makefile.depend1
-rw-r--r--usr.bin/cap_mkdb/Makefile.depend1
-rw-r--r--usr.bin/catman/Makefile.depend1
-rw-r--r--usr.bin/chat/Makefile.depend1
-rw-r--r--usr.bin/checknr/Makefile.depend1
-rw-r--r--usr.bin/chkey/Makefile.depend1
-rw-r--r--usr.bin/chpass/Makefile.depend1
-rw-r--r--usr.bin/cksum/Makefile.depend1
-rw-r--r--usr.bin/clang/clang-tblgen/Makefile.depend6
-rw-r--r--usr.bin/clang/clang/Makefile.depend6
-rw-r--r--usr.bin/clang/tblgen/Makefile.depend6
-rw-r--r--usr.bin/cmp/Makefile.depend1
-rw-r--r--usr.bin/col/Makefile.depend1
-rw-r--r--usr.bin/colcrt/Makefile.depend1
-rw-r--r--usr.bin/colldef/Makefile.depend1
-rw-r--r--usr.bin/colrm/Makefile.depend1
-rw-r--r--usr.bin/column/Makefile.depend1
-rw-r--r--usr.bin/comm/Makefile.depend1
-rw-r--r--usr.bin/compile_et/Makefile.depend1
-rw-r--r--usr.bin/compress/Makefile.depend1
-rw-r--r--usr.bin/cpio/Makefile.depend1
-rw-r--r--usr.bin/cpuset/Makefile.depend1
-rw-r--r--usr.bin/csplit/Makefile.depend1
-rw-r--r--usr.bin/csup/Makefile.depend1
-rw-r--r--usr.bin/ctags/Makefile.depend1
-rw-r--r--usr.bin/ctlstat/Makefile.depend1
-rw-r--r--usr.bin/cut/Makefile.depend1
-rw-r--r--usr.bin/dc/Makefile.depend1
-rw-r--r--usr.bin/dirname/Makefile.depend1
-rw-r--r--usr.bin/du/Makefile.depend1
-rw-r--r--usr.bin/ee/Makefile.depend1
-rw-r--r--usr.bin/elf2aout/Makefile.depend1
-rw-r--r--usr.bin/elfdump/Makefile.depend1
-rw-r--r--usr.bin/enigma/Makefile.depend1
-rw-r--r--usr.bin/env/Makefile.depend1
-rw-r--r--usr.bin/expand/Makefile.depend1
-rw-r--r--usr.bin/false/Makefile.depend1
-rw-r--r--usr.bin/fetch/Makefile.depend1
-rw-r--r--usr.bin/file/Makefile.depend1
-rw-r--r--usr.bin/file2c/Makefile.depend1
-rw-r--r--usr.bin/find/Makefile.depend1
-rw-r--r--usr.bin/finger/Makefile.depend1
-rw-r--r--usr.bin/fmt/Makefile.depend1
-rw-r--r--usr.bin/fold/Makefile.depend1
-rw-r--r--usr.bin/from/Makefile.depend1
-rw-r--r--usr.bin/fstat/Makefile.depend1
-rw-r--r--usr.bin/fsync/Makefile.depend1
-rw-r--r--usr.bin/ftp/Makefile.depend1
-rw-r--r--usr.bin/gcore/Makefile.depend1
-rw-r--r--usr.bin/gencat/Makefile.depend1
-rw-r--r--usr.bin/getconf/Makefile.depend1
-rw-r--r--usr.bin/getent/Makefile.depend1
-rw-r--r--usr.bin/getopt/Makefile.depend1
-rw-r--r--usr.bin/gprof/Makefile.depend1
-rw-r--r--usr.bin/grep/Makefile.depend1
-rw-r--r--usr.bin/gzip/Makefile.depend1
-rw-r--r--usr.bin/head/Makefile.depend1
-rw-r--r--usr.bin/hexdump/Makefile.depend1
-rw-r--r--usr.bin/host/Makefile.depend1
-rw-r--r--usr.bin/id/Makefile.depend1
-rw-r--r--usr.bin/indent/Makefile.depend1
-rw-r--r--usr.bin/ipcrm/Makefile.depend1
-rw-r--r--usr.bin/ipcs/Makefile.depend1
-rw-r--r--usr.bin/join/Makefile.depend1
-rw-r--r--usr.bin/jot/Makefile.depend1
-rw-r--r--usr.bin/kdump/Makefile.depend1
-rw-r--r--usr.bin/keylogin/Makefile.depend1
-rw-r--r--usr.bin/keylogout/Makefile.depend1
-rw-r--r--usr.bin/killall/Makefile.depend1
-rw-r--r--usr.bin/ktrace/Makefile.depend1
-rw-r--r--usr.bin/ktrdump/Makefile.depend1
-rw-r--r--usr.bin/lam/Makefile.depend1
-rw-r--r--usr.bin/last/Makefile.depend1
-rw-r--r--usr.bin/lastcomm/Makefile.depend1
-rw-r--r--usr.bin/ldd/Makefile.depend1
-rw-r--r--usr.bin/leave/Makefile.depend1
-rw-r--r--usr.bin/less/Makefile.depend1
-rw-r--r--usr.bin/lessecho/Makefile.depend1
-rw-r--r--usr.bin/lesskey/Makefile.depend1
-rw-r--r--usr.bin/limits/Makefile.depend1
-rw-r--r--usr.bin/locale/Makefile.depend1
-rw-r--r--usr.bin/locate/bigram/Makefile.depend1
-rw-r--r--usr.bin/locate/code/Makefile.depend1
-rw-r--r--usr.bin/locate/locate/Makefile.depend1
-rw-r--r--usr.bin/lock/Makefile.depend1
-rw-r--r--usr.bin/lockf/Makefile.depend1
-rw-r--r--usr.bin/logger/Makefile.depend1
-rw-r--r--usr.bin/login/Makefile.depend1
-rw-r--r--usr.bin/logins/Makefile.depend1
-rw-r--r--usr.bin/logname/Makefile.depend1
-rw-r--r--usr.bin/look/Makefile.depend1
-rw-r--r--usr.bin/lsvfs/Makefile.depend1
-rw-r--r--usr.bin/lzmainfo/Makefile.depend1
-rw-r--r--usr.bin/m4/Makefile.depend1
-rw-r--r--usr.bin/mail/Makefile.depend1
-rw-r--r--usr.bin/makewhatis/Makefile.depend1
-rw-r--r--usr.bin/mandoc/Makefile.depend1
-rw-r--r--usr.bin/mesg/Makefile.depend1
-rw-r--r--usr.bin/minigzip/Makefile.depend1
-rw-r--r--usr.bin/ministat/Makefile.depend1
-rw-r--r--usr.bin/mkfifo/Makefile.depend1
-rw-r--r--usr.bin/mklocale/Makefile.depend1
-rw-r--r--usr.bin/mkstr/Makefile.depend1
-rw-r--r--usr.bin/mktemp/Makefile.depend1
-rw-r--r--usr.bin/mkulzma/Makefile.depend1
-rw-r--r--usr.bin/mkuzip/Makefile.depend1
-rw-r--r--usr.bin/msgs/Makefile.depend1
-rw-r--r--usr.bin/mt/Makefile.depend1
-rw-r--r--usr.bin/nc/Makefile.depend1
-rw-r--r--usr.bin/ncal/Makefile.depend1
-rw-r--r--usr.bin/netstat/Makefile.depend1
-rw-r--r--usr.bin/newgrp/Makefile.depend1
-rw-r--r--usr.bin/newkey/Makefile.depend1
-rw-r--r--usr.bin/nfsstat/Makefile.depend1
-rw-r--r--usr.bin/nice/Makefile.depend1
-rw-r--r--usr.bin/nl/Makefile.depend1
-rw-r--r--usr.bin/nohup/Makefile.depend1
-rw-r--r--usr.bin/opieinfo/Makefile.depend1
-rw-r--r--usr.bin/opiekey/Makefile.depend1
-rw-r--r--usr.bin/opiepasswd/Makefile.depend1
-rw-r--r--usr.bin/passwd/Makefile.depend1
-rw-r--r--usr.bin/paste/Makefile.depend1
-rw-r--r--usr.bin/pathchk/Makefile.depend1
-rw-r--r--usr.bin/perror/Makefile.depend1
-rw-r--r--usr.bin/pr/Makefile.depend1
-rw-r--r--usr.bin/printenv/Makefile.depend1
-rw-r--r--usr.bin/printf/Makefile.depend1
-rw-r--r--usr.bin/procstat/Makefile.depend1
-rw-r--r--usr.bin/quota/Makefile.depend1
-rw-r--r--usr.bin/rctl/Makefile.depend1
-rw-r--r--usr.bin/renice/Makefile.depend1
-rw-r--r--usr.bin/rev/Makefile.depend1
-rw-r--r--usr.bin/revoke/Makefile.depend1
-rw-r--r--usr.bin/rlogin/Makefile.depend1
-rw-r--r--usr.bin/rpcgen/Makefile.depend1
-rw-r--r--usr.bin/rpcinfo/Makefile.depend1
-rw-r--r--usr.bin/rs/Makefile.depend1
-rw-r--r--usr.bin/rsh/Makefile.depend1
-rw-r--r--usr.bin/rup/Makefile.depend1
-rw-r--r--usr.bin/ruptime/Makefile.depend1
-rw-r--r--usr.bin/rusers/Makefile.depend1
-rw-r--r--usr.bin/rwall/Makefile.depend1
-rw-r--r--usr.bin/rwho/Makefile.depend1
-rw-r--r--usr.bin/script/Makefile.depend1
-rw-r--r--usr.bin/sed/Makefile.depend1
-rw-r--r--usr.bin/seq/Makefile.depend1
-rw-r--r--usr.bin/showmount/Makefile.depend1
-rw-r--r--usr.bin/sockstat/Makefile.depend1
-rw-r--r--usr.bin/sort/Makefile.depend1
-rw-r--r--usr.bin/split/Makefile.depend1
-rw-r--r--usr.bin/stat/Makefile.depend1
-rw-r--r--usr.bin/stdbuf/Makefile.depend1
-rw-r--r--usr.bin/su/Makefile.depend1
-rw-r--r--usr.bin/systat/Makefile.depend1
-rw-r--r--usr.bin/tabs/Makefile.depend1
-rw-r--r--usr.bin/tail/Makefile.depend1
-rw-r--r--usr.bin/talk/Makefile.depend1
-rw-r--r--usr.bin/tar/Makefile.depend1
-rw-r--r--usr.bin/tcopy/Makefile.depend1
-rw-r--r--usr.bin/tee/Makefile.depend1
-rw-r--r--usr.bin/telnet/Makefile.depend1
-rw-r--r--usr.bin/tftp/Makefile.depend1
-rw-r--r--usr.bin/time/Makefile.depend1
-rw-r--r--usr.bin/tip/tip/Makefile.depend1
-rw-r--r--usr.bin/top/Makefile.depend1
-rw-r--r--usr.bin/touch/Makefile.depend1
-rw-r--r--usr.bin/tput/Makefile.depend1
-rw-r--r--usr.bin/tr/Makefile.depend1
-rw-r--r--usr.bin/true/Makefile.depend1
-rw-r--r--usr.bin/truncate/Makefile.depend1
-rw-r--r--usr.bin/truss/Makefile.depend.amd641
-rw-r--r--usr.bin/tset/Makefile.depend1
-rw-r--r--usr.bin/tsort/Makefile.depend1
-rw-r--r--usr.bin/tty/Makefile.depend1
-rw-r--r--usr.bin/ul/Makefile.depend1
-rw-r--r--usr.bin/uname/Makefile.depend1
-rw-r--r--usr.bin/unexpand/Makefile.depend1
-rw-r--r--usr.bin/unifdef/Makefile.depend1
-rw-r--r--usr.bin/uniq/Makefile.depend1
-rw-r--r--usr.bin/units/Makefile.depend1
-rw-r--r--usr.bin/unvis/Makefile.depend1
-rw-r--r--usr.bin/unzip/Makefile.depend1
-rw-r--r--usr.bin/usbhidaction/Makefile.depend1
-rw-r--r--usr.bin/usbhidctl/Makefile.depend1
-rw-r--r--usr.bin/users/Makefile.depend1
-rw-r--r--usr.bin/uudecode/Makefile.depend1
-rw-r--r--usr.bin/uuencode/Makefile.depend1
-rw-r--r--usr.bin/vacation/Makefile.depend1
-rw-r--r--usr.bin/vgrind/Makefile.depend1
-rw-r--r--usr.bin/vi/Makefile.depend1
-rw-r--r--usr.bin/vis/Makefile.depend1
-rw-r--r--usr.bin/vmstat/Makefile.depend1
-rw-r--r--usr.bin/w/Makefile.depend1
-rw-r--r--usr.bin/wall/Makefile.depend1
-rw-r--r--usr.bin/wc/Makefile.depend1
-rw-r--r--usr.bin/what/Makefile.depend1
-rw-r--r--usr.bin/whereis/Makefile.depend1
-rw-r--r--usr.bin/which/Makefile.depend1
-rw-r--r--usr.bin/who/Makefile.depend1
-rw-r--r--usr.bin/whois/Makefile.depend1
-rw-r--r--usr.bin/write/Makefile.depend1
-rw-r--r--usr.bin/xargs/Makefile.depend1
-rw-r--r--usr.bin/xinstall/Makefile.depend1
-rw-r--r--usr.bin/xlint/lint1/Makefile.depend1
-rw-r--r--usr.bin/xlint/lint2/Makefile.depend1
-rw-r--r--usr.bin/xlint/xlint/Makefile.depend1
-rw-r--r--usr.bin/xstr/Makefile.depend1
-rw-r--r--usr.bin/xz/Makefile.depend1
-rw-r--r--usr.bin/xzdec/Makefile.depend1
-rw-r--r--usr.bin/yacc/Makefile.depend1
-rw-r--r--usr.bin/yes/Makefile.depend1
-rw-r--r--usr.bin/ypcat/Makefile.depend1
-rw-r--r--usr.bin/ypmatch/Makefile.depend1
-rw-r--r--usr.bin/ypwhich/Makefile.depend1
235 files changed, 23 insertions, 231 deletions
diff --git a/usr.bin/apply/Makefile.depend b/usr.bin/apply/Makefile.depend
index a115711..dc9c62a 100644
--- a/usr.bin/apply/Makefile.depend
+++ b/usr.bin/apply/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
diff --git a/usr.bin/ar/Makefile.depend b/usr.bin/ar/Makefile.depend
index fb5f3e3..c8ce9ca 100644
--- a/usr.bin/ar/Makefile.depend
+++ b/usr.bin/ar/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/asa/Makefile.depend b/usr.bin/asa/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/asa/Makefile.depend
+++ b/usr.bin/asa/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/at/Makefile.depend b/usr.bin/at/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/at/Makefile.depend
+++ b/usr.bin/at/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/atf/atf-sh/Makefile.depend b/usr.bin/atf/atf-sh/Makefile.depend
index aa1a208..72e04cf 100644
--- a/usr.bin/atf/atf-sh/Makefile.depend
+++ b/usr.bin/atf/atf-sh/Makefile.depend
@@ -3,16 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/atf/libatf-c \
lib/atf/libatf-c++ \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/msun \
diff --git a/usr.bin/atm/sscop/Makefile.depend b/usr.bin/atm/sscop/Makefile.depend
index 1d7d03c..08035b1 100644
--- a/usr.bin/atm/sscop/Makefile.depend
+++ b/usr.bin/atm/sscop/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbegemot \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
lib/libngatm \
diff --git a/usr.bin/awk/Makefile.depend b/usr.bin/awk/Makefile.depend
index 5b1f96f..bcdaffe 100644
--- a/usr.bin/awk/Makefile.depend
+++ b/usr.bin/awk/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/banner/Makefile.depend b/usr.bin/banner/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/banner/Makefile.depend
+++ b/usr.bin/banner/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/basename/Makefile.depend b/usr.bin/basename/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/basename/Makefile.depend
+++ b/usr.bin/basename/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bc/Makefile.depend b/usr.bin/bc/Makefile.depend
index 3cc8704..e13898c 100644
--- a/usr.bin/bc/Makefile.depend
+++ b/usr.bin/bc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.bin/biff/Makefile.depend b/usr.bin/biff/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/biff/Makefile.depend
+++ b/usr.bin/biff/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bluetooth/bthost/Makefile.depend b/usr.bin/bluetooth/bthost/Makefile.depend
index 3343480..9e752f4 100644
--- a/usr.bin/bluetooth/bthost/Makefile.depend
+++ b/usr.bin/bluetooth/bthost/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bluetooth/btsockstat/Makefile.depend b/usr.bin/bluetooth/btsockstat/Makefile.depend
index c811208..7272828 100644
--- a/usr.bin/bluetooth/btsockstat/Makefile.depend
+++ b/usr.bin/bluetooth/btsockstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
index 8402227..70283d4 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
+++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.bin/brandelf/Makefile.depend b/usr.bin/brandelf/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/brandelf/Makefile.depend
+++ b/usr.bin/brandelf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bsdiff/bsdiff/Makefile.depend b/usr.bin/bsdiff/bsdiff/Makefile.depend
index e13f973..95b1d2b 100644
--- a/usr.bin/bsdiff/bsdiff/Makefile.depend
+++ b/usr.bin/bsdiff/bsdiff/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bsdiff/bspatch/Makefile.depend b/usr.bin/bsdiff/bspatch/Makefile.depend
index e13f973..95b1d2b 100644
--- a/usr.bin/bsdiff/bspatch/Makefile.depend
+++ b/usr.bin/bsdiff/bspatch/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bzip2/Makefile.depend b/usr.bin/bzip2/Makefile.depend
index 7616a5e..3b80041 100644
--- a/usr.bin/bzip2/Makefile.depend
+++ b/usr.bin/bzip2/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/bzip2recover/Makefile.depend b/usr.bin/bzip2recover/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/bzip2recover/Makefile.depend
+++ b/usr.bin/bzip2recover/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/c89/Makefile.depend b/usr.bin/c89/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/c89/Makefile.depend
+++ b/usr.bin/c89/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/c99/Makefile.depend b/usr.bin/c99/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/c99/Makefile.depend
+++ b/usr.bin/c99/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/calendar/Makefile.depend b/usr.bin/calendar/Makefile.depend
index 26b0cb7..da4f56b 100644
--- a/usr.bin/calendar/Makefile.depend
+++ b/usr.bin/calendar/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/cap_mkdb/Makefile.depend b/usr.bin/cap_mkdb/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/cap_mkdb/Makefile.depend
+++ b/usr.bin/cap_mkdb/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/catman/Makefile.depend b/usr.bin/catman/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/catman/Makefile.depend
+++ b/usr.bin/catman/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/chat/Makefile.depend b/usr.bin/chat/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/chat/Makefile.depend
+++ b/usr.bin/chat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/checknr/Makefile.depend b/usr.bin/checknr/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/checknr/Makefile.depend
+++ b/usr.bin/checknr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/chkey/Makefile.depend b/usr.bin/chkey/Makefile.depend
index c04a0a5..93ea89a 100644
--- a/usr.bin/chkey/Makefile.depend
+++ b/usr.bin/chkey/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
diff --git a/usr.bin/chpass/Makefile.depend b/usr.bin/chpass/Makefile.depend
index eff6559..e31b02b 100644
--- a/usr.bin/chpass/Makefile.depend
+++ b/usr.bin/chpass/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libutil \
diff --git a/usr.bin/cksum/Makefile.depend b/usr.bin/cksum/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/cksum/Makefile.depend
+++ b/usr.bin/cksum/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend
index 1a3fce4..70ecfef 100644
--- a/usr.bin/clang/clang-tblgen/Makefile.depend
+++ b/usr.bin/clang/clang-tblgen/Makefile.depend
@@ -3,17 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/clang/libllvmsupport \
lib/clang/libllvmtablegen \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/msun \
+ lib/ncurses/ncurses \
.include <dirdeps.mk>
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index 947a3e9..f741403 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -3,8 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -81,9 +80,12 @@ DIRDEPS = \
lib/clang/libllvmx86instprinter \
lib/clang/libllvmx86utils \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/msun \
+ lib/ncurses/ncurses \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/tblgen/Makefile.depend
index 1a3fce4..70ecfef 100644
--- a/usr.bin/clang/tblgen/Makefile.depend
+++ b/usr.bin/clang/tblgen/Makefile.depend
@@ -3,17 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/clang/libllvmsupport \
lib/clang/libllvmtablegen \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/msun \
+ lib/ncurses/ncurses \
.include <dirdeps.mk>
diff --git a/usr.bin/cmp/Makefile.depend b/usr.bin/cmp/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/cmp/Makefile.depend
+++ b/usr.bin/cmp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/col/Makefile.depend b/usr.bin/col/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/col/Makefile.depend
+++ b/usr.bin/col/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/colcrt/Makefile.depend b/usr.bin/colcrt/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/colcrt/Makefile.depend
+++ b/usr.bin/colcrt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/colldef/Makefile.depend b/usr.bin/colldef/Makefile.depend
index 8249cb4..032dbbf8 100644
--- a/usr.bin/colldef/Makefile.depend
+++ b/usr.bin/colldef/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.bin/lex/lib \
diff --git a/usr.bin/colrm/Makefile.depend b/usr.bin/colrm/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/colrm/Makefile.depend
+++ b/usr.bin/colrm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/column/Makefile.depend b/usr.bin/column/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/column/Makefile.depend
+++ b/usr.bin/column/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/comm/Makefile.depend b/usr.bin/comm/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/comm/Makefile.depend
+++ b/usr.bin/comm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/compile_et/Makefile.depend b/usr.bin/compile_et/Makefile.depend
index b442c85..f90d17c 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
kerberos5/lib/libvers \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
diff --git a/usr.bin/compress/Makefile.depend b/usr.bin/compress/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/compress/Makefile.depend
+++ b/usr.bin/compress/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/cpio/Makefile.depend b/usr.bin/cpio/Makefile.depend
index 91c0c58..7f1d531 100644
--- a/usr.bin/cpio/Makefile.depend
+++ b/usr.bin/cpio/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/cpuset/Makefile.depend b/usr.bin/cpuset/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/cpuset/Makefile.depend
+++ b/usr.bin/cpuset/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/csplit/Makefile.depend b/usr.bin/csplit/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/csplit/Makefile.depend
+++ b/usr.bin/csplit/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/csup/Makefile.depend b/usr.bin/csup/Makefile.depend
index 4ee17de..061f7d0 100644
--- a/usr.bin/csup/Makefile.depend
+++ b/usr.bin/csup/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libthr \
diff --git a/usr.bin/ctags/Makefile.depend b/usr.bin/ctags/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/ctags/Makefile.depend
+++ b/usr.bin/ctags/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ctlstat/Makefile.depend b/usr.bin/ctlstat/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/ctlstat/Makefile.depend
+++ b/usr.bin/ctlstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/cut/Makefile.depend b/usr.bin/cut/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/cut/Makefile.depend
+++ b/usr.bin/cut/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/dc/Makefile.depend b/usr.bin/dc/Makefile.depend
index d4efe33..2e6643d 100644
--- a/usr.bin/dc/Makefile.depend
+++ b/usr.bin/dc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/dirname/Makefile.depend b/usr.bin/dirname/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/dirname/Makefile.depend
+++ b/usr.bin/dirname/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/du/Makefile.depend b/usr.bin/du/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/du/Makefile.depend
+++ b/usr.bin/du/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/ee/Makefile.depend b/usr.bin/ee/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/ee/Makefile.depend
+++ b/usr.bin/ee/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/elf2aout/Makefile.depend b/usr.bin/elf2aout/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/elf2aout/Makefile.depend
+++ b/usr.bin/elf2aout/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/elfdump/Makefile.depend b/usr.bin/elfdump/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/elfdump/Makefile.depend
+++ b/usr.bin/elfdump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/enigma/Makefile.depend b/usr.bin/enigma/Makefile.depend
index 5912699..ea9a8a2 100644
--- a/usr.bin/enigma/Makefile.depend
+++ b/usr.bin/enigma/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
diff --git a/usr.bin/env/Makefile.depend b/usr.bin/env/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/env/Makefile.depend
+++ b/usr.bin/env/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/expand/Makefile.depend b/usr.bin/expand/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/expand/Makefile.depend
+++ b/usr.bin/expand/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/false/Makefile.depend b/usr.bin/false/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/false/Makefile.depend
+++ b/usr.bin/false/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/fetch/Makefile.depend b/usr.bin/fetch/Makefile.depend
index 7226549..b7ff324 100644
--- a/usr.bin/fetch/Makefile.depend
+++ b/usr.bin/fetch/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/file/Makefile.depend b/usr.bin/file/Makefile.depend
index 5d1fe0e..35dd078 100644
--- a/usr.bin/file/Makefile.depend
+++ b/usr.bin/file/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmagic \
lib/libz \
diff --git a/usr.bin/file2c/Makefile.depend b/usr.bin/file2c/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/file2c/Makefile.depend
+++ b/usr.bin/file2c/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/find/Makefile.depend b/usr.bin/find/Makefile.depend
index 9e4103f..c834e40 100644
--- a/usr.bin/find/Makefile.depend
+++ b/usr.bin/find/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/finger/Makefile.depend b/usr.bin/finger/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/finger/Makefile.depend
+++ b/usr.bin/finger/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/fmt/Makefile.depend b/usr.bin/fmt/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/fmt/Makefile.depend
+++ b/usr.bin/fmt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/fold/Makefile.depend b/usr.bin/fold/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/fold/Makefile.depend
+++ b/usr.bin/fold/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/from/Makefile.depend b/usr.bin/from/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/from/Makefile.depend
+++ b/usr.bin/from/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/fstat/Makefile.depend b/usr.bin/fstat/Makefile.depend
index c811358..5c89c18 100644
--- a/usr.bin/fstat/Makefile.depend
+++ b/usr.bin/fstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libkvm \
diff --git a/usr.bin/fsync/Makefile.depend b/usr.bin/fsync/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/fsync/Makefile.depend
+++ b/usr.bin/fsync/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ftp/Makefile.depend b/usr.bin/ftp/Makefile.depend
index 1adc0d1..b176abf 100644
--- a/usr.bin/ftp/Makefile.depend
+++ b/usr.bin/ftp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/libutil \
diff --git a/usr.bin/gcore/Makefile.depend b/usr.bin/gcore/Makefile.depend
index c121cbc..2d670d2 100644
--- a/usr.bin/gcore/Makefile.depend
+++ b/usr.bin/gcore/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
lib/libutil \
diff --git a/usr.bin/gencat/Makefile.depend b/usr.bin/gencat/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/gencat/Makefile.depend
+++ b/usr.bin/gencat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/getconf/Makefile.depend b/usr.bin/getconf/Makefile.depend
index 2b3f880..3cc34a1 100644
--- a/usr.bin/getconf/Makefile.depend
+++ b/usr.bin/getconf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/getent/Makefile.depend b/usr.bin/getent/Makefile.depend
index 886683c..5de5043 100644
--- a/usr.bin/getent/Makefile.depend
+++ b/usr.bin/getent/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/getopt/Makefile.depend b/usr.bin/getopt/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/getopt/Makefile.depend
+++ b/usr.bin/getopt/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/gprof/Makefile.depend b/usr.bin/gprof/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/gprof/Makefile.depend
+++ b/usr.bin/gprof/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/grep/Makefile.depend b/usr.bin/grep/Makefile.depend
index e06aa1d..b8b81d7 100644
--- a/usr.bin/grep/Makefile.depend
+++ b/usr.bin/grep/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liblzma \
lib/libz \
diff --git a/usr.bin/gzip/Makefile.depend b/usr.bin/gzip/Makefile.depend
index e59b537..4e4edde 100644
--- a/usr.bin/gzip/Makefile.depend
+++ b/usr.bin/gzip/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liblzma \
lib/libz \
diff --git a/usr.bin/head/Makefile.depend b/usr.bin/head/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/head/Makefile.depend
+++ b/usr.bin/head/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/hexdump/Makefile.depend b/usr.bin/hexdump/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/hexdump/Makefile.depend
+++ b/usr.bin/hexdump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/host/Makefile.depend b/usr.bin/host/Makefile.depend
index aeb60b6..74e1d28 100644
--- a/usr.bin/host/Makefile.depend
+++ b/usr.bin/host/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/id/Makefile.depend b/usr.bin/id/Makefile.depend
index cfab525..24594da 100644
--- a/usr.bin/id/Makefile.depend
+++ b/usr.bin/id/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/indent/Makefile.depend b/usr.bin/indent/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/indent/Makefile.depend
+++ b/usr.bin/indent/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ipcrm/Makefile.depend b/usr.bin/ipcrm/Makefile.depend
index b7d414c..384b675 100644
--- a/usr.bin/ipcrm/Makefile.depend
+++ b/usr.bin/ipcrm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.bin/ipcs/Makefile.depend b/usr.bin/ipcs/Makefile.depend
index b7d414c..384b675 100644
--- a/usr.bin/ipcs/Makefile.depend
+++ b/usr.bin/ipcs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.bin/join/Makefile.depend b/usr.bin/join/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/join/Makefile.depend
+++ b/usr.bin/join/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/jot/Makefile.depend b/usr.bin/jot/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/jot/Makefile.depend
+++ b/usr.bin/jot/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend
index abb06b4..c7bcbb8 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcapsicum \
lib/libcompiler_rt \
lib/libnv \
diff --git a/usr.bin/keylogin/Makefile.depend b/usr.bin/keylogin/Makefile.depend
index 3b0eba6..e44fad3 100644
--- a/usr.bin/keylogin/Makefile.depend
+++ b/usr.bin/keylogin/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.bin/keylogout/Makefile.depend b/usr.bin/keylogout/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.bin/keylogout/Makefile.depend
+++ b/usr.bin/keylogout/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/killall/Makefile.depend b/usr.bin/killall/Makefile.depend
index 4ece791..80299ac 100644
--- a/usr.bin/killall/Makefile.depend
+++ b/usr.bin/killall/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libjail \
diff --git a/usr.bin/ktrace/Makefile.depend b/usr.bin/ktrace/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/ktrace/Makefile.depend
+++ b/usr.bin/ktrace/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ktrdump/Makefile.depend b/usr.bin/ktrdump/Makefile.depend
index b7d414c..384b675 100644
--- a/usr.bin/ktrdump/Makefile.depend
+++ b/usr.bin/ktrdump/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.bin/lam/Makefile.depend b/usr.bin/lam/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/lam/Makefile.depend
+++ b/usr.bin/lam/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/last/Makefile.depend b/usr.bin/last/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/last/Makefile.depend
+++ b/usr.bin/last/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/lastcomm/Makefile.depend b/usr.bin/lastcomm/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/lastcomm/Makefile.depend
+++ b/usr.bin/lastcomm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ldd/Makefile.depend b/usr.bin/ldd/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/ldd/Makefile.depend
+++ b/usr.bin/ldd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/leave/Makefile.depend b/usr.bin/leave/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/leave/Makefile.depend
+++ b/usr.bin/leave/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/less/Makefile.depend b/usr.bin/less/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/less/Makefile.depend
+++ b/usr.bin/less/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/lessecho/Makefile.depend b/usr.bin/lessecho/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/lessecho/Makefile.depend
+++ b/usr.bin/lessecho/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/lesskey/Makefile.depend b/usr.bin/lesskey/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/lesskey/Makefile.depend
+++ b/usr.bin/lesskey/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/limits/Makefile.depend b/usr.bin/limits/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/limits/Makefile.depend
+++ b/usr.bin/limits/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/locale/Makefile.depend b/usr.bin/locale/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/locale/Makefile.depend
+++ b/usr.bin/locale/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/locate/bigram/Makefile.depend b/usr.bin/locate/bigram/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/locate/bigram/Makefile.depend
+++ b/usr.bin/locate/bigram/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/locate/code/Makefile.depend b/usr.bin/locate/code/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/locate/code/Makefile.depend
+++ b/usr.bin/locate/code/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/locate/locate/Makefile.depend b/usr.bin/locate/locate/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/locate/locate/Makefile.depend
+++ b/usr.bin/locate/locate/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/lock/Makefile.depend b/usr.bin/lock/Makefile.depend
index 5912699..ea9a8a2 100644
--- a/usr.bin/lock/Makefile.depend
+++ b/usr.bin/lock/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
diff --git a/usr.bin/lockf/Makefile.depend b/usr.bin/lockf/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/lockf/Makefile.depend
+++ b/usr.bin/lockf/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/logger/Makefile.depend b/usr.bin/logger/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/logger/Makefile.depend
+++ b/usr.bin/logger/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/login/Makefile.depend b/usr.bin/login/Makefile.depend
index 5dbe42c..67fd380 100644
--- a/usr.bin/login/Makefile.depend
+++ b/usr.bin/login/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
diff --git a/usr.bin/logins/Makefile.depend b/usr.bin/logins/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/logins/Makefile.depend
+++ b/usr.bin/logins/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/logname/Makefile.depend b/usr.bin/logname/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/logname/Makefile.depend
+++ b/usr.bin/logname/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/look/Makefile.depend b/usr.bin/look/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/look/Makefile.depend
+++ b/usr.bin/look/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/lsvfs/Makefile.depend b/usr.bin/lsvfs/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/lsvfs/Makefile.depend
+++ b/usr.bin/lsvfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/lzmainfo/Makefile.depend b/usr.bin/lzmainfo/Makefile.depend
index 6da741b..b7653d1 100644
--- a/usr.bin/lzmainfo/Makefile.depend
+++ b/usr.bin/lzmainfo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liblzma \
diff --git a/usr.bin/m4/Makefile.depend b/usr.bin/m4/Makefile.depend
index 429b9f2..f5f9a16 100644
--- a/usr.bin/m4/Makefile.depend
+++ b/usr.bin/m4/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liby \
lib/msun \
diff --git a/usr.bin/mail/Makefile.depend b/usr.bin/mail/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/mail/Makefile.depend
+++ b/usr.bin/mail/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/makewhatis/Makefile.depend b/usr.bin/makewhatis/Makefile.depend
index 8d258df..4f4a210e3f 100644
--- a/usr.bin/makewhatis/Makefile.depend
+++ b/usr.bin/makewhatis/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
diff --git a/usr.bin/mandoc/Makefile.depend b/usr.bin/mandoc/Makefile.depend
index b6149c0..456ca6f 100644
--- a/usr.bin/mandoc/Makefile.depend
+++ b/usr.bin/mandoc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmandoc \
diff --git a/usr.bin/mesg/Makefile.depend b/usr.bin/mesg/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/mesg/Makefile.depend
+++ b/usr.bin/mesg/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/minigzip/Makefile.depend b/usr.bin/minigzip/Makefile.depend
index 8d258df..4f4a210e3f 100644
--- a/usr.bin/minigzip/Makefile.depend
+++ b/usr.bin/minigzip/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
diff --git a/usr.bin/ministat/Makefile.depend b/usr.bin/ministat/Makefile.depend
index 26b0cb7..da4f56b 100644
--- a/usr.bin/ministat/Makefile.depend
+++ b/usr.bin/ministat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/mkfifo/Makefile.depend b/usr.bin/mkfifo/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/mkfifo/Makefile.depend
+++ b/usr.bin/mkfifo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/mklocale/Makefile.depend b/usr.bin/mklocale/Makefile.depend
index 38018d7..6895869 100644
--- a/usr.bin/mklocale/Makefile.depend
+++ b/usr.bin/mklocale/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/mkstr/Makefile.depend b/usr.bin/mkstr/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/mkstr/Makefile.depend
+++ b/usr.bin/mkstr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/mktemp/Makefile.depend b/usr.bin/mktemp/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/mktemp/Makefile.depend
+++ b/usr.bin/mktemp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/mkulzma/Makefile.depend b/usr.bin/mkulzma/Makefile.depend
index 6da741b..b7653d1 100644
--- a/usr.bin/mkulzma/Makefile.depend
+++ b/usr.bin/mkulzma/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liblzma \
diff --git a/usr.bin/mkuzip/Makefile.depend b/usr.bin/mkuzip/Makefile.depend
index 8d258df..4f4a210e3f 100644
--- a/usr.bin/mkuzip/Makefile.depend
+++ b/usr.bin/mkuzip/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
diff --git a/usr.bin/msgs/Makefile.depend b/usr.bin/msgs/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/msgs/Makefile.depend
+++ b/usr.bin/msgs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/mt/Makefile.depend b/usr.bin/mt/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/mt/Makefile.depend
+++ b/usr.bin/mt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/nc/Makefile.depend b/usr.bin/nc/Makefile.depend
index 46ae5af..4de996d 100644
--- a/usr.bin/nc/Makefile.depend
+++ b/usr.bin/nc/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
diff --git a/usr.bin/ncal/Makefile.depend b/usr.bin/ncal/Makefile.depend
index 22a43b9..48604c6 100644
--- a/usr.bin/ncal/Makefile.depend
+++ b/usr.bin/ncal/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcalendar \
lib/libcompiler_rt \
lib/ncurses/ncurses \
diff --git a/usr.bin/netstat/Makefile.depend b/usr.bin/netstat/Makefile.depend
index 12d0446..225f5f8 100644
--- a/usr.bin/netstat/Makefile.depend
+++ b/usr.bin/netstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
lib/libmemstat \
diff --git a/usr.bin/newgrp/Makefile.depend b/usr.bin/newgrp/Makefile.depend
index 8c9b44e..8595bfc 100644
--- a/usr.bin/newgrp/Makefile.depend
+++ b/usr.bin/newgrp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libutil \
diff --git a/usr.bin/newkey/Makefile.depend b/usr.bin/newkey/Makefile.depend
index c04a0a5..93ea89a 100644
--- a/usr.bin/newkey/Makefile.depend
+++ b/usr.bin/newkey/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
diff --git a/usr.bin/nfsstat/Makefile.depend b/usr.bin/nfsstat/Makefile.depend
index b7d414c..384b675 100644
--- a/usr.bin/nfsstat/Makefile.depend
+++ b/usr.bin/nfsstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.bin/nice/Makefile.depend b/usr.bin/nice/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/nice/Makefile.depend
+++ b/usr.bin/nice/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/nl/Makefile.depend b/usr.bin/nl/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/nl/Makefile.depend
+++ b/usr.bin/nl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/nohup/Makefile.depend b/usr.bin/nohup/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/nohup/Makefile.depend
+++ b/usr.bin/nohup/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/opieinfo/Makefile.depend b/usr.bin/opieinfo/Makefile.depend
index 8607f43..6b42295 100644
--- a/usr.bin/opieinfo/Makefile.depend
+++ b/usr.bin/opieinfo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libopie \
diff --git a/usr.bin/opiekey/Makefile.depend b/usr.bin/opiekey/Makefile.depend
index 8607f43..6b42295 100644
--- a/usr.bin/opiekey/Makefile.depend
+++ b/usr.bin/opiekey/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libopie \
diff --git a/usr.bin/opiepasswd/Makefile.depend b/usr.bin/opiepasswd/Makefile.depend
index 8607f43..6b42295 100644
--- a/usr.bin/opiepasswd/Makefile.depend
+++ b/usr.bin/opiepasswd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libopie \
diff --git a/usr.bin/passwd/Makefile.depend b/usr.bin/passwd/Makefile.depend
index afe8c8b..35dd079 100644
--- a/usr.bin/passwd/Makefile.depend
+++ b/usr.bin/passwd/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/usr.bin/paste/Makefile.depend b/usr.bin/paste/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/paste/Makefile.depend
+++ b/usr.bin/paste/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/pathchk/Makefile.depend b/usr.bin/pathchk/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/pathchk/Makefile.depend
+++ b/usr.bin/pathchk/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/perror/Makefile.depend b/usr.bin/perror/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/perror/Makefile.depend
+++ b/usr.bin/perror/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/pr/Makefile.depend b/usr.bin/pr/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/pr/Makefile.depend
+++ b/usr.bin/pr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/printenv/Makefile.depend b/usr.bin/printenv/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/printenv/Makefile.depend
+++ b/usr.bin/printenv/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/printf/Makefile.depend b/usr.bin/printf/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/printf/Makefile.depend
+++ b/usr.bin/printf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/procstat/Makefile.depend b/usr.bin/procstat/Makefile.depend
index 232852e..a0478e2 100644
--- a/usr.bin/procstat/Makefile.depend
+++ b/usr.bin/procstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libkvm \
diff --git a/usr.bin/quota/Makefile.depend b/usr.bin/quota/Makefile.depend
index 8d990c3..40fe95d 100644
--- a/usr.bin/quota/Makefile.depend
+++ b/usr.bin/quota/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libutil \
diff --git a/usr.bin/rctl/Makefile.depend b/usr.bin/rctl/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/rctl/Makefile.depend
+++ b/usr.bin/rctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/renice/Makefile.depend b/usr.bin/renice/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/renice/Makefile.depend
+++ b/usr.bin/renice/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rev/Makefile.depend b/usr.bin/rev/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/rev/Makefile.depend
+++ b/usr.bin/rev/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/revoke/Makefile.depend b/usr.bin/revoke/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/revoke/Makefile.depend
+++ b/usr.bin/revoke/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rlogin/Makefile.depend b/usr.bin/rlogin/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/rlogin/Makefile.depend
+++ b/usr.bin/rlogin/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rpcgen/Makefile.depend b/usr.bin/rpcgen/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/rpcgen/Makefile.depend
+++ b/usr.bin/rpcgen/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rpcinfo/Makefile.depend b/usr.bin/rpcinfo/Makefile.depend
index 886683c..5de5043 100644
--- a/usr.bin/rpcinfo/Makefile.depend
+++ b/usr.bin/rpcinfo/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rs/Makefile.depend b/usr.bin/rs/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/rs/Makefile.depend
+++ b/usr.bin/rs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rsh/Makefile.depend b/usr.bin/rsh/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/rsh/Makefile.depend
+++ b/usr.bin/rsh/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/rup/Makefile.depend b/usr.bin/rup/Makefile.depend
index 30a67fa..2fa66dd 100644
--- a/usr.bin/rup/Makefile.depend
+++ b/usr.bin/rup/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.bin/ruptime/Makefile.depend b/usr.bin/ruptime/Makefile.depend
index b3c03a7..4a9f786 100644
--- a/usr.bin/ruptime/Makefile.depend
+++ b/usr.bin/ruptime/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rusers/Makefile.depend b/usr.bin/rusers/Makefile.depend
index 30a67fa..2fa66dd 100644
--- a/usr.bin/rusers/Makefile.depend
+++ b/usr.bin/rusers/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/usr.bin/rwall/Makefile.depend b/usr.bin/rwall/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.bin/rwall/Makefile.depend
+++ b/usr.bin/rwall/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/rwho/Makefile.depend b/usr.bin/rwho/Makefile.depend
index b3c03a7..4a9f786 100644
--- a/usr.bin/rwho/Makefile.depend
+++ b/usr.bin/rwho/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/script/Makefile.depend b/usr.bin/script/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/script/Makefile.depend
+++ b/usr.bin/script/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/sed/Makefile.depend b/usr.bin/sed/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/sed/Makefile.depend
+++ b/usr.bin/sed/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/seq/Makefile.depend b/usr.bin/seq/Makefile.depend
index 26b0cb7..da4f56b 100644
--- a/usr.bin/seq/Makefile.depend
+++ b/usr.bin/seq/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/showmount/Makefile.depend b/usr.bin/showmount/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.bin/showmount/Makefile.depend
+++ b/usr.bin/showmount/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/sockstat/Makefile.depend b/usr.bin/sockstat/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/sockstat/Makefile.depend
+++ b/usr.bin/sockstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/sort/Makefile.depend b/usr.bin/sort/Makefile.depend
index d95413e..7b75c5e 100644
--- a/usr.bin/sort/Makefile.depend
+++ b/usr.bin/sort/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/msun \
diff --git a/usr.bin/split/Makefile.depend b/usr.bin/split/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/split/Makefile.depend
+++ b/usr.bin/split/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/stat/Makefile.depend b/usr.bin/stat/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/stat/Makefile.depend
+++ b/usr.bin/stat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/stdbuf/Makefile.depend b/usr.bin/stdbuf/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/stdbuf/Makefile.depend
+++ b/usr.bin/stdbuf/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/su/Makefile.depend b/usr.bin/su/Makefile.depend
index 5dbe42c..67fd380 100644
--- a/usr.bin/su/Makefile.depend
+++ b/usr.bin/su/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
diff --git a/usr.bin/systat/Makefile.depend b/usr.bin/systat/Makefile.depend
index ae33ba8..846e23f 100644
--- a/usr.bin/systat/Makefile.depend
+++ b/usr.bin/systat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libkvm \
diff --git a/usr.bin/tabs/Makefile.depend b/usr.bin/tabs/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/tabs/Makefile.depend
+++ b/usr.bin/tabs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/tail/Makefile.depend b/usr.bin/tail/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/tail/Makefile.depend
+++ b/usr.bin/tail/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/talk/Makefile.depend b/usr.bin/talk/Makefile.depend
index 310bef3..e07a2f6 100644
--- a/usr.bin/talk/Makefile.depend
+++ b/usr.bin/talk/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
diff --git a/usr.bin/tar/Makefile.depend b/usr.bin/tar/Makefile.depend
index 91c0c58..7f1d531 100644
--- a/usr.bin/tar/Makefile.depend
+++ b/usr.bin/tar/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/tcopy/Makefile.depend b/usr.bin/tcopy/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/tcopy/Makefile.depend
+++ b/usr.bin/tcopy/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/tee/Makefile.depend b/usr.bin/tee/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/tee/Makefile.depend
+++ b/usr.bin/tee/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/telnet/Makefile.depend b/usr.bin/telnet/Makefile.depend
index 067677e..6da6466 100644
--- a/usr.bin/telnet/Makefile.depend
+++ b/usr.bin/telnet/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/usr.bin/tftp/Makefile.depend b/usr.bin/tftp/Makefile.depend
index 6033e4a..a0d576d 100644
--- a/usr.bin/tftp/Makefile.depend
+++ b/usr.bin/tftp/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.bin/time/Makefile.depend b/usr.bin/time/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/time/Makefile.depend
+++ b/usr.bin/time/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/tip/tip/Makefile.depend b/usr.bin/tip/tip/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/tip/tip/Makefile.depend
+++ b/usr.bin/tip/tip/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/top/Makefile.depend b/usr.bin/top/Makefile.depend
index ad0f13a..90e81ac 100644
--- a/usr.bin/top/Makefile.depend
+++ b/usr.bin/top/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libjail \
lib/libkvm \
diff --git a/usr.bin/touch/Makefile.depend b/usr.bin/touch/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/touch/Makefile.depend
+++ b/usr.bin/touch/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/tput/Makefile.depend b/usr.bin/tput/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/tput/Makefile.depend
+++ b/usr.bin/tput/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/tr/Makefile.depend b/usr.bin/tr/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/tr/Makefile.depend
+++ b/usr.bin/tr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/true/Makefile.depend b/usr.bin/true/Makefile.depend
index ed02837..05a6a1b 100644
--- a/usr.bin/true/Makefile.depend
+++ b/usr.bin/true/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
gnu/lib/libgcc \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/truncate/Makefile.depend b/usr.bin/truncate/Makefile.depend
index 40b445f..78b235b 100644
--- a/usr.bin/truncate/Makefile.depend
+++ b/usr.bin/truncate/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/usr.bin/truss/Makefile.depend.amd64 b/usr.bin/truss/Makefile.depend.amd64
index 34492d5..844c881 100644
--- a/usr.bin/truss/Makefile.depend.amd64
+++ b/usr.bin/truss/Makefile.depend.amd64
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/tset/Makefile.depend b/usr.bin/tset/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/tset/Makefile.depend
+++ b/usr.bin/tset/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/tsort/Makefile.depend b/usr.bin/tsort/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/tsort/Makefile.depend
+++ b/usr.bin/tsort/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/tty/Makefile.depend b/usr.bin/tty/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/tty/Makefile.depend
+++ b/usr.bin/tty/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ul/Makefile.depend b/usr.bin/ul/Makefile.depend
index 233a7c6..4f4df65 100644
--- a/usr.bin/ul/Makefile.depend
+++ b/usr.bin/ul/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/usr.bin/uname/Makefile.depend b/usr.bin/uname/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/uname/Makefile.depend
+++ b/usr.bin/uname/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/unexpand/Makefile.depend b/usr.bin/unexpand/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/unexpand/Makefile.depend
+++ b/usr.bin/unexpand/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/unifdef/Makefile.depend b/usr.bin/unifdef/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/unifdef/Makefile.depend
+++ b/usr.bin/unifdef/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/uniq/Makefile.depend b/usr.bin/uniq/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/uniq/Makefile.depend
+++ b/usr.bin/uniq/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/units/Makefile.depend b/usr.bin/units/Makefile.depend
index e7af95c..6fc94a4 100644
--- a/usr.bin/units/Makefile.depend
+++ b/usr.bin/units/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.bin/unvis/Makefile.depend b/usr.bin/unvis/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/unvis/Makefile.depend
+++ b/usr.bin/unvis/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/unzip/Makefile.depend b/usr.bin/unzip/Makefile.depend
index 91c0c58..7f1d531 100644
--- a/usr.bin/unzip/Makefile.depend
+++ b/usr.bin/unzip/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/usbhidaction/Makefile.depend b/usr.bin/usbhidaction/Makefile.depend
index 0cf2f69..ddc15a9 100644
--- a/usr.bin/usbhidaction/Makefile.depend
+++ b/usr.bin/usbhidaction/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libusbhid \
diff --git a/usr.bin/usbhidctl/Makefile.depend b/usr.bin/usbhidctl/Makefile.depend
index 0cf2f69..ddc15a9 100644
--- a/usr.bin/usbhidctl/Makefile.depend
+++ b/usr.bin/usbhidctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libusbhid \
diff --git a/usr.bin/users/Makefile.depend b/usr.bin/users/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/users/Makefile.depend
+++ b/usr.bin/users/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/uudecode/Makefile.depend b/usr.bin/uudecode/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/uudecode/Makefile.depend
+++ b/usr.bin/uudecode/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/uuencode/Makefile.depend b/usr.bin/uuencode/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/uuencode/Makefile.depend
+++ b/usr.bin/uuencode/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/vacation/Makefile.depend b/usr.bin/vacation/Makefile.depend
index 4f613d1..5ef7ccc 100644
--- a/usr.bin/vacation/Makefile.depend
+++ b/usr.bin/vacation/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libsmdb \
diff --git a/usr.bin/vgrind/Makefile.depend b/usr.bin/vgrind/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/vgrind/Makefile.depend
+++ b/usr.bin/vgrind/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/vi/Makefile.depend b/usr.bin/vi/Makefile.depend
index 41f7b70..358a9d3 100644
--- a/usr.bin/vi/Makefile.depend
+++ b/usr.bin/vi/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/ncurses/ncursesw \
diff --git a/usr.bin/vis/Makefile.depend b/usr.bin/vis/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/vis/Makefile.depend
+++ b/usr.bin/vis/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/vmstat/Makefile.depend b/usr.bin/vmstat/Makefile.depend
index c26fc46..11e4d51 100644
--- a/usr.bin/vmstat/Makefile.depend
+++ b/usr.bin/vmstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libkvm \
diff --git a/usr.bin/w/Makefile.depend b/usr.bin/w/Makefile.depend
index 2d49890..ae117e2 100644
--- a/usr.bin/w/Makefile.depend
+++ b/usr.bin/w/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
lib/libutil \
diff --git a/usr.bin/wall/Makefile.depend b/usr.bin/wall/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/wall/Makefile.depend
+++ b/usr.bin/wall/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/wc/Makefile.depend b/usr.bin/wc/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/wc/Makefile.depend
+++ b/usr.bin/wc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/what/Makefile.depend b/usr.bin/what/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/what/Makefile.depend
+++ b/usr.bin/what/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/whereis/Makefile.depend b/usr.bin/whereis/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/whereis/Makefile.depend
+++ b/usr.bin/whereis/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/which/Makefile.depend b/usr.bin/which/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/which/Makefile.depend
+++ b/usr.bin/which/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/who/Makefile.depend b/usr.bin/who/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/who/Makefile.depend
+++ b/usr.bin/who/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/whois/Makefile.depend b/usr.bin/whois/Makefile.depend
index 5269280..b68b4bb 100644
--- a/usr.bin/whois/Makefile.depend
+++ b/usr.bin/whois/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/write/Makefile.depend b/usr.bin/write/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/write/Makefile.depend
+++ b/usr.bin/write/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/xargs/Makefile.depend b/usr.bin/xargs/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/xargs/Makefile.depend
+++ b/usr.bin/xargs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/xinstall/Makefile.depend b/usr.bin/xinstall/Makefile.depend
index 4346241..1fca33b 100644
--- a/usr.bin/xinstall/Makefile.depend
+++ b/usr.bin/xinstall/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libutil \
diff --git a/usr.bin/xlint/lint1/Makefile.depend b/usr.bin/xlint/lint1/Makefile.depend
index 2cf17dc..bb0ee77 100644
--- a/usr.bin/xlint/lint1/Makefile.depend
+++ b/usr.bin/xlint/lint1/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
usr.bin/lex/lib \
diff --git a/usr.bin/xlint/lint2/Makefile.depend b/usr.bin/xlint/lint2/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/xlint/lint2/Makefile.depend
+++ b/usr.bin/xlint/lint2/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/xlint/xlint/Makefile.depend b/usr.bin/xlint/xlint/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/xlint/xlint/Makefile.depend
+++ b/usr.bin/xlint/xlint/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/xstr/Makefile.depend b/usr.bin/xstr/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/xstr/Makefile.depend
+++ b/usr.bin/xstr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/xz/Makefile.depend b/usr.bin/xz/Makefile.depend
index 6da741b..b7653d1 100644
--- a/usr.bin/xz/Makefile.depend
+++ b/usr.bin/xz/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liblzma \
diff --git a/usr.bin/xzdec/Makefile.depend b/usr.bin/xzdec/Makefile.depend
index 6da741b..b7653d1 100644
--- a/usr.bin/xzdec/Makefile.depend
+++ b/usr.bin/xzdec/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/liblzma \
diff --git a/usr.bin/yacc/Makefile.depend b/usr.bin/yacc/Makefile.depend
index 6caf55f..96aa2a2 100644
--- a/usr.bin/yacc/Makefile.depend
+++ b/usr.bin/yacc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/yes/Makefile.depend b/usr.bin/yes/Makefile.depend
index e9a1dda..2d9ec50 100644
--- a/usr.bin/yes/Makefile.depend
+++ b/usr.bin/yes/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ypcat/Makefile.depend b/usr.bin/ypcat/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.bin/ypcat/Makefile.depend
+++ b/usr.bin/ypcat/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ypmatch/Makefile.depend b/usr.bin/ypmatch/Makefile.depend
index 5930524..c1655db 100644
--- a/usr.bin/ypmatch/Makefile.depend
+++ b/usr.bin/ypmatch/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ypwhich/Makefile.depend b/usr.bin/ypwhich/Makefile.depend
index 1c61866..2a44c25 100644
--- a/usr.bin/ypwhich/Makefile.depend
+++ b/usr.bin/ypwhich/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
OpenPOWER on IntegriCloud