aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/cat/Makefile.depend2
-rw-r--r--bin/chflags/Makefile.depend2
-rw-r--r--bin/chio/Makefile.depend2
-rw-r--r--bin/chmod/Makefile.depend2
-rw-r--r--bin/cp/Makefile.depend2
-rw-r--r--bin/csh/Makefile.depend2
-rw-r--r--bin/date/Makefile.depend2
-rw-r--r--bin/dd/Makefile.depend2
-rw-r--r--bin/df/Makefile.depend2
-rw-r--r--bin/domainname/Makefile.depend2
-rw-r--r--bin/echo/Makefile.depend2
-rw-r--r--bin/expr/Makefile.depend2
-rw-r--r--bin/getfacl/Makefile.depend2
-rw-r--r--bin/hostname/Makefile.depend2
-rw-r--r--bin/kenv/Makefile.depend2
-rw-r--r--bin/kill/Makefile.depend2
-rw-r--r--bin/ln/Makefile.depend2
-rw-r--r--bin/ls/Makefile.depend2
-rw-r--r--bin/mkdir/Makefile.depend2
-rw-r--r--bin/mv/Makefile.depend2
-rw-r--r--bin/pax/Makefile.depend2
-rw-r--r--bin/pkill/Makefile.depend2
-rw-r--r--bin/ps/Makefile.depend3
-rw-r--r--bin/pwait/Makefile.depend2
-rw-r--r--bin/pwd/Makefile.depend2
-rw-r--r--bin/rcp/Makefile.depend2
-rw-r--r--bin/realpath/Makefile.depend2
-rw-r--r--bin/rm/Makefile.depend2
-rw-r--r--bin/rmail/Makefile.depend2
-rw-r--r--bin/rmdir/Makefile.depend2
-rw-r--r--bin/setfacl/Makefile.depend2
-rw-r--r--bin/sh/Makefile.depend2
-rw-r--r--bin/sleep/Makefile.depend2
-rw-r--r--bin/stty/Makefile.depend2
-rw-r--r--bin/sync/Makefile.depend2
-rw-r--r--bin/test/Makefile.depend2
-rw-r--r--bin/uuidgen/Makefile.depend2
-rw-r--r--cddl/lib/libavl/Makefile.depend2
-rw-r--r--cddl/lib/libctf/Makefile.depend2
-rw-r--r--cddl/lib/libdtrace/Makefile.depend2
-rw-r--r--cddl/lib/libnvpair/Makefile.depend2
-rw-r--r--cddl/lib/libumem/Makefile.depend2
-rw-r--r--cddl/lib/libuutil/Makefile.depend2
-rw-r--r--cddl/lib/libzfs/Makefile.depend2
-rw-r--r--cddl/lib/libzfs_core/Makefile.depend2
-rw-r--r--cddl/lib/libzpool/Makefile.depend2
-rw-r--r--cddl/sbin/zfs/Makefile.depend2
-rw-r--r--cddl/sbin/zpool/Makefile.depend2
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile.depend2
-rw-r--r--cddl/usr.bin/ctfdump/Makefile.depend2
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile.depend2
-rw-r--r--cddl/usr.bin/sgsmsg/Makefile.depend2
-rw-r--r--cddl/usr.bin/zinject/Makefile.depend2
-rw-r--r--cddl/usr.bin/zstreamdump/Makefile.depend2
-rw-r--r--cddl/usr.bin/ztest/Makefile.depend2
-rw-r--r--cddl/usr.sbin/dtrace/Makefile.depend3
-rw-r--r--cddl/usr.sbin/lockstat/Makefile.depend3
-rw-r--r--cddl/usr.sbin/zdb/Makefile.depend2
-rw-r--r--cddl/usr.sbin/zhack/Makefile.depend2
-rw-r--r--games/bcd/Makefile.depend2
-rw-r--r--games/caesar/Makefile.depend2
-rw-r--r--games/fortune/fortune/Makefile.depend2
-rw-r--r--games/fortune/strfile/Makefile.depend2
-rw-r--r--games/fortune/unstr/Makefile.depend2
-rw-r--r--games/grdc/Makefile.depend2
-rw-r--r--games/morse/Makefile.depend2
-rw-r--r--games/number/Makefile.depend2
-rw-r--r--games/pom/Makefile.depend2
-rw-r--r--games/ppt/Makefile.depend2
-rw-r--r--games/primes/Makefile.depend2
-rw-r--r--games/random/Makefile.depend2
-rw-r--r--gnu/lib/libdialog/Makefile.depend2
-rw-r--r--gnu/lib/libgcc/Makefile.depend2
-rw-r--r--gnu/lib/libgomp/Makefile.depend2
-rw-r--r--gnu/lib/libreadline/readline/Makefile.depend2
-rw-r--r--gnu/lib/libregex/Makefile.depend2
-rw-r--r--gnu/lib/libstdc++/Makefile.depend2
-rw-r--r--gnu/lib/libsupc++/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/addr2line/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/as/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile.depend.amd641
-rw-r--r--gnu/usr.bin/binutils/nm/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/objcopy/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/objdump/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/readelf/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/size/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/strings/Makefile.depend2
-rw-r--r--gnu/usr.bin/binutils/strip/Makefile.depend2
-rw-r--r--gnu/usr.bin/cc/c++/Makefile.depend2
-rw-r--r--gnu/usr.bin/cc/c++filt/Makefile.depend2
-rw-r--r--gnu/usr.bin/cc/cc/Makefile.depend1
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile.depend2
-rw-r--r--gnu/usr.bin/cc/cpp/Makefile.depend2
-rw-r--r--gnu/usr.bin/cc/gcov/Makefile.depend2
-rw-r--r--gnu/usr.bin/dialog/Makefile.depend2
-rw-r--r--gnu/usr.bin/diff3/Makefile.depend2
-rw-r--r--gnu/usr.bin/gdb/gdbserver/Makefile.depend2
-rw-r--r--gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/devices/grops/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/devices/grotty/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/grn/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend5
-rw-r--r--gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend2
-rw-r--r--gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend5
-rw-r--r--gnu/usr.bin/rcs/ci/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/co/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/ident/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/merge/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/rcs/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/rcsclean/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/Makefile.depend2
-rw-r--r--gnu/usr.bin/rcs/rlog/Makefile.depend2
-rw-r--r--gnu/usr.bin/sdiff/Makefile.depend2
-rw-r--r--gnu/usr.bin/texinfo/info/Makefile.depend2
-rw-r--r--gnu/usr.bin/texinfo/infokey/Makefile.depend2
-rw-r--r--gnu/usr.bin/texinfo/install-info/Makefile.depend2
-rw-r--r--gnu/usr.bin/texinfo/makeinfo/Makefile.depend2
-rw-r--r--gnu/usr.bin/texinfo/texindex/Makefile.depend2
-rw-r--r--kerberos5/lib/libasn1/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimbase/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimipcc/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimsqlite/Makefile.depend2
-rw-r--r--kerberos5/lib/libroken/Makefile.depend2
-rw-r--r--kerberos5/lib/libwind/Makefile.depend2
-rw-r--r--kerberos5/tools/asn1_compile/Makefile.depend2
-rw-r--r--kerberos5/tools/make-roken/Makefile.depend2
-rw-r--r--kerberos5/tools/slc/Makefile.depend2
-rw-r--r--lib/atf/libatf-c++/Makefile.depend2
-rw-r--r--lib/atf/libatf-c/Makefile.depend2
-rw-r--r--lib/libalias/libalias/Makefile.depend2
-rw-r--r--lib/libalias/modules/cuseeme/Makefile.depend2
-rw-r--r--lib/libalias/modules/dummy/Makefile.depend2
-rw-r--r--lib/libalias/modules/ftp/Makefile.depend2
-rw-r--r--lib/libalias/modules/irc/Makefile.depend2
-rw-r--r--lib/libalias/modules/nbt/Makefile.depend2
-rw-r--r--lib/libalias/modules/pptp/Makefile.depend2
-rw-r--r--lib/libalias/modules/skinny/Makefile.depend2
-rw-r--r--lib/libalias/modules/smedia/Makefile.depend2
-rw-r--r--lib/libauditd/Makefile.depend2
-rw-r--r--lib/libbegemot/Makefile.depend2
-rw-r--r--lib/libblocksruntime/Makefile.depend2
-rw-r--r--lib/libbluetooth/Makefile.depend2
-rw-r--r--lib/libbsm/Makefile.depend2
-rw-r--r--lib/libbz2/Makefile.depend2
-rw-r--r--lib/libc++/Makefile.depend2
-rw-r--r--lib/libc/Makefile.depend1
-rw-r--r--lib/libcalendar/Makefile.depend2
-rw-r--r--lib/libcam/Makefile.depend2
-rw-r--r--lib/libcapsicum/Makefile.depend2
-rw-r--r--lib/libcom_err/Makefile.depend2
-rw-r--r--lib/libcrypt/Makefile.depend2
-rw-r--r--lib/libcxxrt/Makefile.depend2
-rw-r--r--lib/libdevinfo/Makefile.depend2
-rw-r--r--lib/libdevstat/Makefile.depend2
-rw-r--r--lib/libdwarf/Makefile.depend2
-rw-r--r--lib/libedit/Makefile.depend2
-rw-r--r--lib/libelf/Makefile.depend2
-rw-r--r--lib/libexecinfo/Makefile.depend2
-rw-r--r--lib/libexpat/Makefile.depend2
-rw-r--r--lib/libgeom/Makefile.depend2
-rw-r--r--lib/libgpib/Makefile.depend2
-rw-r--r--lib/libgssapi/Makefile.depend2
-rw-r--r--lib/libipsec/Makefile.depend2
-rw-r--r--lib/libjail/Makefile.depend2
-rw-r--r--lib/libkiconv/Makefile.depend2
-rw-r--r--lib/libkvm/Makefile.depend2
-rw-r--r--lib/liblzma/Makefile.depend2
-rw-r--r--lib/libmagic/Makefile.depend2
-rw-r--r--lib/libmd/Makefile.depend2
-rw-r--r--lib/libmemstat/Makefile.depend2
-rw-r--r--lib/libmilter/Makefile.depend2
-rw-r--r--lib/libnetgraph/Makefile.depend2
-rw-r--r--lib/libngatm/Makefile.depend2
-rw-r--r--lib/libnv/Makefile.depend2
-rw-r--r--lib/libopie/Makefile.depend2
-rw-r--r--lib/libpam/libpam/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_chroot/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_deny/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_echo/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_exec/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_ftpusers/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_group/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_guest/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_lastlog/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_login_access/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_nologin/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_opie/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_opieaccess/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_passwdqc/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_permit/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_rhosts/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_rootok/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_securetty/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_self/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_tacplus/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_unix/Makefile.depend2
-rw-r--r--lib/libpcap/Makefile.depend2
-rw-r--r--lib/libpmc/Makefile.depend2
-rw-r--r--lib/libproc/Makefile.depend2
-rw-r--r--lib/libprocstat/Makefile.depend2
-rw-r--r--lib/librpcsec_gss/Makefile.depend2
-rw-r--r--lib/librpcsvc/Makefile.depend2
-rw-r--r--lib/librt/Makefile.depend2
-rw-r--r--lib/librtld_db/Makefile.depend2
-rw-r--r--lib/libsbuf/Makefile.depend2
-rw-r--r--lib/libsdp/Makefile.depend2
-rw-r--r--lib/libsmb/Makefile.depend2
-rw-r--r--lib/libstdbuf/Makefile.depend2
-rw-r--r--lib/libstdthreads/Makefile.depend2
-rw-r--r--lib/libtacplus/Makefile.depend2
-rw-r--r--lib/libthr/Makefile.depend2
-rw-r--r--lib/libthread_db/Makefile.depend2
-rw-r--r--lib/libufs/Makefile.depend2
-rw-r--r--lib/libugidfw/Makefile.depend2
-rw-r--r--lib/libulog/Makefile.depend2
-rw-r--r--lib/libusb/Makefile.depend2
-rw-r--r--lib/libusbhid/Makefile.depend2
-rw-r--r--lib/libutil/Makefile.depend2
-rw-r--r--lib/libvgl/Makefile.depend2
-rw-r--r--lib/libvmmapi/Makefile.depend2
-rw-r--r--lib/libwrap/Makefile.depend2
-rw-r--r--lib/libypclnt/Makefile.depend2
-rw-r--r--lib/libz/Makefile.depend2
-rw-r--r--lib/msun/Makefile.depend2
-rw-r--r--lib/ncurses/form/Makefile.depend3
-rw-r--r--lib/ncurses/formw/Makefile.depend2
-rw-r--r--lib/ncurses/menu/Makefile.depend3
-rw-r--r--lib/ncurses/menuw/Makefile.depend2
-rw-r--r--lib/ncurses/ncurses/Makefile.depend2
-rw-r--r--lib/ncurses/ncursesw/Makefile.depend2
-rw-r--r--lib/ncurses/panel/Makefile.depend3
-rw-r--r--lib/ncurses/panelw/Makefile.depend2
-rw-r--r--libexec/atrun/Makefile.depend2
-rw-r--r--libexec/bootpd/bootpgw/Makefile.depend2
-rw-r--r--libexec/bootpd/tools/bootpef/Makefile.depend2
-rw-r--r--libexec/bootpd/tools/bootptest/Makefile.depend2
-rw-r--r--libexec/comsat/Makefile.depend2
-rw-r--r--libexec/fingerd/Makefile.depend2
-rw-r--r--libexec/ftpd/Makefile.depend2
-rw-r--r--libexec/getty/Makefile.depend2
-rw-r--r--libexec/mail.local/Makefile.depend2
-rw-r--r--libexec/mknetid/Makefile.depend2
-rw-r--r--libexec/pppoed/Makefile.depend2
-rw-r--r--libexec/rbootd/Makefile.depend2
-rw-r--r--libexec/revnetgroup/Makefile.depend2
-rw-r--r--libexec/rlogind/Makefile.depend2
-rw-r--r--libexec/rpc.rquotad/Makefile.depend2
-rw-r--r--libexec/rpc.rstatd/Makefile.depend2
-rw-r--r--libexec/rpc.rusersd/Makefile.depend2
-rw-r--r--libexec/rpc.rwalld/Makefile.depend2
-rw-r--r--libexec/rpc.sprayd/Makefile.depend2
-rw-r--r--libexec/rshd/Makefile.depend2
-rw-r--r--libexec/smrsh/Makefile.depend2
-rw-r--r--libexec/talkd/Makefile.depend2
-rw-r--r--libexec/tcpd/Makefile.depend2
-rw-r--r--libexec/tftp-proxy/Makefile.depend2
-rw-r--r--libexec/tftpd/Makefile.depend2
-rw-r--r--libexec/ulog-helper/Makefile.depend2
-rw-r--r--libexec/ypxfr/Makefile.depend2
-rw-r--r--sbin/adjkerntz/Makefile.depend2
-rw-r--r--sbin/badsect/Makefile.depend2
-rw-r--r--sbin/bsdlabel/Makefile.depend2
-rw-r--r--sbin/camcontrol/Makefile.depend2
-rw-r--r--sbin/ccdconfig/Makefile.depend2
-rw-r--r--sbin/clri/Makefile.depend2
-rw-r--r--sbin/comcontrol/Makefile.depend2
-rw-r--r--sbin/conscontrol/Makefile.depend2
-rw-r--r--sbin/ddb/Makefile.depend2
-rw-r--r--sbin/devfs/Makefile.depend2
-rw-r--r--sbin/dhclient/Makefile.depend2
-rw-r--r--sbin/dmesg/Makefile.depend2
-rw-r--r--sbin/dump/Makefile.depend2
-rw-r--r--sbin/dumpfs/Makefile.depend2
-rw-r--r--sbin/dumpon/Makefile.depend2
-rw-r--r--sbin/etherswitchcfg/Makefile.depend2
-rw-r--r--sbin/fdisk/Makefile.depend2
-rw-r--r--sbin/ffsinfo/Makefile.depend2
-rw-r--r--sbin/fsck/Makefile.depend2
-rw-r--r--sbin/fsck_ffs/Makefile.depend2
-rw-r--r--sbin/fsck_msdosfs/Makefile.depend2
-rw-r--r--sbin/fsdb/Makefile.depend2
-rw-r--r--sbin/fsirand/Makefile.depend2
-rw-r--r--sbin/gbde/Makefile.depend2
-rw-r--r--sbin/geom/class/cache/Makefile.depend2
-rw-r--r--sbin/geom/class/concat/Makefile.depend2
-rw-r--r--sbin/geom/class/journal/Makefile.depend2
-rw-r--r--sbin/geom/class/label/Makefile.depend2
-rw-r--r--sbin/geom/class/mirror/Makefile.depend2
-rw-r--r--sbin/geom/class/mountver/Makefile.depend2
-rw-r--r--sbin/geom/class/multipath/Makefile.depend2
-rw-r--r--sbin/geom/class/nop/Makefile.depend2
-rw-r--r--sbin/geom/class/part/Makefile.depend2
-rw-r--r--sbin/geom/class/raid/Makefile.depend2
-rw-r--r--sbin/geom/class/raid3/Makefile.depend2
-rw-r--r--sbin/geom/class/sched/Makefile.depend2
-rw-r--r--sbin/geom/class/shsec/Makefile.depend2
-rw-r--r--sbin/geom/class/stripe/Makefile.depend2
-rw-r--r--sbin/geom/class/virstor/Makefile.depend2
-rw-r--r--sbin/geom/core/Makefile.depend2
-rw-r--r--sbin/ggate/ggatec/Makefile.depend2
-rw-r--r--sbin/ggate/ggated/Makefile.depend2
-rw-r--r--sbin/ggate/ggatel/Makefile.depend2
-rw-r--r--sbin/growfs/Makefile.depend2
-rw-r--r--sbin/gvinum/Makefile.depend2
-rw-r--r--sbin/ifconfig/Makefile.depend2
-rw-r--r--sbin/init/Makefile.depend1
-rw-r--r--sbin/ipf/ipf/Makefile.depend2
-rw-r--r--sbin/ipf/ipfs/Makefile.depend2
-rw-r--r--sbin/ipf/ipfstat/Makefile.depend2
-rw-r--r--sbin/ipf/ipftest/Makefile.depend2
-rw-r--r--sbin/ipf/ipmon/Makefile.depend2
-rw-r--r--sbin/ipf/ipnat/Makefile.depend2
-rw-r--r--sbin/ipf/ippool/Makefile.depend2
-rw-r--r--sbin/ipf/ipresend/Makefile.depend2
-rw-r--r--sbin/ipfw/Makefile.depend2
-rw-r--r--sbin/iscontrol/Makefile.depend2
-rw-r--r--sbin/kldconfig/Makefile.depend2
-rw-r--r--sbin/kldload/Makefile.depend2
-rw-r--r--sbin/kldstat/Makefile.depend2
-rw-r--r--sbin/kldunload/Makefile.depend2
-rw-r--r--sbin/ldconfig/Makefile.depend2
-rw-r--r--sbin/md5/Makefile.depend2
-rw-r--r--sbin/mdconfig/Makefile.depend2
-rw-r--r--sbin/mdmfs/Makefile.depend2
-rw-r--r--sbin/mknod/Makefile.depend2
-rw-r--r--sbin/mksnap_ffs/Makefile.depend2
-rw-r--r--sbin/mount/Makefile.depend2
-rw-r--r--sbin/mount_cd9660/Makefile.depend2
-rw-r--r--sbin/mount_fusefs/Makefile.depend2
-rw-r--r--sbin/mount_msdosfs/Makefile.depend2
-rw-r--r--sbin/mount_nfs/Makefile.depend2
-rw-r--r--sbin/mount_nullfs/Makefile.depend2
-rw-r--r--sbin/mount_udf/Makefile.depend2
-rw-r--r--sbin/mount_unionfs/Makefile.depend2
-rw-r--r--sbin/natd/Makefile.depend2
-rw-r--r--sbin/newfs/Makefile.depend2
-rw-r--r--sbin/newfs_msdos/Makefile.depend2
-rw-r--r--sbin/nfsiod/Makefile.depend2
-rw-r--r--sbin/nos-tun/Makefile.depend2
-rw-r--r--sbin/nvmecontrol/Makefile.depend2
-rw-r--r--sbin/pfctl/Makefile.depend2
-rw-r--r--sbin/pflogd/Makefile.depend2
-rw-r--r--sbin/ping/Makefile.depend4
-rw-r--r--sbin/ping6/Makefile.depend2
-rw-r--r--sbin/quotacheck/Makefile.depend2
-rw-r--r--sbin/rcorder/Makefile.depend2
-rw-r--r--sbin/reboot/Makefile.depend2
-rw-r--r--sbin/recoverdisk/Makefile.depend2
-rw-r--r--sbin/restore/Makefile.depend2
-rw-r--r--sbin/route/Makefile.depend2
-rw-r--r--sbin/routed/rtquery/Makefile.depend2
-rw-r--r--sbin/rtsol/Makefile.depend2
-rw-r--r--sbin/savecore/Makefile.depend2
-rw-r--r--sbin/setkey/Makefile.depend2
-rw-r--r--sbin/shutdown/Makefile.depend2
-rw-r--r--sbin/spppcontrol/Makefile.depend2
-rw-r--r--sbin/swapon/Makefile.depend2
-rw-r--r--sbin/sysctl/Makefile.depend2
-rw-r--r--sbin/tunefs/Makefile.depend2
-rw-r--r--sbin/umount/Makefile.depend2
-rw-r--r--share/syscons/scrnmaps/Makefile.depend2
-rw-r--r--usr.bin/apply/Makefile.depend2
-rw-r--r--usr.bin/asa/Makefile.depend2
-rw-r--r--usr.bin/at/Makefile.depend2
-rw-r--r--usr.bin/atm/sscop/Makefile.depend2
-rw-r--r--usr.bin/awk/Makefile.depend2
-rw-r--r--usr.bin/banner/Makefile.depend2
-rw-r--r--usr.bin/basename/Makefile.depend2
-rw-r--r--usr.bin/bc/Makefile.depend2
-rw-r--r--usr.bin/biff/Makefile.depend2
-rw-r--r--usr.bin/bluetooth/bthost/Makefile.depend2
-rw-r--r--usr.bin/bluetooth/btsockstat/Makefile.depend2
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/Makefile.depend2
-rw-r--r--usr.bin/bmake/Makefile.depend1
-rw-r--r--usr.bin/brandelf/Makefile.depend2
-rw-r--r--usr.bin/bsdiff/bsdiff/Makefile.depend2
-rw-r--r--usr.bin/bsdiff/bspatch/Makefile.depend2
-rw-r--r--usr.bin/bzip2/Makefile.depend2
-rw-r--r--usr.bin/bzip2recover/Makefile.depend2
-rw-r--r--usr.bin/c89/Makefile.depend2
-rw-r--r--usr.bin/c99/Makefile.depend2
-rw-r--r--usr.bin/calendar/Makefile.depend2
-rw-r--r--usr.bin/cap_mkdb/Makefile.depend2
-rw-r--r--usr.bin/catman/Makefile.depend2
-rw-r--r--usr.bin/chat/Makefile.depend2
-rw-r--r--usr.bin/checknr/Makefile.depend2
-rw-r--r--usr.bin/chpass/Makefile.depend2
-rw-r--r--usr.bin/cksum/Makefile.depend2
-rw-r--r--usr.bin/cmp/Makefile.depend2
-rw-r--r--usr.bin/col/Makefile.depend2
-rw-r--r--usr.bin/colcrt/Makefile.depend2
-rw-r--r--usr.bin/colldef/Makefile.depend2
-rw-r--r--usr.bin/colrm/Makefile.depend2
-rw-r--r--usr.bin/column/Makefile.depend2
-rw-r--r--usr.bin/comm/Makefile.depend2
-rw-r--r--usr.bin/compile_et/Makefile.depend2
-rw-r--r--usr.bin/compress/Makefile.depend2
-rw-r--r--usr.bin/cpuset/Makefile.depend2
-rw-r--r--usr.bin/csplit/Makefile.depend2
-rw-r--r--usr.bin/csup/Makefile.depend2
-rw-r--r--usr.bin/ctags/Makefile.depend2
-rw-r--r--usr.bin/ctlstat/Makefile.depend2
-rw-r--r--usr.bin/cut/Makefile.depend2
-rw-r--r--usr.bin/dirname/Makefile.depend2
-rw-r--r--usr.bin/du/Makefile.depend2
-rw-r--r--usr.bin/ee/Makefile.depend2
-rw-r--r--usr.bin/elf2aout/Makefile.depend2
-rw-r--r--usr.bin/elfdump/Makefile.depend2
-rw-r--r--usr.bin/enigma/Makefile.depend2
-rw-r--r--usr.bin/env/Makefile.depend2
-rw-r--r--usr.bin/expand/Makefile.depend2
-rw-r--r--usr.bin/false/Makefile.depend2
-rw-r--r--usr.bin/file/Makefile.depend2
-rw-r--r--usr.bin/file2c/Makefile.depend2
-rw-r--r--usr.bin/find/Makefile.depend2
-rw-r--r--usr.bin/finger/Makefile.depend2
-rw-r--r--usr.bin/fmt/Makefile.depend2
-rw-r--r--usr.bin/fold/Makefile.depend2
-rw-r--r--usr.bin/from/Makefile.depend2
-rw-r--r--usr.bin/fstat/Makefile.depend2
-rw-r--r--usr.bin/fsync/Makefile.depend2
-rw-r--r--usr.bin/ftp/Makefile.depend2
-rw-r--r--usr.bin/gcore/Makefile.depend2
-rw-r--r--usr.bin/gencat/Makefile.depend2
-rw-r--r--usr.bin/getconf/Makefile.depend2
-rw-r--r--usr.bin/getent/Makefile.depend2
-rw-r--r--usr.bin/getopt/Makefile.depend2
-rw-r--r--usr.bin/gprof/Makefile.depend2
-rw-r--r--usr.bin/grep/Makefile.depend2
-rw-r--r--usr.bin/gzip/Makefile.depend2
-rw-r--r--usr.bin/head/Makefile.depend2
-rw-r--r--usr.bin/hexdump/Makefile.depend2
-rw-r--r--usr.bin/id/Makefile.depend2
-rw-r--r--usr.bin/indent/Makefile.depend2
-rw-r--r--usr.bin/ipcrm/Makefile.depend2
-rw-r--r--usr.bin/ipcs/Makefile.depend2
-rw-r--r--usr.bin/join/Makefile.depend2
-rw-r--r--usr.bin/jot/Makefile.depend2
-rw-r--r--usr.bin/kdump/Makefile.depend2
-rw-r--r--usr.bin/keylogin/Makefile.depend2
-rw-r--r--usr.bin/keylogout/Makefile.depend2
-rw-r--r--usr.bin/killall/Makefile.depend2
-rw-r--r--usr.bin/ktrace/Makefile.depend2
-rw-r--r--usr.bin/ktrdump/Makefile.depend2
-rw-r--r--usr.bin/lam/Makefile.depend2
-rw-r--r--usr.bin/last/Makefile.depend2
-rw-r--r--usr.bin/lastcomm/Makefile.depend2
-rw-r--r--usr.bin/ldd/Makefile.depend2
-rw-r--r--usr.bin/leave/Makefile.depend2
-rw-r--r--usr.bin/less/Makefile.depend2
-rw-r--r--usr.bin/lessecho/Makefile.depend2
-rw-r--r--usr.bin/lesskey/Makefile.depend2
-rw-r--r--usr.bin/limits/Makefile.depend2
-rw-r--r--usr.bin/locale/Makefile.depend2
-rw-r--r--usr.bin/locate/bigram/Makefile.depend2
-rw-r--r--usr.bin/locate/code/Makefile.depend2
-rw-r--r--usr.bin/locate/locate/Makefile.depend2
-rw-r--r--usr.bin/lock/Makefile.depend2
-rw-r--r--usr.bin/lockf/Makefile.depend2
-rw-r--r--usr.bin/logger/Makefile.depend2
-rw-r--r--usr.bin/login/Makefile.depend2
-rw-r--r--usr.bin/logins/Makefile.depend2
-rw-r--r--usr.bin/logname/Makefile.depend2
-rw-r--r--usr.bin/look/Makefile.depend2
-rw-r--r--usr.bin/lsvfs/Makefile.depend2
-rw-r--r--usr.bin/lzmainfo/Makefile.depend2
-rw-r--r--usr.bin/m4/Makefile.depend2
-rw-r--r--usr.bin/mail/Makefile.depend2
-rw-r--r--usr.bin/makewhatis/Makefile.depend2
-rw-r--r--usr.bin/mandoc/Makefile.depend2
-rw-r--r--usr.bin/mesg/Makefile.depend2
-rw-r--r--usr.bin/minigzip/Makefile.depend2
-rw-r--r--usr.bin/ministat/Makefile.depend2
-rw-r--r--usr.bin/mkfifo/Makefile.depend2
-rw-r--r--usr.bin/mklocale/Makefile.depend2
-rw-r--r--usr.bin/mkstr/Makefile.depend2
-rw-r--r--usr.bin/mktemp/Makefile.depend2
-rw-r--r--usr.bin/mkulzma/Makefile.depend2
-rw-r--r--usr.bin/mkuzip/Makefile.depend2
-rw-r--r--usr.bin/msgs/Makefile.depend2
-rw-r--r--usr.bin/mt/Makefile.depend2
-rw-r--r--usr.bin/nc/Makefile.depend2
-rw-r--r--usr.bin/ncal/Makefile.depend2
-rw-r--r--usr.bin/netstat/Makefile.depend3
-rw-r--r--usr.bin/newgrp/Makefile.depend2
-rw-r--r--usr.bin/nfsstat/Makefile.depend2
-rw-r--r--usr.bin/nice/Makefile.depend2
-rw-r--r--usr.bin/nl/Makefile.depend2
-rw-r--r--usr.bin/nohup/Makefile.depend2
-rw-r--r--usr.bin/opieinfo/Makefile.depend2
-rw-r--r--usr.bin/opiekey/Makefile.depend2
-rw-r--r--usr.bin/opiepasswd/Makefile.depend2
-rw-r--r--usr.bin/passwd/Makefile.depend2
-rw-r--r--usr.bin/paste/Makefile.depend2
-rw-r--r--usr.bin/pathchk/Makefile.depend2
-rw-r--r--usr.bin/perror/Makefile.depend2
-rw-r--r--usr.bin/pr/Makefile.depend2
-rw-r--r--usr.bin/printenv/Makefile.depend2
-rw-r--r--usr.bin/printf/Makefile.depend2
-rw-r--r--usr.bin/procstat/Makefile.depend2
-rw-r--r--usr.bin/quota/Makefile.depend2
-rw-r--r--usr.bin/rctl/Makefile.depend2
-rw-r--r--usr.bin/renice/Makefile.depend2
-rw-r--r--usr.bin/rev/Makefile.depend2
-rw-r--r--usr.bin/revoke/Makefile.depend2
-rw-r--r--usr.bin/rlogin/Makefile.depend2
-rw-r--r--usr.bin/rpcgen/Makefile.depend2
-rw-r--r--usr.bin/rpcinfo/Makefile.depend2
-rw-r--r--usr.bin/rs/Makefile.depend2
-rw-r--r--usr.bin/rsh/Makefile.depend2
-rw-r--r--usr.bin/rup/Makefile.depend2
-rw-r--r--usr.bin/ruptime/Makefile.depend2
-rw-r--r--usr.bin/rusers/Makefile.depend2
-rw-r--r--usr.bin/rwall/Makefile.depend2
-rw-r--r--usr.bin/rwho/Makefile.depend2
-rw-r--r--usr.bin/script/Makefile.depend2
-rw-r--r--usr.bin/sed/Makefile.depend2
-rw-r--r--usr.bin/seq/Makefile.depend2
-rw-r--r--usr.bin/showmount/Makefile.depend2
-rw-r--r--usr.bin/sockstat/Makefile.depend2
-rw-r--r--usr.bin/sort/Makefile.depend2
-rw-r--r--usr.bin/split/Makefile.depend2
-rw-r--r--usr.bin/stat/Makefile.depend2
-rw-r--r--usr.bin/stdbuf/Makefile.depend2
-rw-r--r--usr.bin/su/Makefile.depend2
-rw-r--r--usr.bin/systat/Makefile.depend2
-rw-r--r--usr.bin/tabs/Makefile.depend2
-rw-r--r--usr.bin/tail/Makefile.depend2
-rw-r--r--usr.bin/talk/Makefile.depend3
-rw-r--r--usr.bin/tcopy/Makefile.depend2
-rw-r--r--usr.bin/tee/Makefile.depend2
-rw-r--r--usr.bin/tftp/Makefile.depend2
-rw-r--r--usr.bin/time/Makefile.depend2
-rw-r--r--usr.bin/tip/tip/Makefile.depend2
-rw-r--r--usr.bin/top/Makefile.depend3
-rw-r--r--usr.bin/touch/Makefile.depend2
-rw-r--r--usr.bin/tput/Makefile.depend2
-rw-r--r--usr.bin/tr/Makefile.depend2
-rw-r--r--usr.bin/true/Makefile.depend2
-rw-r--r--usr.bin/truncate/Makefile.depend2
-rw-r--r--usr.bin/truss/Makefile.depend.amd642
-rw-r--r--usr.bin/tset/Makefile.depend2
-rw-r--r--usr.bin/tsort/Makefile.depend2
-rw-r--r--usr.bin/tty/Makefile.depend2
-rw-r--r--usr.bin/ul/Makefile.depend2
-rw-r--r--usr.bin/uname/Makefile.depend2
-rw-r--r--usr.bin/unexpand/Makefile.depend2
-rw-r--r--usr.bin/unifdef/Makefile.depend2
-rw-r--r--usr.bin/uniq/Makefile.depend2
-rw-r--r--usr.bin/units/Makefile.depend2
-rw-r--r--usr.bin/unvis/Makefile.depend2
-rw-r--r--usr.bin/usbhidaction/Makefile.depend2
-rw-r--r--usr.bin/usbhidctl/Makefile.depend2
-rw-r--r--usr.bin/users/Makefile.depend2
-rw-r--r--usr.bin/uudecode/Makefile.depend2
-rw-r--r--usr.bin/uuencode/Makefile.depend2
-rw-r--r--usr.bin/vacation/Makefile.depend2
-rw-r--r--usr.bin/vgrind/Makefile.depend2
-rw-r--r--usr.bin/vi/Makefile.depend2
-rw-r--r--usr.bin/vis/Makefile.depend2
-rw-r--r--usr.bin/vmstat/Makefile.depend2
-rw-r--r--usr.bin/w/Makefile.depend2
-rw-r--r--usr.bin/wall/Makefile.depend2
-rw-r--r--usr.bin/wc/Makefile.depend2
-rw-r--r--usr.bin/what/Makefile.depend2
-rw-r--r--usr.bin/whereis/Makefile.depend2
-rw-r--r--usr.bin/which/Makefile.depend2
-rw-r--r--usr.bin/who/Makefile.depend2
-rw-r--r--usr.bin/whois/Makefile.depend2
-rw-r--r--usr.bin/write/Makefile.depend2
-rw-r--r--usr.bin/xargs/Makefile.depend2
-rw-r--r--usr.bin/xinstall/Makefile.depend2
-rw-r--r--usr.bin/xlint/lint1/Makefile.depend2
-rw-r--r--usr.bin/xlint/lint2/Makefile.depend2
-rw-r--r--usr.bin/xlint/xlint/Makefile.depend2
-rw-r--r--usr.bin/xstr/Makefile.depend2
-rw-r--r--usr.bin/xz/Makefile.depend2
-rw-r--r--usr.bin/xzdec/Makefile.depend2
-rw-r--r--usr.bin/yacc/Makefile.depend2
-rw-r--r--usr.bin/yes/Makefile.depend2
-rw-r--r--usr.bin/ypcat/Makefile.depend2
-rw-r--r--usr.bin/ypmatch/Makefile.depend2
-rw-r--r--usr.bin/ypwhich/Makefile.depend2
-rw-r--r--usr.sbin/ac/Makefile.depend2
-rw-r--r--usr.sbin/accton/Makefile.depend2
-rw-r--r--usr.sbin/acpi/acpiconf/Makefile.depend2
-rw-r--r--usr.sbin/acpi/acpidb/Makefile.depend2
-rw-r--r--usr.sbin/acpi/acpidump/Makefile.depend2
-rw-r--r--usr.sbin/acpi/iasl/Makefile.depend2
-rw-r--r--usr.sbin/amd/amd/Makefile.depend2
-rw-r--r--usr.sbin/amd/amq/Makefile.depend2
-rw-r--r--usr.sbin/amd/fixmount/Makefile.depend2
-rw-r--r--usr.sbin/amd/fsinfo/Makefile.depend2
-rw-r--r--usr.sbin/amd/hlfsd/Makefile.depend2
-rw-r--r--usr.sbin/amd/mk-amd-map/Makefile.depend2
-rw-r--r--usr.sbin/amd/pawd/Makefile.depend2
-rw-r--r--usr.sbin/amd/wire-test/Makefile.depend2
-rw-r--r--usr.sbin/ancontrol/Makefile.depend2
-rw-r--r--usr.sbin/apm/Makefile.depend2
-rw-r--r--usr.sbin/arp/Makefile.depend2
-rw-r--r--usr.sbin/asf/Makefile.depend2
-rw-r--r--usr.sbin/audit/Makefile.depend2
-rw-r--r--usr.sbin/auditd/Makefile.depend2
-rw-r--r--usr.sbin/auditreduce/Makefile.depend2
-rw-r--r--usr.sbin/authpf/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/ath3kfw/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/bcmfw/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/bt3cfw/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/btpand/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/hccontrol/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/hcsecd/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/hcseriald/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/l2control/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/l2ping/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/Makefile.depend2
-rw-r--r--usr.sbin/bluetooth/sdpd/Makefile.depend2
-rw-r--r--usr.sbin/boot0cfg/Makefile.depend2
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile.depend2
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile.depend2
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/gensnmptree/Makefile.depend2
-rw-r--r--usr.sbin/btxld/Makefile.depend2
-rw-r--r--usr.sbin/cdcontrol/Makefile.depend2
-rw-r--r--usr.sbin/chkgrp/Makefile.depend2
-rw-r--r--usr.sbin/chown/Makefile.depend2
-rw-r--r--usr.sbin/chroot/Makefile.depend2
-rw-r--r--usr.sbin/ckdist/Makefile.depend2
-rw-r--r--usr.sbin/clear_locks/Makefile.depend2
-rw-r--r--usr.sbin/config/Makefile.depend2
-rw-r--r--usr.sbin/cpucontrol/Makefile.depend2
-rw-r--r--usr.sbin/cron/cron/Makefile.depend2
-rw-r--r--usr.sbin/cron/crontab/Makefile.depend2
-rw-r--r--usr.sbin/crunch/crunchgen/Makefile.depend2
-rw-r--r--usr.sbin/crunch/crunchide/Makefile.depend2
-rw-r--r--usr.sbin/ctladm/Makefile.depend2
-rw-r--r--usr.sbin/ctm/ctm/Makefile.depend2
-rw-r--r--usr.sbin/ctm/ctm_dequeue/Makefile.depend2
-rw-r--r--usr.sbin/ctm/ctm_rmail/Makefile.depend2
-rw-r--r--usr.sbin/ctm/ctm_smail/Makefile.depend2
-rw-r--r--usr.sbin/daemon/Makefile.depend2
-rw-r--r--usr.sbin/dconschat/Makefile.depend2
-rw-r--r--usr.sbin/devinfo/Makefile.depend2
-rw-r--r--usr.sbin/digictl/Makefile.depend2
-rw-r--r--usr.sbin/diskinfo/Makefile.depend2
-rw-r--r--usr.sbin/dumpcis/Makefile.depend2
-rw-r--r--usr.sbin/editmap/Makefile.depend2
-rw-r--r--usr.sbin/edquota/Makefile.depend2
-rw-r--r--usr.sbin/extattr/Makefile.depend2
-rw-r--r--usr.sbin/extattrctl/Makefile.depend2
-rw-r--r--usr.sbin/faithd/Makefile.depend2
-rw-r--r--usr.sbin/fdcontrol/Makefile.depend2
-rw-r--r--usr.sbin/fdformat/Makefile.depend2
-rw-r--r--usr.sbin/fdread/Makefile.depend2
-rw-r--r--usr.sbin/fdwrite/Makefile.depend2
-rw-r--r--usr.sbin/fifolog/fifolog_create/Makefile.depend2
-rw-r--r--usr.sbin/fifolog/fifolog_reader/Makefile.depend2
-rw-r--r--usr.sbin/fifolog/fifolog_writer/Makefile.depend2
-rw-r--r--usr.sbin/flowctl/Makefile.depend2
-rw-r--r--usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend2
-rw-r--r--usr.sbin/fwcontrol/Makefile.depend2
-rw-r--r--usr.sbin/getfmac/Makefile.depend2
-rw-r--r--usr.sbin/getpmac/Makefile.depend2
-rw-r--r--usr.sbin/gpioctl/Makefile.depend2
-rw-r--r--usr.sbin/gstat/Makefile.depend2
-rw-r--r--usr.sbin/i2c/Makefile.depend2
-rw-r--r--usr.sbin/ifmcstat/Makefile.depend2
-rw-r--r--usr.sbin/inetd/Makefile.depend2
-rw-r--r--usr.sbin/iostat/Makefile.depend2
-rw-r--r--usr.sbin/ip6addrctl/Makefile.depend2
-rw-r--r--usr.sbin/ipfwpcap/Makefile.depend2
-rw-r--r--usr.sbin/jail/Makefile.depend2
-rw-r--r--usr.sbin/jexec/Makefile.depend2
-rw-r--r--usr.sbin/jls/Makefile.depend2
-rw-r--r--usr.sbin/kbdcontrol/Makefile.depend2
-rw-r--r--usr.sbin/kbdmap/Makefile.depend2
-rw-r--r--usr.sbin/kgmon/Makefile.depend2
-rw-r--r--usr.sbin/kldxref/Makefile.depend2
-rw-r--r--usr.sbin/lastlogin/Makefile.depend2
-rw-r--r--usr.sbin/lmcconfig/Makefile.depend2
-rw-r--r--usr.sbin/lpr/chkprintcap/Makefile.depend2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/Makefile.depend2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend2
-rw-r--r--usr.sbin/lpr/filters/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lpc/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lpd/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lpq/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lpr/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lprm/Makefile.depend2
-rw-r--r--usr.sbin/lpr/lptest/Makefile.depend2
-rw-r--r--usr.sbin/lpr/pac/Makefile.depend2
-rw-r--r--usr.sbin/lptcontrol/Makefile.depend2
-rw-r--r--usr.sbin/mailstats/Makefile.depend2
-rw-r--r--usr.sbin/mailwrapper/Makefile.depend2
-rw-r--r--usr.sbin/makefs/Makefile.depend2
-rw-r--r--usr.sbin/makemap/Makefile.depend2
-rw-r--r--usr.sbin/memcontrol/Makefile.depend2
-rw-r--r--usr.sbin/mfiutil/Makefile.depend2
-rw-r--r--usr.sbin/mixer/Makefile.depend2
-rw-r--r--usr.sbin/mld6query/Makefile.depend2
-rw-r--r--usr.sbin/mlxcontrol/Makefile.depend2
-rw-r--r--usr.sbin/mountd/Makefile.depend2
-rw-r--r--usr.sbin/moused/Makefile.depend2
-rw-r--r--usr.sbin/mptable/Makefile.depend2
-rw-r--r--usr.sbin/mptutil/Makefile.depend2
-rw-r--r--usr.sbin/mtest/Makefile.depend2
-rw-r--r--usr.sbin/mtree/Makefile.depend2
-rw-r--r--usr.sbin/ndiscvt/Makefile.depend2
-rw-r--r--usr.sbin/ndp/Makefile.depend2
-rw-r--r--usr.sbin/newsyslog/Makefile.depend2
-rw-r--r--usr.sbin/nfscbd/Makefile.depend2
-rw-r--r--usr.sbin/nfsd/Makefile.depend2
-rw-r--r--usr.sbin/nfsdumpstate/Makefile.depend2
-rw-r--r--usr.sbin/nfsrevoke/Makefile.depend2
-rw-r--r--usr.sbin/nfsuserd/Makefile.depend2
-rw-r--r--usr.sbin/ngctl/Makefile.depend2
-rw-r--r--usr.sbin/nghook/Makefile.depend2
-rw-r--r--usr.sbin/nologin/Makefile.depend1
-rw-r--r--usr.sbin/nscd/Makefile.depend2
-rw-r--r--usr.sbin/ntp/sntp/Makefile.depend2
-rw-r--r--usr.sbin/pciconf/Makefile.depend2
-rw-r--r--usr.sbin/pmcannotate/Makefile.depend2
-rw-r--r--usr.sbin/pmccontrol/Makefile.depend2
-rw-r--r--usr.sbin/pmcstat/Makefile.depend2
-rw-r--r--usr.sbin/portsnap/make_index/Makefile.depend2
-rw-r--r--usr.sbin/portsnap/phttpget/Makefile.depend2
-rw-r--r--usr.sbin/powerd/Makefile.depend2
-rw-r--r--usr.sbin/pppctl/Makefile.depend2
-rw-r--r--usr.sbin/praliases/Makefile.depend2
-rw-r--r--usr.sbin/praudit/Makefile.depend2
-rw-r--r--usr.sbin/procctl/Makefile.depend2
-rw-r--r--usr.sbin/pstat/Makefile.depend2
-rw-r--r--usr.sbin/pw/Makefile.depend2
-rw-r--r--usr.sbin/pwd_mkdb/Makefile.depend2
-rw-r--r--usr.sbin/quot/Makefile.depend2
-rw-r--r--usr.sbin/quotaon/Makefile.depend2
-rw-r--r--usr.sbin/rarpd/Makefile.depend2
-rw-r--r--usr.sbin/repquota/Makefile.depend2
-rw-r--r--usr.sbin/rip6query/Makefile.depend2
-rw-r--r--usr.sbin/rmt/Makefile.depend2
-rw-r--r--usr.sbin/route6d/Makefile.depend2
-rw-r--r--usr.sbin/rpc.lockd/Makefile.depend2
-rw-r--r--usr.sbin/rpc.statd/Makefile.depend2
-rw-r--r--usr.sbin/rpc.umntall/Makefile.depend2
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile.depend2
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile.depend2
-rw-r--r--usr.sbin/rpc.ypxfrd/Makefile.depend2
-rw-r--r--usr.sbin/rpcbind/Makefile.depend2
-rw-r--r--usr.sbin/rrenumd/Makefile.depend2
-rw-r--r--usr.sbin/rtadvctl/Makefile.depend2
-rw-r--r--usr.sbin/rtadvd/Makefile.depend2
-rw-r--r--usr.sbin/rtprio/Makefile.depend2
-rw-r--r--usr.sbin/rtsold/Makefile.depend2
-rw-r--r--usr.sbin/rwhod/Makefile.depend2
-rw-r--r--usr.sbin/sa/Makefile.depend2
-rw-r--r--usr.sbin/services_mkdb/Makefile.depend2
-rw-r--r--usr.sbin/setfib/Makefile.depend2
-rw-r--r--usr.sbin/setfmac/Makefile.depend2
-rw-r--r--usr.sbin/setpmac/Makefile.depend2
-rw-r--r--usr.sbin/sicontrol/Makefile.depend2
-rw-r--r--usr.sbin/smbmsg/Makefile.depend2
-rw-r--r--usr.sbin/snapinfo/Makefile.depend2
-rw-r--r--usr.sbin/spray/Makefile.depend2
-rw-r--r--usr.sbin/syslogd/Makefile.depend2
-rw-r--r--usr.sbin/tcpdchk/Makefile.depend2
-rw-r--r--usr.sbin/tcpdmatch/Makefile.depend2
-rw-r--r--usr.sbin/tcpdrop/Makefile.depend2
-rw-r--r--usr.sbin/timed/timed/Makefile.depend2
-rw-r--r--usr.sbin/timed/timedc/Makefile.depend2
-rw-r--r--usr.sbin/traceroute/Makefile.depend2
-rw-r--r--usr.sbin/traceroute6/Makefile.depend2
-rw-r--r--usr.sbin/trpt/Makefile.depend2
-rw-r--r--usr.sbin/tzsetup/Makefile.depend2
-rw-r--r--usr.sbin/uathload/Makefile.depend2
-rw-r--r--usr.sbin/ugidfw/Makefile.depend2
-rw-r--r--usr.sbin/uhsoctl/Makefile.depend2
-rw-r--r--usr.sbin/usbconfig/Makefile.depend2
-rw-r--r--usr.sbin/usbdump/Makefile.depend2
-rw-r--r--usr.sbin/utx/Makefile.depend2
-rw-r--r--usr.sbin/vidcontrol/Makefile.depend2
-rw-r--r--usr.sbin/vipw/Makefile.depend2
-rw-r--r--usr.sbin/wake/Makefile.depend2
-rw-r--r--usr.sbin/watch/Makefile.depend2
-rw-r--r--usr.sbin/watchdogd/Makefile.depend2
-rw-r--r--usr.sbin/wlandebug/Makefile.depend2
-rw-r--r--usr.sbin/wpa/hostapd_cli/Makefile.depend2
-rw-r--r--usr.sbin/wpa/ndis_events/Makefile.depend2
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile.depend2
-rw-r--r--usr.sbin/wpa/wpa_passphrase/Makefile.depend2
-rw-r--r--usr.sbin/yp_mkdb/Makefile.depend2
-rw-r--r--usr.sbin/ypbind/Makefile.depend2
-rw-r--r--usr.sbin/yppoll/Makefile.depend2
-rw-r--r--usr.sbin/yppush/Makefile.depend2
-rw-r--r--usr.sbin/ypserv/Makefile.depend2
-rw-r--r--usr.sbin/ypset/Makefile.depend2
-rw-r--r--usr.sbin/zic/zdump/Makefile.depend2
-rw-r--r--usr.sbin/zic/zic/Makefile.depend2
815 files changed, 1674 insertions, 23 deletions
diff --git a/bin/cat/Makefile.depend b/bin/cat/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/cat/Makefile.depend
+++ b/bin/cat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/chflags/Makefile.depend b/bin/chflags/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/chflags/Makefile.depend
+++ b/bin/chflags/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/chio/Makefile.depend b/bin/chio/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/chio/Makefile.depend
+++ b/bin/chio/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/chmod/Makefile.depend b/bin/chmod/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/chmod/Makefile.depend
+++ b/bin/chmod/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/cp/Makefile.depend b/bin/cp/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/cp/Makefile.depend
+++ b/bin/cp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/csh/Makefile.depend b/bin/csh/Makefile.depend
index 09144cacba33..8792a2fdc9d0 100644
--- a/bin/csh/Makefile.depend
+++ b/bin/csh/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/ncurses/ncurses \
diff --git a/bin/date/Makefile.depend b/bin/date/Makefile.depend
index 591ea4c790a0..b3c03a71825a 100644
--- a/bin/date/Makefile.depend
+++ b/bin/date/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/protocols \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/dd/Makefile.depend b/bin/dd/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/dd/Makefile.depend
+++ b/bin/dd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/df/Makefile.depend b/bin/df/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/bin/df/Makefile.depend
+++ b/bin/df/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/bin/domainname/Makefile.depend b/bin/domainname/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/domainname/Makefile.depend
+++ b/bin/domainname/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/echo/Makefile.depend b/bin/echo/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/echo/Makefile.depend
+++ b/bin/echo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/expr/Makefile.depend b/bin/expr/Makefile.depend
index ce3b6ab0d1b3..26e188813d66 100644
--- a/bin/expr/Makefile.depend
+++ b/bin/expr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/getfacl/Makefile.depend b/bin/getfacl/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/getfacl/Makefile.depend
+++ b/bin/getfacl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/hostname/Makefile.depend b/bin/hostname/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/hostname/Makefile.depend
+++ b/bin/hostname/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/kenv/Makefile.depend b/bin/kenv/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/kenv/Makefile.depend
+++ b/bin/kenv/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/kill/Makefile.depend b/bin/kill/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/kill/Makefile.depend
+++ b/bin/kill/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/ln/Makefile.depend b/bin/ln/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/ln/Makefile.depend
+++ b/bin/ln/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/ls/Makefile.depend b/bin/ls/Makefile.depend
index ad3c317dabfe..b8efbdcd65f1 100644
--- a/bin/ls/Makefile.depend
+++ b/bin/ls/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
lib/ncurses/ncurses \
diff --git a/bin/mkdir/Makefile.depend b/bin/mkdir/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/mkdir/Makefile.depend
+++ b/bin/mkdir/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/mv/Makefile.depend b/bin/mv/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/mv/Makefile.depend
+++ b/bin/mv/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/pax/Makefile.depend b/bin/pax/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/pax/Makefile.depend
+++ b/bin/pax/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/pkill/Makefile.depend b/bin/pkill/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/bin/pkill/Makefile.depend
+++ b/bin/pkill/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/bin/ps/Makefile.depend b/bin/ps/Makefile.depend
index d0dee83e31ae..55f64b8f923e 100644
--- a/bin/ps/Makefile.depend
+++ b/bin/ps/Makefile.depend
@@ -3,12 +3,15 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
+ lib/libjail \
lib/libkvm \
lib/msun \
diff --git a/bin/pwait/Makefile.depend b/bin/pwait/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/pwait/Makefile.depend
+++ b/bin/pwait/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/pwd/Makefile.depend b/bin/pwd/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/pwd/Makefile.depend
+++ b/bin/pwd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/rcp/Makefile.depend b/bin/rcp/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/rcp/Makefile.depend
+++ b/bin/rcp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/realpath/Makefile.depend b/bin/realpath/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/bin/realpath/Makefile.depend
+++ b/bin/realpath/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/rm/Makefile.depend b/bin/rm/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/rm/Makefile.depend
+++ b/bin/rm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/rmail/Makefile.depend b/bin/rmail/Makefile.depend
index 5d4653b26ee4..369993741a21 100644
--- a/bin/rmail/Makefile.depend
+++ b/bin/rmail/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libutil \
diff --git a/bin/rmdir/Makefile.depend b/bin/rmdir/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/rmdir/Makefile.depend
+++ b/bin/rmdir/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/setfacl/Makefile.depend b/bin/setfacl/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/setfacl/Makefile.depend
+++ b/bin/setfacl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/sh/Makefile.depend b/bin/sh/Makefile.depend
index 1ce8bcc32cea..8c34e2e9ee31 100644
--- a/bin/sh/Makefile.depend
+++ b/bin/sh/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/bin/sleep/Makefile.depend b/bin/sleep/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/sleep/Makefile.depend
+++ b/bin/sleep/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/stty/Makefile.depend b/bin/stty/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/stty/Makefile.depend
+++ b/bin/stty/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/sync/Makefile.depend b/bin/sync/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/bin/sync/Makefile.depend
+++ b/bin/sync/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/test/Makefile.depend b/bin/test/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/bin/test/Makefile.depend
+++ b/bin/test/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/uuidgen/Makefile.depend b/bin/uuidgen/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/bin/uuidgen/Makefile.depend
+++ b/bin/uuidgen/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/cddl/lib/libavl/Makefile.depend b/cddl/lib/libavl/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/cddl/lib/libavl/Makefile.depend
+++ b/cddl/lib/libavl/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/cddl/lib/libctf/Makefile.depend b/cddl/lib/libctf/Makefile.depend
index 7cebd167f56b..8289d12000c8 100644
--- a/cddl/lib/libctf/Makefile.depend
+++ b/cddl/lib/libctf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libz \
diff --git a/cddl/lib/libdtrace/Makefile.depend b/cddl/lib/libdtrace/Makefile.depend
index 3ecdaf9d9f7e..8f7dd109b8ff 100644
--- a/cddl/lib/libdtrace/Makefile.depend
+++ b/cddl/lib/libdtrace/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libproc \
diff --git a/cddl/lib/libnvpair/Makefile.depend b/cddl/lib/libnvpair/Makefile.depend
index c0e2c4ad739d..26b0cb7f5dde 100644
--- a/cddl/lib/libnvpair/Makefile.depend
+++ b/cddl/lib/libnvpair/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/cddl/lib/libumem/Makefile.depend b/cddl/lib/libumem/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/cddl/lib/libumem/Makefile.depend
+++ b/cddl/lib/libumem/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/cddl/lib/libuutil/Makefile.depend b/cddl/lib/libuutil/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/cddl/lib/libuutil/Makefile.depend
+++ b/cddl/lib/libuutil/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/cddl/lib/libzfs/Makefile.depend b/cddl/lib/libzfs/Makefile.depend
index 21b3f4a4d49c..c37dc06029e6 100644
--- a/cddl/lib/libzfs/Makefile.depend
+++ b/cddl/lib/libzfs/Makefile.depend
@@ -6,11 +6,13 @@ DIRDEPS = \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libzfs_core \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
diff --git a/cddl/lib/libzfs_core/Makefile.depend b/cddl/lib/libzfs_core/Makefile.depend
index 5491942bf46e..d4b30864d0e6 100644
--- a/cddl/lib/libzfs_core/Makefile.depend
+++ b/cddl/lib/libzfs_core/Makefile.depend
@@ -4,11 +4,13 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
cddl/lib/libnvpair \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/cddl/lib/libzpool/Makefile.depend b/cddl/lib/libzpool/Makefile.depend
index f7e66f1c71d7..e6ee354f02f6 100644
--- a/cddl/lib/libzpool/Makefile.depend
+++ b/cddl/lib/libzpool/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libthr \
diff --git a/cddl/sbin/zfs/Makefile.depend b/cddl/sbin/zfs/Makefile.depend
index ea888b8dd98f..bbd5273b1c9b 100644
--- a/cddl/sbin/zfs/Makefile.depend
+++ b/cddl/sbin/zfs/Makefile.depend
@@ -8,11 +8,13 @@ DIRDEPS = \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/sbin/zpool/Makefile.depend b/cddl/sbin/zpool/Makefile.depend
index 21820009e110..ee2b9c1e6e66 100644
--- a/cddl/sbin/zpool/Makefile.depend
+++ b/cddl/sbin/zpool/Makefile.depend
@@ -9,11 +9,13 @@ DIRDEPS = \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/usr.bin/ctfconvert/Makefile.depend b/cddl/usr.bin/ctfconvert/Makefile.depend
index 0dfef4dcd518..6a7ea61cc73b 100644
--- a/cddl/usr.bin/ctfconvert/Makefile.depend
+++ b/cddl/usr.bin/ctfconvert/Makefile.depend
@@ -4,11 +4,13 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
cddl/lib/libctf \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdwarf \
lib/libelf \
diff --git a/cddl/usr.bin/ctfdump/Makefile.depend b/cddl/usr.bin/ctfdump/Makefile.depend
index ada171346726..2dd7922d54ae 100644
--- a/cddl/usr.bin/ctfdump/Makefile.depend
+++ b/cddl/usr.bin/ctfdump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libthr \
diff --git a/cddl/usr.bin/ctfmerge/Makefile.depend b/cddl/usr.bin/ctfmerge/Makefile.depend
index 0dfef4dcd518..6a7ea61cc73b 100644
--- a/cddl/usr.bin/ctfmerge/Makefile.depend
+++ b/cddl/usr.bin/ctfmerge/Makefile.depend
@@ -4,11 +4,13 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
cddl/lib/libctf \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdwarf \
lib/libelf \
diff --git a/cddl/usr.bin/sgsmsg/Makefile.depend b/cddl/usr.bin/sgsmsg/Makefile.depend
index df2384b66d87..659d7cca1ad8 100644
--- a/cddl/usr.bin/sgsmsg/Makefile.depend
+++ b/cddl/usr.bin/sgsmsg/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
diff --git a/cddl/usr.bin/zinject/Makefile.depend b/cddl/usr.bin/zinject/Makefile.depend
index 866f4dfca128..672391411234 100644
--- a/cddl/usr.bin/zinject/Makefile.depend
+++ b/cddl/usr.bin/zinject/Makefile.depend
@@ -9,11 +9,13 @@ DIRDEPS = \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/usr.bin/zstreamdump/Makefile.depend b/cddl/usr.bin/zstreamdump/Makefile.depend
index 7b76f1bf9ac6..e31b2b34708f 100644
--- a/cddl/usr.bin/zstreamdump/Makefile.depend
+++ b/cddl/usr.bin/zstreamdump/Makefile.depend
@@ -7,11 +7,13 @@ DIRDEPS = \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libzpool \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libthr \
diff --git a/cddl/usr.bin/ztest/Makefile.depend b/cddl/usr.bin/ztest/Makefile.depend
index d6ce1e90a61c..0c093416d1b6 100644
--- a/cddl/usr.bin/ztest/Makefile.depend
+++ b/cddl/usr.bin/ztest/Makefile.depend
@@ -10,11 +10,13 @@ DIRDEPS = \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/usr.sbin/dtrace/Makefile.depend b/cddl/usr.sbin/dtrace/Makefile.depend
index e5f3c82c5133..516fe6780d65 100644
--- a/cddl/usr.sbin/dtrace/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/Makefile.depend
@@ -5,12 +5,15 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
cddl/lib/libctf \
cddl/lib/libdtrace \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/libelf \
lib/libproc \
lib/librtld_db \
diff --git a/cddl/usr.sbin/lockstat/Makefile.depend b/cddl/usr.sbin/lockstat/Makefile.depend
index e5e0670ecbf5..1accae89ba85 100644
--- a/cddl/usr.sbin/lockstat/Makefile.depend
+++ b/cddl/usr.sbin/lockstat/Makefile.depend
@@ -5,12 +5,15 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
cddl/lib/libctf \
cddl/lib/libdtrace \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/libelf \
lib/libproc \
lib/librt \
diff --git a/cddl/usr.sbin/zdb/Makefile.depend b/cddl/usr.sbin/zdb/Makefile.depend
index 866f4dfca128..672391411234 100644
--- a/cddl/usr.sbin/zdb/Makefile.depend
+++ b/cddl/usr.sbin/zdb/Makefile.depend
@@ -9,11 +9,13 @@ DIRDEPS = \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/usr.sbin/zhack/Makefile.depend b/cddl/usr.sbin/zhack/Makefile.depend
index 866f4dfca128..672391411234 100644
--- a/cddl/usr.sbin/zhack/Makefile.depend
+++ b/cddl/usr.sbin/zhack/Makefile.depend
@@ -9,11 +9,13 @@ DIRDEPS = \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/games/bcd/Makefile.depend b/games/bcd/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/bcd/Makefile.depend
+++ b/games/bcd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/caesar/Makefile.depend b/games/caesar/Makefile.depend
index c0e2c4ad739d..26b0cb7f5dde 100644
--- a/games/caesar/Makefile.depend
+++ b/games/caesar/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/games/fortune/fortune/Makefile.depend b/games/fortune/fortune/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/fortune/fortune/Makefile.depend
+++ b/games/fortune/fortune/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/fortune/strfile/Makefile.depend b/games/fortune/strfile/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/fortune/strfile/Makefile.depend
+++ b/games/fortune/strfile/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/fortune/unstr/Makefile.depend b/games/fortune/unstr/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/fortune/unstr/Makefile.depend
+++ b/games/fortune/unstr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/grdc/Makefile.depend b/games/grdc/Makefile.depend
index dd43fad9b357..233a7c6cd0b8 100644
--- a/games/grdc/Makefile.depend
+++ b/games/grdc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/games/morse/Makefile.depend b/games/morse/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/morse/Makefile.depend
+++ b/games/morse/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/number/Makefile.depend b/games/number/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/number/Makefile.depend
+++ b/games/number/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/pom/Makefile.depend b/games/pom/Makefile.depend
index c0e2c4ad739d..26b0cb7f5dde 100644
--- a/games/pom/Makefile.depend
+++ b/games/pom/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/games/ppt/Makefile.depend b/games/ppt/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/games/ppt/Makefile.depend
+++ b/games/ppt/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/games/primes/Makefile.depend b/games/primes/Makefile.depend
index c0e2c4ad739d..26b0cb7f5dde 100644
--- a/games/primes/Makefile.depend
+++ b/games/primes/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/games/random/Makefile.depend b/games/random/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/games/random/Makefile.depend
+++ b/games/random/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/lib/libdialog/Makefile.depend b/gnu/lib/libdialog/Makefile.depend
index 1375164ddc52..796e9bf46bb6 100644
--- a/gnu/lib/libdialog/Makefile.depend
+++ b/gnu/lib/libdialog/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
lib/ncurses/ncursesw \
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index cbb43ab610c4..1fbfd7fffcf5 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
.include <dirdeps.mk>
diff --git a/gnu/lib/libgomp/Makefile.depend b/gnu/lib/libgomp/Makefile.depend
index e9550952ded0..71accaeebd52 100644
--- a/gnu/lib/libgomp/Makefile.depend
+++ b/gnu/lib/libgomp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/lib/libreadline/readline/Makefile.depend b/gnu/lib/libreadline/readline/Makefile.depend
index dd43fad9b357..233a7c6cd0b8 100644
--- a/gnu/lib/libreadline/readline/Makefile.depend
+++ b/gnu/lib/libreadline/readline/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/gnu/lib/libregex/Makefile.depend b/gnu/lib/libregex/Makefile.depend
index aeea88b2fa87..c64a40fd9bc1 100644
--- a/gnu/lib/libregex/Makefile.depend
+++ b/gnu/lib/libregex/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/lib/libstdc++/Makefile.depend b/gnu/lib/libstdc++/Makefile.depend
index f9644cd4852c..e24c102fd216 100644
--- a/gnu/lib/libstdc++/Makefile.depend
+++ b/gnu/lib/libstdc++/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/gnu/lib/libsupc++/Makefile.depend b/gnu/lib/libsupc++/Makefile.depend
index 5d533a4fcd45..1afbe8be911c 100644
--- a/gnu/lib/libsupc++/Makefile.depend
+++ b/gnu/lib/libsupc++/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/lib/libstdc++ \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile.depend b/gnu/usr.bin/binutils/addr2line/Makefile.depend
index e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile.depend
+++ b/gnu/usr.bin/binutils/addr2line/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/as/Makefile.depend b/gnu/usr.bin/binutils/as/Makefile.depend
index 03255c03729a..c9c4fe5b3feb 100644
--- a/gnu/usr.bin/binutils/as/Makefile.depend
+++ b/gnu/usr.bin/binutils/as/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libiberty \
gnu/usr.bin/binutils/libopcodes \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
index d12d3720b2c3..9a0d07116a18 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.depend.amd64
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libiberty \
include \
diff --git a/gnu/usr.bin/binutils/nm/Makefile.depend b/gnu/usr.bin/binutils/nm/Makefile.depend
index e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/nm/Makefile.depend
+++ b/gnu/usr.bin/binutils/nm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ 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 e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile.depend
+++ b/gnu/usr.bin/binutils/objcopy/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ 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 0b25f2ae2ac4..b21a71066e66 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile.depend
+++ b/gnu/usr.bin/binutils/objdump/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -12,6 +13,7 @@ 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 e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile.depend
+++ b/gnu/usr.bin/binutils/readelf/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ 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 e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/size/Makefile.depend
+++ b/gnu/usr.bin/binutils/size/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ 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 e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/strings/Makefile.depend
+++ b/gnu/usr.bin/binutils/strings/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ 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 e583d947164b..f720db2bf7fb 100644
--- a/gnu/usr.bin/binutils/strip/Makefile.depend
+++ b/gnu/usr.bin/binutils/strip/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/binutils/libbfd \
gnu/usr.bin/binutils/libbinutils \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/cc/c++/Makefile.depend b/gnu/usr.bin/cc/c++/Makefile.depend
index d16e7b05543e..2652a148e659 100644
--- a/gnu/usr.bin/cc/c++/Makefile.depend
+++ b/gnu/usr.bin/cc/c++/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/cc/cc_tools \
gnu/usr.bin/cc/libcpp \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/cc/c++filt/Makefile.depend b/gnu/usr.bin/cc/c++filt/Makefile.depend
index 2db3c0066df0..fa5c21cf859c 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile.depend
+++ b/gnu/usr.bin/cc/c++filt/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/cc/cc_tools \
gnu/usr.bin/cc/libiberty \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/cc/cc/Makefile.depend b/gnu/usr.bin/cc/cc/Makefile.depend
index 12613ee5fe5b..87b6d9d514bf 100644
--- a/gnu/usr.bin/cc/cc/Makefile.depend
+++ b/gnu/usr.bin/cc/cc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/usr.bin/cc/cc_tools \
gnu/usr.bin/cc/libcpp \
gnu/usr.bin/cc/libiberty \
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile.depend b/gnu/usr.bin/cc/cc_tools/Makefile.depend
index 986bc33a6253..05572c6be358 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile.depend
+++ b/gnu/usr.bin/cc/cc_tools/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/gnu/usr.bin/cc/cpp/Makefile.depend b/gnu/usr.bin/cc/cpp/Makefile.depend
index d16e7b05543e..2652a148e659 100644
--- a/gnu/usr.bin/cc/cpp/Makefile.depend
+++ b/gnu/usr.bin/cc/cpp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/cc/cc_tools \
gnu/usr.bin/cc/libcpp \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/cc/gcov/Makefile.depend b/gnu/usr.bin/cc/gcov/Makefile.depend
index 2db3c0066df0..fa5c21cf859c 100644
--- a/gnu/usr.bin/cc/gcov/Makefile.depend
+++ b/gnu/usr.bin/cc/gcov/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/cc/cc_tools \
gnu/usr.bin/cc/libiberty \
@@ -10,6 +11,7 @@ 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 35a0b670a376..546cb43f4f04 100644
--- a/gnu/usr.bin/dialog/Makefile.depend
+++ b/gnu/usr.bin/dialog/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libdialog \
gnu/lib/libgcc \
include \
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 51d3c70a7766..ead1ad513fac 100644
--- a/gnu/usr.bin/diff3/Makefile.depend
+++ b/gnu/usr.bin/diff3/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/gdb/gdbserver/Makefile.depend b/gnu/usr.bin/gdb/gdbserver/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/gnu/usr.bin/gdb/gdbserver/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdbserver/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
index a1f877240498..97cb0bdfd01e 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libdriver \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 a1f877240498..97cb0bdfd01e 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libdriver \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 a1f877240498..97cb0bdfd01e 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libdriver \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 a1f877240498..97cb0bdfd01e 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libdriver \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 a1f877240498..97cb0bdfd01e 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libdriver \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 a1f877240498..97cb0bdfd01e 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libdriver \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 6666db6dddae..f38013572255 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 e57b66ca5165..aea5b2d8cc45 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 c42313497c77..345d8fbb2d22 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libbib \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 a7a2cfe57d2c..80cfb86ca689 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 ffeaed7041b4..5f92b0df5f81 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libbib \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 ffeaed7041b4..5f92b0df5f81 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libbib \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 ffeaed7041b4..5f92b0df5f81 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
@@ -3,15 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libbib \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 30aa91829204..b4de74964106 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/groff/src/libs/libgroff \
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 5a1d3f9ca69b..6936f25a9e7a 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
@@ -3,14 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
gnu/usr.bin/groff/src/libs/libgroff \
include \
include/xlocale \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/ci/Makefile.depend
+++ b/gnu/usr.bin/rcs/ci/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/co/Makefile.depend
+++ b/gnu/usr.bin/rcs/co/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/ident/Makefile.depend
+++ b/gnu/usr.bin/rcs/ident/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/merge/Makefile.depend
+++ b/gnu/usr.bin/rcs/merge/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcs/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/rcsclean/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsclean/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 78b71f28e9a2..0e57857f4e80 100644
--- a/gnu/usr.bin/rcs/rlog/Makefile.depend
+++ b/gnu/usr.bin/rcs/rlog/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/rcs/lib \
include \
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 f9f14bd89125..3c6803038b80 100644
--- a/gnu/usr.bin/sdiff/Makefile.depend
+++ b/gnu/usr.bin/sdiff/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 eb62ba113e3d..4300e83bcc16 100644
--- a/gnu/usr.bin/texinfo/info/Makefile.depend
+++ b/gnu/usr.bin/texinfo/info/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/texinfo/libtxi \
include \
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 e3b3fdbac9fb..adec3fdafec6 100644
--- a/gnu/usr.bin/texinfo/infokey/Makefile.depend
+++ b/gnu/usr.bin/texinfo/infokey/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/texinfo/libtxi \
include \
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 e3b3fdbac9fb..adec3fdafec6 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile.depend
+++ b/gnu/usr.bin/texinfo/install-info/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/texinfo/libtxi \
include \
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 e3b3fdbac9fb..adec3fdafec6 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/texinfo/libtxi \
include \
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 e3b3fdbac9fb..adec3fdafec6 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile.depend
+++ b/gnu/usr.bin/texinfo/texindex/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/usr.bin/texinfo/libtxi \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/kerberos5/lib/libasn1/Makefile.depend b/kerberos5/lib/libasn1/Makefile.depend
index b82dd514321d..a8e1a3f5ba33 100644
--- a/kerberos5/lib/libasn1/Makefile.depend
+++ b/kerberos5/lib/libasn1/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
kerberos5/lib/libroken \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcom_err \
lib/libcompiler_rt \
diff --git a/kerberos5/lib/libheimbase/Makefile.depend b/kerberos5/lib/libheimbase/Makefile.depend
index 9926a3a7caa6..e1ba49601114 100644
--- a/kerberos5/lib/libheimbase/Makefile.depend
+++ b/kerberos5/lib/libheimbase/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/kerberos5/lib/libheimipcc/Makefile.depend b/kerberos5/lib/libheimipcc/Makefile.depend
index 120f352c3920..1bd43f6f3360 100644
--- a/kerberos5/lib/libheimipcc/Makefile.depend
+++ b/kerberos5/lib/libheimipcc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -12,6 +13,7 @@ DIRDEPS = \
kerberos5/lib/libroken \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/kerberos5/lib/libheimsqlite/Makefile.depend b/kerberos5/lib/libheimsqlite/Makefile.depend
index d1272937d3bc..13680b314856 100644
--- a/kerberos5/lib/libheimsqlite/Makefile.depend
+++ b/kerberos5/lib/libheimsqlite/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/kerberos5/lib/libroken/Makefile.depend b/kerberos5/lib/libroken/Makefile.depend
index d679d16abc16..27304ee9f793 100644
--- a/kerberos5/lib/libroken/Makefile.depend
+++ b/kerberos5/lib/libroken/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
diff --git a/kerberos5/lib/libwind/Makefile.depend b/kerberos5/lib/libwind/Makefile.depend
index 7ae977189d60..5e661c1bddb2 100644
--- a/kerberos5/lib/libwind/Makefile.depend
+++ b/kerberos5/lib/libwind/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
kerberos5/lib/libroken \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcom_err \
lib/libcompiler_rt \
diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend
index 085cac44091c..2d1668bda45c 100644
--- a/kerberos5/tools/asn1_compile/Makefile.depend
+++ b/kerberos5/tools/asn1_compile/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
kerberos5/lib/libvers \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/kerberos5/tools/make-roken/Makefile.depend b/kerberos5/tools/make-roken/Makefile.depend
index 25028476c082..c515f44f9e7d 100644
--- a/kerberos5/tools/make-roken/Makefile.depend
+++ b/kerberos5/tools/make-roken/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/kerberos5/tools/slc/Makefile.depend b/kerberos5/tools/slc/Makefile.depend
index d8062556edc3..752a34352cc2 100644
--- a/kerberos5/tools/slc/Makefile.depend
+++ b/kerberos5/tools/slc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
kerberos5/lib/libvers \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend
index fc6d95f383e3..6f092c911531 100644
--- a/lib/atf/libatf-c++/Makefile.depend
+++ b/lib/atf/libatf-c++/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/lib/libstdc++ \
gnu/lib/libsupc++ \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/atf/libatf-c \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/atf/libatf-c/Makefile.depend b/lib/atf/libatf-c/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/atf/libatf-c/Makefile.depend
+++ b/lib/atf/libatf-c/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/libalias/Makefile.depend b/lib/libalias/libalias/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libalias/libalias/Makefile.depend
+++ b/lib/libalias/libalias/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/cuseeme/Makefile.depend b/lib/libalias/modules/cuseeme/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/cuseeme/Makefile.depend
+++ b/lib/libalias/modules/cuseeme/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/dummy/Makefile.depend b/lib/libalias/modules/dummy/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/dummy/Makefile.depend
+++ b/lib/libalias/modules/dummy/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/ftp/Makefile.depend b/lib/libalias/modules/ftp/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/ftp/Makefile.depend
+++ b/lib/libalias/modules/ftp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/irc/Makefile.depend b/lib/libalias/modules/irc/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/irc/Makefile.depend
+++ b/lib/libalias/modules/irc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/nbt/Makefile.depend b/lib/libalias/modules/nbt/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/nbt/Makefile.depend
+++ b/lib/libalias/modules/nbt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/pptp/Makefile.depend b/lib/libalias/modules/pptp/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/pptp/Makefile.depend
+++ b/lib/libalias/modules/pptp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/skinny/Makefile.depend b/lib/libalias/modules/skinny/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/skinny/Makefile.depend
+++ b/lib/libalias/modules/skinny/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/smedia/Makefile.depend b/lib/libalias/modules/smedia/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libalias/modules/smedia/Makefile.depend
+++ b/lib/libalias/modules/smedia/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libauditd/Makefile.depend b/lib/libauditd/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libauditd/Makefile.depend
+++ b/lib/libauditd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libbegemot/Makefile.depend b/lib/libbegemot/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libbegemot/Makefile.depend
+++ b/lib/libbegemot/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libblocksruntime/Makefile.depend b/lib/libblocksruntime/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libblocksruntime/Makefile.depend
+++ b/lib/libblocksruntime/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libbluetooth/Makefile.depend b/lib/libbluetooth/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libbluetooth/Makefile.depend
+++ b/lib/libbluetooth/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libbsm/Makefile.depend b/lib/libbsm/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libbsm/Makefile.depend
+++ b/lib/libbsm/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libbz2/Makefile.depend b/lib/libbz2/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libbz2/Makefile.depend
+++ b/lib/libbz2/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend
index 7424055480c9..bc14f56bdfff 100644
--- a/lib/libc++/Makefile.depend
+++ b/lib/libc++/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/lib/libc/Makefile.depend b/lib/libc/Makefile.depend
index b030effca2ff..616f3ba77615 100644
--- a/lib/libc/Makefile.depend
+++ b/lib/libc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
include \
include/rpc \
include/rpcsvc \
diff --git a/lib/libcalendar/Makefile.depend b/lib/libcalendar/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/lib/libcalendar/Makefile.depend
+++ b/lib/libcalendar/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libcam/Makefile.depend b/lib/libcam/Makefile.depend
index 8a69c213c3c2..a1157119ad51 100644
--- a/lib/libcam/Makefile.depend
+++ b/lib/libcam/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
diff --git a/lib/libcapsicum/Makefile.depend b/lib/libcapsicum/Makefile.depend
index ab94ddd24ec7..67b4ef08e1f9 100644
--- a/lib/libcapsicum/Makefile.depend
+++ b/lib/libcapsicum/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnv \
diff --git a/lib/libcom_err/Makefile.depend b/lib/libcom_err/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libcom_err/Makefile.depend
+++ b/lib/libcom_err/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libcrypt/Makefile.depend b/lib/libcrypt/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libcrypt/Makefile.depend
+++ b/lib/libcrypt/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libcxxrt/Makefile.depend b/lib/libcxxrt/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libcxxrt/Makefile.depend
+++ b/lib/libcxxrt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libdevinfo/Makefile.depend b/lib/libdevinfo/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libdevinfo/Makefile.depend
+++ b/lib/libdevinfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libdevstat/Makefile.depend b/lib/libdevstat/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/lib/libdevstat/Makefile.depend
+++ b/lib/libdevstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend
index 60e33a7ed174..1b2ce3e41ae6 100644
--- a/lib/libdwarf/Makefile.depend
+++ b/lib/libdwarf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index 11dc760ac2db..af92ff9ef9e3 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/lib/libelf/Makefile.depend b/lib/libelf/Makefile.depend
index b5d32499cb84..7c6b7073c2ee 100644
--- a/lib/libelf/Makefile.depend
+++ b/lib/libelf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libexecinfo/Makefile.depend b/lib/libexecinfo/Makefile.depend
index df2384b66d87..659d7cca1ad8 100644
--- a/lib/libexecinfo/Makefile.depend
+++ b/lib/libexecinfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
diff --git a/lib/libexpat/Makefile.depend b/lib/libexpat/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libexpat/Makefile.depend
+++ b/lib/libexpat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libgeom/Makefile.depend b/lib/libgeom/Makefile.depend
index b55a47429e7a..a66d580db4dc 100644
--- a/lib/libgeom/Makefile.depend
+++ b/lib/libgeom/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libsbuf \
diff --git a/lib/libgpib/Makefile.depend b/lib/libgpib/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/lib/libgpib/Makefile.depend
+++ b/lib/libgpib/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libgssapi/Makefile.depend b/lib/libgssapi/Makefile.depend
index a0b3a1c093fd..841cdfd90dab 100644
--- a/lib/libgssapi/Makefile.depend
+++ b/lib/libgssapi/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/gssapi \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libipsec/Makefile.depend b/lib/libipsec/Makefile.depend
index e5717fca49c2..89518b5ff290 100644
--- a/lib/libipsec/Makefile.depend
+++ b/lib/libipsec/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libjail/Makefile.depend b/lib/libjail/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libjail/Makefile.depend
+++ b/lib/libjail/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libkiconv/Makefile.depend b/lib/libkiconv/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libkiconv/Makefile.depend
+++ b/lib/libkiconv/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libkvm/Makefile.depend b/lib/libkvm/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libkvm/Makefile.depend
+++ b/lib/libkvm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libmagic/Makefile.depend b/lib/libmagic/Makefile.depend
index 569fd1c18b9a..8d258dfd965e 100644
--- a/lib/libmagic/Makefile.depend
+++ b/lib/libmagic/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
diff --git a/lib/libmd/Makefile.depend b/lib/libmd/Makefile.depend
index 6d52fa5934c9..9561917e0293 100644
--- a/lib/libmd/Makefile.depend
+++ b/lib/libmd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libmemstat/Makefile.depend b/lib/libmemstat/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/lib/libmemstat/Makefile.depend
+++ b/lib/libmemstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index 9ca55561cff5..92baf08bda74 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/lib/libnetgraph/Makefile.depend b/lib/libnetgraph/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libnetgraph/Makefile.depend
+++ b/lib/libnetgraph/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libngatm/Makefile.depend b/lib/libngatm/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libngatm/Makefile.depend
+++ b/lib/libngatm/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libnv/Makefile.depend b/lib/libnv/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libnv/Makefile.depend
+++ b/lib/libnv/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libopie/Makefile.depend b/lib/libopie/Makefile.depend
index f73af6bdb0a2..c1f494f87eff 100644
--- a/lib/libopie/Makefile.depend
+++ b/lib/libopie/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/lib/libpam/libpam/Makefile.depend b/lib/libpam/libpam/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libpam/libpam/Makefile.depend
+++ b/lib/libpam/libpam/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libpam/modules/pam_chroot/Makefile.depend b/lib/libpam/modules/pam_chroot/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_chroot/Makefile.depend
+++ b/lib/libpam/modules/pam_chroot/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_deny/Makefile.depend b/lib/libpam/modules/pam_deny/Makefile.depend
index d12466d6a618..afe8c8b3c68f 100644
--- a/lib/libpam/modules/pam_deny/Makefile.depend
+++ b/lib/libpam/modules/pam_deny/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_echo/Makefile.depend b/lib/libpam/modules/pam_echo/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_echo/Makefile.depend
+++ b/lib/libpam/modules/pam_echo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_exec/Makefile.depend b/lib/libpam/modules/pam_exec/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_exec/Makefile.depend
+++ b/lib/libpam/modules/pam_exec/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile.depend b/lib/libpam/modules/pam_ftpusers/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile.depend
+++ b/lib/libpam/modules/pam_ftpusers/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_group/Makefile.depend b/lib/libpam/modules/pam_group/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_group/Makefile.depend
+++ b/lib/libpam/modules/pam_group/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_guest/Makefile.depend b/lib/libpam/modules/pam_guest/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_guest/Makefile.depend
+++ b/lib/libpam/modules/pam_guest/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_lastlog/Makefile.depend b/lib/libpam/modules/pam_lastlog/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile.depend
+++ b/lib/libpam/modules/pam_lastlog/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_login_access/Makefile.depend b/lib/libpam/modules/pam_login_access/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_login_access/Makefile.depend
+++ b/lib/libpam/modules/pam_login_access/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_nologin/Makefile.depend b/lib/libpam/modules/pam_nologin/Makefile.depend
index 5947196b49e4..3d8c2f306ad0 100644
--- a/lib/libpam/modules/pam_nologin/Makefile.depend
+++ b/lib/libpam/modules/pam_nologin/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
diff --git a/lib/libpam/modules/pam_opie/Makefile.depend b/lib/libpam/modules/pam_opie/Makefile.depend
index 3bef9098f85c..91d27924dfb5 100644
--- a/lib/libpam/modules/pam_opie/Makefile.depend
+++ b/lib/libpam/modules/pam_opie/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libopie \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile.depend b/lib/libpam/modules/pam_opieaccess/Makefile.depend
index bbe263ef9217..94ab2e8f6fbf 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile.depend
+++ b/lib/libpam/modules/pam_opieaccess/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libopie \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile.depend b/lib/libpam/modules/pam_passwdqc/Makefile.depend
index 07deaf653875..89eac3ede0d5 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile.depend
+++ b/lib/libpam/modules/pam_passwdqc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_permit/Makefile.depend b/lib/libpam/modules/pam_permit/Makefile.depend
index d12466d6a618..afe8c8b3c68f 100644
--- a/lib/libpam/modules/pam_permit/Makefile.depend
+++ b/lib/libpam/modules/pam_permit/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_rhosts/Makefile.depend b/lib/libpam/modules/pam_rhosts/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile.depend
+++ b/lib/libpam/modules/pam_rhosts/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_rootok/Makefile.depend b/lib/libpam/modules/pam_rootok/Makefile.depend
index d12466d6a618..afe8c8b3c68f 100644
--- a/lib/libpam/modules/pam_rootok/Makefile.depend
+++ b/lib/libpam/modules/pam_rootok/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_securetty/Makefile.depend b/lib/libpam/modules/pam_securetty/Makefile.depend
index 499706a8d131..f44d17dcca74 100644
--- a/lib/libpam/modules/pam_securetty/Makefile.depend
+++ b/lib/libpam/modules/pam_securetty/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_self/Makefile.depend b/lib/libpam/modules/pam_self/Makefile.depend
index d12466d6a618..afe8c8b3c68f 100644
--- a/lib/libpam/modules/pam_self/Makefile.depend
+++ b/lib/libpam/modules/pam_self/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
diff --git a/lib/libpam/modules/pam_tacplus/Makefile.depend b/lib/libpam/modules/pam_tacplus/Makefile.depend
index 8dd8b0abde1d..bc4b7343419e 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile.depend
+++ b/lib/libpam/modules/pam_tacplus/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libtacplus \
diff --git a/lib/libpam/modules/pam_unix/Makefile.depend b/lib/libpam/modules/pam_unix/Makefile.depend
index f34115b0ca05..13a84801d0c2 100644
--- a/lib/libpam/modules/pam_unix/Makefile.depend
+++ b/lib/libpam/modules/pam_unix/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libpam/libpam \
diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend
index 32085ed84645..2b635d7fa37e 100644
--- a/lib/libpcap/Makefile.depend
+++ b/lib/libpcap/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libpmc/Makefile.depend b/lib/libpmc/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libpmc/Makefile.depend
+++ b/lib/libpmc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend
index b00a70119618..363d9a0730b3 100644
--- a/lib/libproc/Makefile.depend
+++ b/lib/libproc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
diff --git a/lib/libprocstat/Makefile.depend b/lib/libprocstat/Makefile.depend
index 3444d9387768..7e162f7cd899 100644
--- a/lib/libprocstat/Makefile.depend
+++ b/lib/libprocstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libkvm \
diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend
index 4764e3d90d2f..4651ca83b919 100644
--- a/lib/librpcsec_gss/Makefile.depend
+++ b/lib/librpcsec_gss/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgssapi \
diff --git a/lib/librpcsvc/Makefile.depend b/lib/librpcsvc/Makefile.depend
index 7053f44c8544..7b1e7f4f7015 100644
--- a/lib/librpcsvc/Makefile.depend
+++ b/lib/librpcsvc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend
index 9926a3a7caa6..e1ba49601114 100644
--- a/lib/librt/Makefile.depend
+++ b/lib/librt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend
index ec27fe402f3b..6b94eaeeb5af 100644
--- a/lib/librtld_db/Makefile.depend
+++ b/lib/librtld_db/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libproc \
diff --git a/lib/libsbuf/Makefile.depend b/lib/libsbuf/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libsbuf/Makefile.depend
+++ b/lib/libsbuf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libsdp/Makefile.depend b/lib/libsdp/Makefile.depend
index 1b2f1e2c7240..beb640354e0e 100644
--- a/lib/libsdp/Makefile.depend
+++ b/lib/libsdp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libsmb/Makefile.depend b/lib/libsmb/Makefile.depend
index fc61e1a87937..b1a67cd37ad9 100644
--- a/lib/libsmb/Makefile.depend
+++ b/lib/libsmb/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkiconv \
diff --git a/lib/libstdbuf/Makefile.depend b/lib/libstdbuf/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libstdbuf/Makefile.depend
+++ b/lib/libstdbuf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libstdthreads/Makefile.depend b/lib/libstdthreads/Makefile.depend
index 9926a3a7caa6..e1ba49601114 100644
--- a/lib/libstdthreads/Makefile.depend
+++ b/lib/libstdthreads/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/lib/libtacplus/Makefile.depend b/lib/libtacplus/Makefile.depend
index f73af6bdb0a2..c1f494f87eff 100644
--- a/lib/libtacplus/Makefile.depend
+++ b/lib/libtacplus/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libthread_db/Makefile.depend b/lib/libthread_db/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libthread_db/Makefile.depend
+++ b/lib/libthread_db/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libufs/Makefile.depend b/lib/libufs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libufs/Makefile.depend
+++ b/lib/libufs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libugidfw/Makefile.depend b/lib/libugidfw/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libugidfw/Makefile.depend
+++ b/lib/libugidfw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libulog/Makefile.depend b/lib/libulog/Makefile.depend
index 5d619f8fac05..f3adefe05801 100644
--- a/lib/libulog/Makefile.depend
+++ b/lib/libulog/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/lib/libusb/Makefile.depend b/lib/libusb/Makefile.depend
index 9926a3a7caa6..e1ba49601114 100644
--- a/lib/libusb/Makefile.depend
+++ b/lib/libusb/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/lib/libusbhid/Makefile.depend b/lib/libusbhid/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libusbhid/Makefile.depend
+++ b/lib/libusbhid/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libutil/Makefile.depend b/lib/libutil/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libutil/Makefile.depend
+++ b/lib/libutil/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libvgl/Makefile.depend b/lib/libvgl/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libvgl/Makefile.depend
+++ b/lib/libvgl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libvmmapi/Makefile.depend b/lib/libvmmapi/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/lib/libvmmapi/Makefile.depend
+++ b/lib/libvmmapi/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/lib/libwrap/Makefile.depend b/lib/libwrap/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/lib/libwrap/Makefile.depend
+++ b/lib/libwrap/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libypclnt/Makefile.depend b/lib/libypclnt/Makefile.depend
index cca28a5934a6..619ca757937c 100644
--- a/lib/libypclnt/Makefile.depend
+++ b/lib/libypclnt/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/libz/Makefile.depend
+++ b/lib/libz/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/lib/msun/Makefile.depend
+++ b/lib/msun/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index 44fd13d38a6c..936372895325 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -3,13 +3,16 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
+ lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend
index d8fdf1b99945..e942aba98876 100644
--- a/lib/ncurses/formw/Makefile.depend
+++ b/lib/ncurses/formw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend
index 64dab5575bd5..3ca328f016d0 100644
--- a/lib/ncurses/menu/Makefile.depend
+++ b/lib/ncurses/menu/Makefile.depend
@@ -3,13 +3,16 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
+ lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend
index d46744f5e033..981ac37cd263 100644
--- a/lib/ncurses/menuw/Makefile.depend
+++ b/lib/ncurses/menuw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index fb4de0c0af0b..6274ac87202f 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncursesw/Makefile.depend
index 78f9b8a1f9ee..b26f3c2fe5c7 100644
--- a/lib/ncurses/ncursesw/Makefile.depend
+++ b/lib/ncurses/ncursesw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index 5db7c851afdf..e5c91fb693ef 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -3,13 +3,16 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
+ lib/ncurses/ncursesw \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend
index 9cc13a251fbf..c5a301e94c81 100644
--- a/lib/ncurses/panelw/Makefile.depend
+++ b/lib/ncurses/panelw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
diff --git a/libexec/atrun/Makefile.depend b/libexec/atrun/Makefile.depend
index 5947196b49e4..3d8c2f306ad0 100644
--- a/libexec/atrun/Makefile.depend
+++ b/libexec/atrun/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
diff --git a/libexec/bootpd/bootpgw/Makefile.depend b/libexec/bootpd/bootpgw/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/libexec/bootpd/bootpgw/Makefile.depend
+++ b/libexec/bootpd/bootpgw/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/bootpd/tools/bootpef/Makefile.depend b/libexec/bootpd/tools/bootpef/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/libexec/bootpd/tools/bootpef/Makefile.depend
+++ b/libexec/bootpd/tools/bootpef/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/bootpd/tools/bootptest/Makefile.depend b/libexec/bootpd/tools/bootptest/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/libexec/bootpd/tools/bootptest/Makefile.depend
+++ b/libexec/bootpd/tools/bootptest/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/comsat/Makefile.depend b/libexec/comsat/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/libexec/comsat/Makefile.depend
+++ b/libexec/comsat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/fingerd/Makefile.depend b/libexec/fingerd/Makefile.depend
index ee948eaa011e..e3af08532eec 100644
--- a/libexec/fingerd/Makefile.depend
+++ b/libexec/fingerd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/libexec/ftpd/Makefile.depend b/libexec/ftpd/Makefile.depend
index 44ee786b7e19..a648938b6ff4 100644
--- a/libexec/ftpd/Makefile.depend
+++ b/libexec/ftpd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libmd \
diff --git a/libexec/getty/Makefile.depend b/libexec/getty/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/libexec/getty/Makefile.depend
+++ b/libexec/getty/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend
index 1d3e8d899246..d4bbfb2aa92a 100644
--- a/libexec/mail.local/Makefile.depend
+++ b/libexec/mail.local/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libutil \
diff --git a/libexec/mknetid/Makefile.depend b/libexec/mknetid/Makefile.depend
index d074335f4466..5930524f9ce7 100644
--- a/libexec/mknetid/Makefile.depend
+++ b/libexec/mknetid/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/pppoed/Makefile.depend b/libexec/pppoed/Makefile.depend
index 2b972daf01f6..a2060055a242 100644
--- a/libexec/pppoed/Makefile.depend
+++ b/libexec/pppoed/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/libexec/rbootd/Makefile.depend b/libexec/rbootd/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/libexec/rbootd/Makefile.depend
+++ b/libexec/rbootd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/revnetgroup/Makefile.depend b/libexec/revnetgroup/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/libexec/revnetgroup/Makefile.depend
+++ b/libexec/revnetgroup/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/rlogind/Makefile.depend b/libexec/rlogind/Makefile.depend
index ee948eaa011e..e3af08532eec 100644
--- a/libexec/rlogind/Makefile.depend
+++ b/libexec/rlogind/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/libexec/rpc.rquotad/Makefile.depend b/libexec/rpc.rquotad/Makefile.depend
index 74982d7fcb45..27a6a4a115b8 100644
--- a/libexec/rpc.rquotad/Makefile.depend
+++ b/libexec/rpc.rquotad/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libutil \
diff --git a/libexec/rpc.rstatd/Makefile.depend b/libexec/rpc.rstatd/Makefile.depend
index 35a6e3704da8..e7870b4b49c3 100644
--- a/libexec/rpc.rstatd/Makefile.depend
+++ b/libexec/rpc.rstatd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libkvm \
diff --git a/libexec/rpc.rusersd/Makefile.depend b/libexec/rpc.rusersd/Makefile.depend
index f3b4295fa83f..8d990c379a15 100644
--- a/libexec/rpc.rusersd/Makefile.depend
+++ b/libexec/rpc.rusersd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libutil \
diff --git a/libexec/rpc.rwalld/Makefile.depend b/libexec/rpc.rwalld/Makefile.depend
index bd7098e0b6ce..d9693fd64752 100644
--- a/libexec/rpc.rwalld/Makefile.depend
+++ b/libexec/rpc.rwalld/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/libexec/rpc.sprayd/Makefile.depend b/libexec/rpc.sprayd/Makefile.depend
index 6514930150d7..3b0eba6af4e1 100644
--- a/libexec/rpc.sprayd/Makefile.depend
+++ b/libexec/rpc.sprayd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/libexec/rshd/Makefile.depend b/libexec/rshd/Makefile.depend
index 9473758ae465..e513c61c3548 100644
--- a/libexec/rshd/Makefile.depend
+++ b/libexec/rshd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
diff --git a/libexec/smrsh/Makefile.depend b/libexec/smrsh/Makefile.depend
index 6515b7d984da..47096166cc73 100644
--- a/libexec/smrsh/Makefile.depend
+++ b/libexec/smrsh/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsm \
lib/libutil \
diff --git a/libexec/talkd/Makefile.depend b/libexec/talkd/Makefile.depend
index 48e46367c59a..11fa4d730adc 100644
--- a/libexec/talkd/Makefile.depend
+++ b/libexec/talkd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/tcpd/Makefile.depend b/libexec/tcpd/Makefile.depend
index 52befbc6e6ad..8452af99c632 100644
--- a/libexec/tcpd/Makefile.depend
+++ b/libexec/tcpd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
diff --git a/libexec/tftp-proxy/Makefile.depend b/libexec/tftp-proxy/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/libexec/tftp-proxy/Makefile.depend
+++ b/libexec/tftp-proxy/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/libexec/tftpd/Makefile.depend b/libexec/tftpd/Makefile.depend
index 74a1dd9afe70..a02eba6f2277 100644
--- a/libexec/tftpd/Makefile.depend
+++ b/libexec/tftpd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
diff --git a/libexec/ulog-helper/Makefile.depend b/libexec/ulog-helper/Makefile.depend
index b1f47e3d7a34..dfe8b1b46789 100644
--- a/libexec/ulog-helper/Makefile.depend
+++ b/libexec/ulog-helper/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libulog \
diff --git a/libexec/ypxfr/Makefile.depend b/libexec/ypxfr/Makefile.depend
index 37e8f0c298b4..9641db9a4176 100644
--- a/libexec/ypxfr/Makefile.depend
+++ b/libexec/ypxfr/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/sbin/adjkerntz/Makefile.depend b/sbin/adjkerntz/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/adjkerntz/Makefile.depend
+++ b/sbin/adjkerntz/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/badsect/Makefile.depend b/sbin/badsect/Makefile.depend
index 374b5e7b5c94..7fb8fce4559a 100644
--- a/sbin/badsect/Makefile.depend
+++ b/sbin/badsect/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
diff --git a/sbin/bsdlabel/Makefile.depend b/sbin/bsdlabel/Makefile.depend
index 099436d63905..bac69c034a3b 100644
--- a/sbin/bsdlabel/Makefile.depend
+++ b/sbin/bsdlabel/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/camcontrol/Makefile.depend b/sbin/camcontrol/Makefile.depend
index 0b2207fafdc4..c79bce5f2287 100644
--- a/sbin/camcontrol/Makefile.depend
+++ b/sbin/camcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcam \
lib/libcompiler_rt \
lib/libsbuf \
diff --git a/sbin/ccdconfig/Makefile.depend b/sbin/ccdconfig/Makefile.depend
index 099436d63905..bac69c034a3b 100644
--- a/sbin/ccdconfig/Makefile.depend
+++ b/sbin/ccdconfig/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/clri/Makefile.depend b/sbin/clri/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/clri/Makefile.depend
+++ b/sbin/clri/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/comcontrol/Makefile.depend b/sbin/comcontrol/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/comcontrol/Makefile.depend
+++ b/sbin/comcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/conscontrol/Makefile.depend b/sbin/conscontrol/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/conscontrol/Makefile.depend
+++ b/sbin/conscontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/ddb/Makefile.depend b/sbin/ddb/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/sbin/ddb/Makefile.depend
+++ b/sbin/ddb/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/sbin/devfs/Makefile.depend b/sbin/devfs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/devfs/Makefile.depend
+++ b/sbin/devfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/dhclient/Makefile.depend b/sbin/dhclient/Makefile.depend
index ee948eaa011e..e3af08532eec 100644
--- a/sbin/dhclient/Makefile.depend
+++ b/sbin/dhclient/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/dmesg/Makefile.depend b/sbin/dmesg/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/sbin/dmesg/Makefile.depend
+++ b/sbin/dmesg/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/sbin/dump/Makefile.depend b/sbin/dump/Makefile.depend
index 591ea4c790a0..b3c03a71825a 100644
--- a/sbin/dump/Makefile.depend
+++ b/sbin/dump/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/protocols \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/dumpfs/Makefile.depend b/sbin/dumpfs/Makefile.depend
index 374b5e7b5c94..7fb8fce4559a 100644
--- a/sbin/dumpfs/Makefile.depend
+++ b/sbin/dumpfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
diff --git a/sbin/dumpon/Makefile.depend b/sbin/dumpon/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/dumpon/Makefile.depend
+++ b/sbin/dumpon/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/etherswitchcfg/Makefile.depend b/sbin/etherswitchcfg/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/etherswitchcfg/Makefile.depend
+++ b/sbin/etherswitchcfg/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/fdisk/Makefile.depend b/sbin/fdisk/Makefile.depend
index 099436d63905..bac69c034a3b 100644
--- a/sbin/fdisk/Makefile.depend
+++ b/sbin/fdisk/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/ffsinfo/Makefile.depend b/sbin/ffsinfo/Makefile.depend
index 374b5e7b5c94..7fb8fce4559a 100644
--- a/sbin/ffsinfo/Makefile.depend
+++ b/sbin/ffsinfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
diff --git a/sbin/fsck/Makefile.depend b/sbin/fsck/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/fsck/Makefile.depend
+++ b/sbin/fsck/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/fsck_ffs/Makefile.depend b/sbin/fsck_ffs/Makefile.depend
index 374b5e7b5c94..7fb8fce4559a 100644
--- a/sbin/fsck_ffs/Makefile.depend
+++ b/sbin/fsck_ffs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
diff --git a/sbin/fsck_msdosfs/Makefile.depend b/sbin/fsck_msdosfs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/fsck_msdosfs/Makefile.depend
+++ b/sbin/fsck_msdosfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/fsdb/Makefile.depend b/sbin/fsdb/Makefile.depend
index be095ed989df..749626347205 100644
--- a/sbin/fsdb/Makefile.depend
+++ b/sbin/fsdb/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/libufs \
diff --git a/sbin/fsirand/Makefile.depend b/sbin/fsirand/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/sbin/fsirand/Makefile.depend
+++ b/sbin/fsirand/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/gbde/Makefile.depend b/sbin/gbde/Makefile.depend
index e4727db7c7cd..b9c27745e156 100644
--- a/sbin/gbde/Makefile.depend
+++ b/sbin/gbde/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/geom/class/cache/Makefile.depend b/sbin/geom/class/cache/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/cache/Makefile.depend
+++ b/sbin/geom/class/cache/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/concat/Makefile.depend b/sbin/geom/class/concat/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/concat/Makefile.depend
+++ b/sbin/geom/class/concat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/journal/Makefile.depend b/sbin/geom/class/journal/Makefile.depend
index 8511c7e6b492..83f19b190dd7 100644
--- a/sbin/geom/class/journal/Makefile.depend
+++ b/sbin/geom/class/journal/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
diff --git a/sbin/geom/class/label/Makefile.depend b/sbin/geom/class/label/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/label/Makefile.depend
+++ b/sbin/geom/class/label/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/mirror/Makefile.depend b/sbin/geom/class/mirror/Makefile.depend
index 096ef6a38bc9..6ba212c71e01 100644
--- a/sbin/geom/class/mirror/Makefile.depend
+++ b/sbin/geom/class/mirror/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
diff --git a/sbin/geom/class/mountver/Makefile.depend b/sbin/geom/class/mountver/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/mountver/Makefile.depend
+++ b/sbin/geom/class/mountver/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/multipath/Makefile.depend b/sbin/geom/class/multipath/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/multipath/Makefile.depend
+++ b/sbin/geom/class/multipath/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/nop/Makefile.depend b/sbin/geom/class/nop/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/nop/Makefile.depend
+++ b/sbin/geom/class/nop/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/part/Makefile.depend b/sbin/geom/class/part/Makefile.depend
index 5a31f61e93b3..a6d50feedd98 100644
--- a/sbin/geom/class/part/Makefile.depend
+++ b/sbin/geom/class/part/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libutil \
diff --git a/sbin/geom/class/raid/Makefile.depend b/sbin/geom/class/raid/Makefile.depend
index 096ef6a38bc9..6ba212c71e01 100644
--- a/sbin/geom/class/raid/Makefile.depend
+++ b/sbin/geom/class/raid/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
diff --git a/sbin/geom/class/raid3/Makefile.depend b/sbin/geom/class/raid3/Makefile.depend
index 096ef6a38bc9..6ba212c71e01 100644
--- a/sbin/geom/class/raid3/Makefile.depend
+++ b/sbin/geom/class/raid3/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
diff --git a/sbin/geom/class/sched/Makefile.depend b/sbin/geom/class/sched/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/sched/Makefile.depend
+++ b/sbin/geom/class/sched/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/shsec/Makefile.depend b/sbin/geom/class/shsec/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/shsec/Makefile.depend
+++ b/sbin/geom/class/shsec/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/stripe/Makefile.depend b/sbin/geom/class/stripe/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/stripe/Makefile.depend
+++ b/sbin/geom/class/stripe/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/virstor/Makefile.depend b/sbin/geom/class/virstor/Makefile.depend
index 1f1fba6599ac..bc686f5b7642 100644
--- a/sbin/geom/class/virstor/Makefile.depend
+++ b/sbin/geom/class/virstor/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/core/Makefile.depend b/sbin/geom/core/Makefile.depend
index e45c05bdbf52..f9880dbe6075 100644
--- a/sbin/geom/core/Makefile.depend
+++ b/sbin/geom/core/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/ggate/ggatec/Makefile.depend b/sbin/ggate/ggatec/Makefile.depend
index f02e48a24412..ae9479365944 100644
--- a/sbin/ggate/ggatec/Makefile.depend
+++ b/sbin/ggate/ggatec/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/ggate/ggated/Makefile.depend b/sbin/ggate/ggated/Makefile.depend
index 5390077c5805..85448cf03bff 100644
--- a/sbin/ggate/ggated/Makefile.depend
+++ b/sbin/ggate/ggated/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libthr \
diff --git a/sbin/ggate/ggatel/Makefile.depend b/sbin/ggate/ggatel/Makefile.depend
index f769d32fd3a4..2ad23bc89f48 100644
--- a/sbin/ggate/ggatel/Makefile.depend
+++ b/sbin/ggate/ggatel/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/sbin/growfs/Makefile.depend b/sbin/growfs/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/sbin/growfs/Makefile.depend
+++ b/sbin/growfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/gvinum/Makefile.depend b/sbin/gvinum/Makefile.depend
index af362c6df9d9..ab889550d0b6 100644
--- a/sbin/gvinum/Makefile.depend
+++ b/sbin/gvinum/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libedit \
diff --git a/sbin/ifconfig/Makefile.depend b/sbin/ifconfig/Makefile.depend
index 4ab51a8797f8..63a1548cafe5 100644
--- a/sbin/ifconfig/Makefile.depend
+++ b/sbin/ifconfig/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libjail \
diff --git a/sbin/init/Makefile.depend b/sbin/init/Makefile.depend
index e6bd1bdc009b..1b2a0bde85e0 100644
--- a/sbin/init/Makefile.depend
+++ b/sbin/init/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/sbin/ipf/ipf/Makefile.depend b/sbin/ipf/ipf/Makefile.depend
index 758bc4a86581..2532b4df7c6b 100644
--- a/sbin/ipf/ipf/Makefile.depend
+++ b/sbin/ipf/ipf/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
lib/libpcap \
diff --git a/sbin/ipf/ipfs/Makefile.depend b/sbin/ipf/ipfs/Makefile.depend
index a529f3d9bf0d..ae05e22e3b02 100644
--- a/sbin/ipf/ipfs/Makefile.depend
+++ b/sbin/ipf/ipfs/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipfstat/Makefile.depend b/sbin/ipf/ipfstat/Makefile.depend
index ced2fec81ba6..4023f007f83d 100644
--- a/sbin/ipf/ipfstat/Makefile.depend
+++ b/sbin/ipf/ipfstat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
lib/ncurses/ncurses \
diff --git a/sbin/ipf/ipftest/Makefile.depend b/sbin/ipf/ipftest/Makefile.depend
index 66f35a9d7324..2acc1cb14510 100644
--- a/sbin/ipf/ipftest/Makefile.depend
+++ b/sbin/ipf/ipftest/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipmon/Makefile.depend b/sbin/ipf/ipmon/Makefile.depend
index de6d116b4359..38d4caa8bbdb 100644
--- a/sbin/ipf/ipmon/Makefile.depend
+++ b/sbin/ipf/ipmon/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipnat/Makefile.depend b/sbin/ipf/ipnat/Makefile.depend
index 2567c30aa30a..221f0bceb10a 100644
--- a/sbin/ipf/ipnat/Makefile.depend
+++ b/sbin/ipf/ipnat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ippool/Makefile.depend b/sbin/ipf/ippool/Makefile.depend
index ee54bccf27ab..e039ce09709e 100644
--- a/sbin/ipf/ippool/Makefile.depend
+++ b/sbin/ipf/ippool/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
sbin/ipf/libipf \
diff --git a/sbin/ipf/ipresend/Makefile.depend b/sbin/ipf/ipresend/Makefile.depend
index a086482f151b..eed6565d0e1f 100644
--- a/sbin/ipf/ipresend/Makefile.depend
+++ b/sbin/ipf/ipresend/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
lib/msun \
diff --git a/sbin/ipfw/Makefile.depend b/sbin/ipfw/Makefile.depend
index 007e48a6829b..59ad864f74e5 100644
--- a/sbin/ipfw/Makefile.depend
+++ b/sbin/ipfw/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libalias/libalias \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/iscontrol/Makefile.depend b/sbin/iscontrol/Makefile.depend
index f51771723836..f58230065ebe 100644
--- a/sbin/iscontrol/Makefile.depend
+++ b/sbin/iscontrol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcam \
lib/libcompiler_rt \
lib/libmd \
diff --git a/sbin/kldconfig/Makefile.depend b/sbin/kldconfig/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/kldconfig/Makefile.depend
+++ b/sbin/kldconfig/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/kldload/Makefile.depend b/sbin/kldload/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/kldload/Makefile.depend
+++ b/sbin/kldload/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/kldstat/Makefile.depend b/sbin/kldstat/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/sbin/kldstat/Makefile.depend
+++ b/sbin/kldstat/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/kldunload/Makefile.depend b/sbin/kldunload/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/sbin/kldunload/Makefile.depend
+++ b/sbin/kldunload/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/ldconfig/Makefile.depend b/sbin/ldconfig/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/ldconfig/Makefile.depend
+++ b/sbin/ldconfig/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/md5/Makefile.depend b/sbin/md5/Makefile.depend
index 5d619f8fac05..f3adefe05801 100644
--- a/sbin/md5/Makefile.depend
+++ b/sbin/md5/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/sbin/mdconfig/Makefile.depend b/sbin/mdconfig/Makefile.depend
index 5166c2950d6d..0b555dc8a5ea 100644
--- a/sbin/mdconfig/Makefile.depend
+++ b/sbin/mdconfig/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libexpat \
diff --git a/sbin/mdmfs/Makefile.depend b/sbin/mdmfs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/mdmfs/Makefile.depend
+++ b/sbin/mdmfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/mknod/Makefile.depend b/sbin/mknod/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/mknod/Makefile.depend
+++ b/sbin/mknod/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/mksnap_ffs/Makefile.depend b/sbin/mksnap_ffs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/mksnap_ffs/Makefile.depend
+++ b/sbin/mksnap_ffs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/mount/Makefile.depend b/sbin/mount/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/sbin/mount/Makefile.depend
+++ b/sbin/mount/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/mount_cd9660/Makefile.depend b/sbin/mount_cd9660/Makefile.depend
index fc61e1a87937..b1a67cd37ad9 100644
--- a/sbin/mount_cd9660/Makefile.depend
+++ b/sbin/mount_cd9660/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkiconv \
diff --git a/sbin/mount_fusefs/Makefile.depend b/sbin/mount_fusefs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/mount_fusefs/Makefile.depend
+++ b/sbin/mount_fusefs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/mount_msdosfs/Makefile.depend b/sbin/mount_msdosfs/Makefile.depend
index 1c4739697605..22fad8deab8a 100644
--- a/sbin/mount_msdosfs/Makefile.depend
+++ b/sbin/mount_msdosfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkiconv \
lib/libutil \
diff --git a/sbin/mount_nfs/Makefile.depend b/sbin/mount_nfs/Makefile.depend
index 8800879854fe..1c61866765c9 100644
--- a/sbin/mount_nfs/Makefile.depend
+++ b/sbin/mount_nfs/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/mount_nullfs/Makefile.depend b/sbin/mount_nullfs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/mount_nullfs/Makefile.depend
+++ b/sbin/mount_nullfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/mount_udf/Makefile.depend b/sbin/mount_udf/Makefile.depend
index 02925dbfb3c8..b7e649d8d7d6 100644
--- a/sbin/mount_udf/Makefile.depend
+++ b/sbin/mount_udf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkiconv \
diff --git a/sbin/mount_unionfs/Makefile.depend b/sbin/mount_unionfs/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/mount_unionfs/Makefile.depend
+++ b/sbin/mount_unionfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/natd/Makefile.depend b/sbin/natd/Makefile.depend
index 4895a6be1adc..a15829ca96b8 100644
--- a/sbin/natd/Makefile.depend
+++ b/sbin/natd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libalias/libalias \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/newfs/Makefile.depend b/sbin/newfs/Makefile.depend
index 5d3e06f00b2b..d6d2939dca6d 100644
--- a/sbin/newfs/Makefile.depend
+++ b/sbin/newfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
lib/libutil \
diff --git a/sbin/newfs_msdos/Makefile.depend b/sbin/newfs_msdos/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/newfs_msdos/Makefile.depend
+++ b/sbin/newfs_msdos/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/nfsiod/Makefile.depend b/sbin/nfsiod/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/sbin/nfsiod/Makefile.depend
+++ b/sbin/nfsiod/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/nos-tun/Makefile.depend b/sbin/nos-tun/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/sbin/nos-tun/Makefile.depend
+++ b/sbin/nos-tun/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/nvmecontrol/Makefile.depend b/sbin/nvmecontrol/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/nvmecontrol/Makefile.depend
+++ b/sbin/nvmecontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/pfctl/Makefile.depend b/sbin/pfctl/Makefile.depend
index 2bcf5c8ba653..c4ddd860abce 100644
--- a/sbin/pfctl/Makefile.depend
+++ b/sbin/pfctl/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/msun \
diff --git a/sbin/pflogd/Makefile.depend b/sbin/pflogd/Makefile.depend
index 33251c64b4c0..b42437a19d44 100644
--- a/sbin/pflogd/Makefile.depend
+++ b/sbin/pflogd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpcap \
diff --git a/sbin/ping/Makefile.depend b/sbin/ping/Makefile.depend
index 39b873c5e2d9..dbc78f8a0384 100644
--- a/sbin/ping/Makefile.depend
+++ b/sbin/ping/Makefile.depend
@@ -3,14 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
+ lib/libcapsicum \
lib/libcompiler_rt \
lib/libipsec \
+ lib/libnv \
lib/msun \
diff --git a/sbin/ping6/Makefile.depend b/sbin/ping6/Makefile.depend
index cabd9aaaf7e1..57b18a823075 100644
--- a/sbin/ping6/Makefile.depend
+++ b/sbin/ping6/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
lib/libmd \
diff --git a/sbin/quotacheck/Makefile.depend b/sbin/quotacheck/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/sbin/quotacheck/Makefile.depend
+++ b/sbin/quotacheck/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/rcorder/Makefile.depend b/sbin/rcorder/Makefile.depend
index ec5b06b88b13..c642cb1106ce 100644
--- a/sbin/rcorder/Makefile.depend
+++ b/sbin/rcorder/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/reboot/Makefile.depend b/sbin/reboot/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/reboot/Makefile.depend
+++ b/sbin/reboot/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/recoverdisk/Makefile.depend b/sbin/recoverdisk/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/recoverdisk/Makefile.depend
+++ b/sbin/recoverdisk/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/restore/Makefile.depend b/sbin/restore/Makefile.depend
index 591ea4c790a0..b3c03a71825a 100644
--- a/sbin/restore/Makefile.depend
+++ b/sbin/restore/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/protocols \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/route/Makefile.depend b/sbin/route/Makefile.depend
index 6eb2cfd3e1d4..b8fd55457479 100644
--- a/sbin/route/Makefile.depend
+++ b/sbin/route/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/routed/rtquery/Makefile.depend b/sbin/routed/rtquery/Makefile.depend
index 98a7ed97a3ba..28d49cc89966 100644
--- a/sbin/routed/rtquery/Makefile.depend
+++ b/sbin/routed/rtquery/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/sbin/rtsol/Makefile.depend b/sbin/rtsol/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/sbin/rtsol/Makefile.depend
+++ b/sbin/rtsol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/savecore/Makefile.depend b/sbin/savecore/Makefile.depend
index 569fd1c18b9a..8d258dfd965e 100644
--- a/sbin/savecore/Makefile.depend
+++ b/sbin/savecore/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
diff --git a/sbin/setkey/Makefile.depend b/sbin/setkey/Makefile.depend
index ca1104186a79..736ae9228802 100644
--- a/sbin/setkey/Makefile.depend
+++ b/sbin/setkey/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libipsec \
lib/liby \
diff --git a/sbin/shutdown/Makefile.depend b/sbin/shutdown/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/shutdown/Makefile.depend
+++ b/sbin/shutdown/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/spppcontrol/Makefile.depend b/sbin/spppcontrol/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/spppcontrol/Makefile.depend
+++ b/sbin/spppcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/swapon/Makefile.depend b/sbin/swapon/Makefile.depend
index afbe02588041..40b445f04779 100644
--- a/sbin/swapon/Makefile.depend
+++ b/sbin/swapon/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/sysctl/Makefile.depend b/sbin/sysctl/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/sbin/sysctl/Makefile.depend
+++ b/sbin/sysctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/tunefs/Makefile.depend b/sbin/tunefs/Makefile.depend
index 374b5e7b5c94..7fb8fce4559a 100644
--- a/sbin/tunefs/Makefile.depend
+++ b/sbin/tunefs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libufs \
diff --git a/sbin/umount/Makefile.depend b/sbin/umount/Makefile.depend
index d074335f4466..5930524f9ce7 100644
--- a/sbin/umount/Makefile.depend
+++ b/sbin/umount/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/share/syscons/scrnmaps/Makefile.depend
+++ b/share/syscons/scrnmaps/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/apply/Makefile.depend b/usr.bin/apply/Makefile.depend
index 8a69c213c3c2..a1157119ad51 100644
--- a/usr.bin/apply/Makefile.depend
+++ b/usr.bin/apply/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
diff --git a/usr.bin/asa/Makefile.depend b/usr.bin/asa/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/asa/Makefile.depend
+++ b/usr.bin/asa/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/at/Makefile.depend
+++ b/usr.bin/at/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/atm/sscop/Makefile.depend b/usr.bin/atm/sscop/Makefile.depend
index f584b912ab47..1d7d03c9ac9c 100644
--- a/usr.bin/atm/sscop/Makefile.depend
+++ b/usr.bin/atm/sscop/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 6add1330aa92..5b1f96fd4a82 100644
--- a/usr.bin/awk/Makefile.depend
+++ b/usr.bin/awk/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/banner/Makefile.depend
+++ b/usr.bin/banner/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/basename/Makefile.depend
+++ b/usr.bin/basename/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 6a928de28300..3cc8704c86d6 100644
--- a/usr.bin/bc/Makefile.depend
+++ b/usr.bin/bc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/biff/Makefile.depend
+++ b/usr.bin/biff/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 2a95a05d0df9..334348050096 100644
--- a/usr.bin/bluetooth/bthost/Makefile.depend
+++ b/usr.bin/bluetooth/bthost/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 233d193fa383..c8112080776a 100644
--- a/usr.bin/bluetooth/btsockstat/Makefile.depend
+++ b/usr.bin/bluetooth/btsockstat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 71d0106e87c2..8402227f3aa8 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
+++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.bin/bmake/Makefile.depend b/usr.bin/bmake/Makefile.depend
index 154abfc2fcdc..eaf546ae1d12 100644
--- a/usr.bin/bmake/Makefile.depend
+++ b/usr.bin/bmake/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/brandelf/Makefile.depend b/usr.bin/brandelf/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/brandelf/Makefile.depend
+++ b/usr.bin/brandelf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 815fd2408131..e13f9731efe8 100644
--- a/usr.bin/bsdiff/bsdiff/Makefile.depend
+++ b/usr.bin/bsdiff/bsdiff/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 815fd2408131..e13f9731efe8 100644
--- a/usr.bin/bsdiff/bspatch/Makefile.depend
+++ b/usr.bin/bsdiff/bspatch/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 f2d5926917ad..7616a5eeee2c 100644
--- a/usr.bin/bzip2/Makefile.depend
+++ b/usr.bin/bzip2/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/bzip2recover/Makefile.depend
+++ b/usr.bin/bzip2recover/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/c89/Makefile.depend
+++ b/usr.bin/c89/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/c99/Makefile.depend
+++ b/usr.bin/c99/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 c0e2c4ad739d..26b0cb7f5dde 100644
--- a/usr.bin/calendar/Makefile.depend
+++ b/usr.bin/calendar/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/cap_mkdb/Makefile.depend
+++ b/usr.bin/cap_mkdb/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/catman/Makefile.depend
+++ b/usr.bin/catman/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/chat/Makefile.depend
+++ b/usr.bin/chat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/checknr/Makefile.depend
+++ b/usr.bin/checknr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/chpass/Makefile.depend b/usr.bin/chpass/Makefile.depend
index 32257f856051..eff6559d030b 100644
--- a/usr.bin/chpass/Makefile.depend
+++ b/usr.bin/chpass/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/cksum/Makefile.depend
+++ b/usr.bin/cksum/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/cmp/Makefile.depend b/usr.bin/cmp/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/cmp/Makefile.depend
+++ b/usr.bin/cmp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/col/Makefile.depend
+++ b/usr.bin/col/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/colcrt/Makefile.depend
+++ b/usr.bin/colcrt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 99cfa04656b7..8249cb41cd02 100644
--- a/usr.bin/colldef/Makefile.depend
+++ b/usr.bin/colldef/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/colrm/Makefile.depend
+++ b/usr.bin/colrm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/column/Makefile.depend
+++ b/usr.bin/column/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/comm/Makefile.depend
+++ b/usr.bin/comm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 dc7604175669..b442c85b1bfa 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ 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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/compress/Makefile.depend
+++ b/usr.bin/compress/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/cpuset/Makefile.depend b/usr.bin/cpuset/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/cpuset/Makefile.depend
+++ b/usr.bin/cpuset/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/csplit/Makefile.depend
+++ b/usr.bin/csplit/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 50f15cd0e6cb..4ee17dedb94b 100644
--- a/usr.bin/csup/Makefile.depend
+++ b/usr.bin/csup/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/ctags/Makefile.depend
+++ b/usr.bin/ctags/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/ctlstat/Makefile.depend
+++ b/usr.bin/ctlstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/cut/Makefile.depend
+++ b/usr.bin/cut/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/dirname/Makefile.depend b/usr.bin/dirname/Makefile.depend
index 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/dirname/Makefile.depend
+++ b/usr.bin/dirname/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 afbe02588041..40b445f04779 100644
--- a/usr.bin/du/Makefile.depend
+++ b/usr.bin/du/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/ee/Makefile.depend
+++ b/usr.bin/ee/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/elf2aout/Makefile.depend
+++ b/usr.bin/elf2aout/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/elfdump/Makefile.depend
+++ b/usr.bin/elfdump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 ecfa29edb713..59126995bf0c 100644
--- a/usr.bin/enigma/Makefile.depend
+++ b/usr.bin/enigma/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/env/Makefile.depend
+++ b/usr.bin/env/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/expand/Makefile.depend
+++ b/usr.bin/expand/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/false/Makefile.depend
+++ b/usr.bin/false/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/file/Makefile.depend b/usr.bin/file/Makefile.depend
index a88f1ac3e5e2..5d1fe0e16cf9 100644
--- a/usr.bin/file/Makefile.depend
+++ b/usr.bin/file/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/file2c/Makefile.depend
+++ b/usr.bin/file2c/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 bcc0a7a3c016..9e4103f0ee3d 100644
--- a/usr.bin/find/Makefile.depend
+++ b/usr.bin/find/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/finger/Makefile.depend
+++ b/usr.bin/finger/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/fmt/Makefile.depend
+++ b/usr.bin/fmt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/fold/Makefile.depend
+++ b/usr.bin/fold/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/from/Makefile.depend
+++ b/usr.bin/from/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 488c0034e633..c811358a1162 100644
--- a/usr.bin/fstat/Makefile.depend
+++ b/usr.bin/fstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/fsync/Makefile.depend
+++ b/usr.bin/fsync/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 ff175d71ad8f..1adc0d1cd8b4 100644
--- a/usr.bin/ftp/Makefile.depend
+++ b/usr.bin/ftp/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 01589a3343d0..c121cbc81234 100644
--- a/usr.bin/gcore/Makefile.depend
+++ b/usr.bin/gcore/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/gencat/Makefile.depend
+++ b/usr.bin/gencat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 57b0e222f129..2b3f880dc2a7 100644
--- a/usr.bin/getconf/Makefile.depend
+++ b/usr.bin/getconf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8e92349d5291..886683c668e9 100644
--- a/usr.bin/getent/Makefile.depend
+++ b/usr.bin/getent/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ 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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/getopt/Makefile.depend
+++ b/usr.bin/getopt/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/gprof/Makefile.depend
+++ b/usr.bin/gprof/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 75c9e1296644..e06aa1dcb23b 100644
--- a/usr.bin/grep/Makefile.depend
+++ b/usr.bin/grep/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/lib/libregex \
include \
@@ -10,6 +11,7 @@ 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 2649c1675bc9..e59b5376efc3 100644
--- a/usr.bin/gzip/Makefile.depend
+++ b/usr.bin/gzip/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/head/Makefile.depend
+++ b/usr.bin/head/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/hexdump/Makefile.depend
+++ b/usr.bin/hexdump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/id/Makefile.depend b/usr.bin/id/Makefile.depend
index 86905b4e7296..cfab52535a52 100644
--- a/usr.bin/id/Makefile.depend
+++ b/usr.bin/id/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/indent/Makefile.depend
+++ b/usr.bin/indent/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 d65cbb5d7110..b7d414c85aeb 100644
--- a/usr.bin/ipcrm/Makefile.depend
+++ b/usr.bin/ipcrm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 d65cbb5d7110..b7d414c85aeb 100644
--- a/usr.bin/ipcs/Makefile.depend
+++ b/usr.bin/ipcs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/join/Makefile.depend
+++ b/usr.bin/join/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/jot/Makefile.depend
+++ b/usr.bin/jot/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 3790ba0cea85..abb06b452307 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ 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 6514930150d7..3b0eba6af4e1 100644
--- a/usr.bin/keylogin/Makefile.depend
+++ b/usr.bin/keylogin/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 d074335f4466..5930524f9ce7 100644
--- a/usr.bin/keylogout/Makefile.depend
+++ b/usr.bin/keylogout/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 ac8f6253c607..4ece791e62b4 100644
--- a/usr.bin/killall/Makefile.depend
+++ b/usr.bin/killall/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/ktrace/Makefile.depend
+++ b/usr.bin/ktrace/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 d65cbb5d7110..b7d414c85aeb 100644
--- a/usr.bin/ktrdump/Makefile.depend
+++ b/usr.bin/ktrdump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/lam/Makefile.depend
+++ b/usr.bin/lam/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/last/Makefile.depend
+++ b/usr.bin/last/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/lastcomm/Makefile.depend
+++ b/usr.bin/lastcomm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/ldd/Makefile.depend
+++ b/usr.bin/ldd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/leave/Makefile.depend
+++ b/usr.bin/leave/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/less/Makefile.depend
+++ b/usr.bin/less/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/lessecho/Makefile.depend
+++ b/usr.bin/lessecho/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/lesskey/Makefile.depend
+++ b/usr.bin/lesskey/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 afbe02588041..40b445f04779 100644
--- a/usr.bin/limits/Makefile.depend
+++ b/usr.bin/limits/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/locale/Makefile.depend
+++ b/usr.bin/locale/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/locate/bigram/Makefile.depend
+++ b/usr.bin/locate/bigram/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/locate/code/Makefile.depend
+++ b/usr.bin/locate/code/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/locate/locate/Makefile.depend
+++ b/usr.bin/locate/locate/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 ecfa29edb713..59126995bf0c 100644
--- a/usr.bin/lock/Makefile.depend
+++ b/usr.bin/lock/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/lockf/Makefile.depend
+++ b/usr.bin/lockf/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/logger/Makefile.depend
+++ b/usr.bin/logger/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 cc80c7c09c21..5dbe42cdaf55 100644
--- a/usr.bin/login/Makefile.depend
+++ b/usr.bin/login/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/logins/Makefile.depend
+++ b/usr.bin/logins/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/logname/Makefile.depend
+++ b/usr.bin/logname/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/look/Makefile.depend
+++ b/usr.bin/look/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/lsvfs/Makefile.depend
+++ b/usr.bin/lsvfs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8375ef67fd6d..6da741b42b7f 100644
--- a/usr.bin/lzmainfo/Makefile.depend
+++ b/usr.bin/lzmainfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 6ea36dcc046d..429b9f2eddc2 100644
--- a/usr.bin/m4/Makefile.depend
+++ b/usr.bin/m4/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/mail/Makefile.depend
+++ b/usr.bin/mail/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 569fd1c18b9a..8d258dfd965e 100644
--- a/usr.bin/makewhatis/Makefile.depend
+++ b/usr.bin/makewhatis/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 baa289a3eb1c..b6149c033a2f 100644
--- a/usr.bin/mandoc/Makefile.depend
+++ b/usr.bin/mandoc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/mesg/Makefile.depend
+++ b/usr.bin/mesg/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 569fd1c18b9a..8d258dfd965e 100644
--- a/usr.bin/minigzip/Makefile.depend
+++ b/usr.bin/minigzip/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 c0e2c4ad739d..26b0cb7f5dde 100644
--- a/usr.bin/ministat/Makefile.depend
+++ b/usr.bin/ministat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/mkfifo/Makefile.depend
+++ b/usr.bin/mkfifo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 c534fe6ed1c6..38018d75b343 100644
--- a/usr.bin/mklocale/Makefile.depend
+++ b/usr.bin/mklocale/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/mkstr/Makefile.depend
+++ b/usr.bin/mkstr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/mktemp/Makefile.depend
+++ b/usr.bin/mktemp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8375ef67fd6d..6da741b42b7f 100644
--- a/usr.bin/mkulzma/Makefile.depend
+++ b/usr.bin/mkulzma/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 569fd1c18b9a..8d258dfd965e 100644
--- a/usr.bin/mkuzip/Makefile.depend
+++ b/usr.bin/mkuzip/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/msgs/Makefile.depend
+++ b/usr.bin/msgs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/mt/Makefile.depend
+++ b/usr.bin/mt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 25b01eb5a09b..46ae5afac68b 100644
--- a/usr.bin/nc/Makefile.depend
+++ b/usr.bin/nc/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 6f21a492a45d..22a43b9738e3 100644
--- a/usr.bin/ncal/Makefile.depend
+++ b/usr.bin/ncal/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 258cf562a2c1..12d044647034 100644
--- a/usr.bin/netstat/Makefile.depend
+++ b/usr.bin/netstat/Makefile.depend
@@ -3,14 +3,15 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
- lib/libipx \
lib/libkvm \
lib/libmemstat \
lib/libnetgraph \
diff --git a/usr.bin/newgrp/Makefile.depend b/usr.bin/newgrp/Makefile.depend
index 1797aa74422f..8c9b44e8e0a4 100644
--- a/usr.bin/newgrp/Makefile.depend
+++ b/usr.bin/newgrp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libutil \
diff --git a/usr.bin/nfsstat/Makefile.depend b/usr.bin/nfsstat/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/usr.bin/nfsstat/Makefile.depend
+++ b/usr.bin/nfsstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/nice/Makefile.depend
+++ b/usr.bin/nice/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/nl/Makefile.depend
+++ b/usr.bin/nl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/nohup/Makefile.depend
+++ b/usr.bin/nohup/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 4c63db9b2496..8607f4373445 100644
--- a/usr.bin/opieinfo/Makefile.depend
+++ b/usr.bin/opieinfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 4c63db9b2496..8607f4373445 100644
--- a/usr.bin/opiekey/Makefile.depend
+++ b/usr.bin/opiekey/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 4c63db9b2496..8607f4373445 100644
--- a/usr.bin/opiepasswd/Makefile.depend
+++ b/usr.bin/opiepasswd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 d12466d6a618..afe8c8b3c68f 100644
--- a/usr.bin/passwd/Makefile.depend
+++ b/usr.bin/passwd/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/paste/Makefile.depend
+++ b/usr.bin/paste/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/pathchk/Makefile.depend
+++ b/usr.bin/pathchk/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/perror/Makefile.depend
+++ b/usr.bin/perror/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/pr/Makefile.depend
+++ b/usr.bin/pr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/printenv/Makefile.depend
+++ b/usr.bin/printenv/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/printf/Makefile.depend
+++ b/usr.bin/printf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 a6a3edcfd0f1..232852e0fd16 100644
--- a/usr.bin/procstat/Makefile.depend
+++ b/usr.bin/procstat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 f3b4295fa83f..8d990c379a15 100644
--- a/usr.bin/quota/Makefile.depend
+++ b/usr.bin/quota/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 afbe02588041..40b445f04779 100644
--- a/usr.bin/rctl/Makefile.depend
+++ b/usr.bin/rctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/renice/Makefile.depend
+++ b/usr.bin/renice/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/rev/Makefile.depend
+++ b/usr.bin/rev/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/revoke/Makefile.depend
+++ b/usr.bin/revoke/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/rlogin/Makefile.depend
+++ b/usr.bin/rlogin/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/rpcgen/Makefile.depend
+++ b/usr.bin/rpcgen/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8e92349d5291..886683c668e9 100644
--- a/usr.bin/rpcinfo/Makefile.depend
+++ b/usr.bin/rpcinfo/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ 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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/rs/Makefile.depend
+++ b/usr.bin/rs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 afbe02588041..40b445f04779 100644
--- a/usr.bin/rsh/Makefile.depend
+++ b/usr.bin/rsh/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 75cde037ea8f..30a67fae3522 100644
--- a/usr.bin/rup/Makefile.depend
+++ b/usr.bin/rup/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ 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 591ea4c790a0..b3c03a71825a 100644
--- a/usr.bin/ruptime/Makefile.depend
+++ b/usr.bin/ruptime/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/protocols \
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 75cde037ea8f..30a67fae3522 100644
--- a/usr.bin/rusers/Makefile.depend
+++ b/usr.bin/rusers/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ 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 d074335f4466..5930524f9ce7 100644
--- a/usr.bin/rwall/Makefile.depend
+++ b/usr.bin/rwall/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 591ea4c790a0..b3c03a71825a 100644
--- a/usr.bin/rwho/Makefile.depend
+++ b/usr.bin/rwho/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/protocols \
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 afbe02588041..40b445f04779 100644
--- a/usr.bin/script/Makefile.depend
+++ b/usr.bin/script/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/sed/Makefile.depend
+++ b/usr.bin/sed/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 c0e2c4ad739d..26b0cb7f5dde 100644
--- a/usr.bin/seq/Makefile.depend
+++ b/usr.bin/seq/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 d074335f4466..5930524f9ce7 100644
--- a/usr.bin/showmount/Makefile.depend
+++ b/usr.bin/showmount/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/sockstat/Makefile.depend
+++ b/usr.bin/sockstat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 8e6ef04f61bf..d95413e60409 100644
--- a/usr.bin/sort/Makefile.depend
+++ b/usr.bin/sort/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 afbe02588041..40b445f04779 100644
--- a/usr.bin/split/Makefile.depend
+++ b/usr.bin/split/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/stat/Makefile.depend
+++ b/usr.bin/stat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/stdbuf/Makefile.depend
+++ b/usr.bin/stdbuf/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 cc80c7c09c21..5dbe42cdaf55 100644
--- a/usr.bin/su/Makefile.depend
+++ b/usr.bin/su/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
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 ea1044b9c939..ae33ba876636 100644
--- a/usr.bin/systat/Makefile.depend
+++ b/usr.bin/systat/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/tabs/Makefile.depend
+++ b/usr.bin/tabs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/tail/Makefile.depend
+++ b/usr.bin/tail/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 86fad698731b..310bef38e929 100644
--- a/usr.bin/talk/Makefile.depend
+++ b/usr.bin/talk/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,8 +11,8 @@ 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/tcopy/Makefile.depend b/usr.bin/tcopy/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/tcopy/Makefile.depend
+++ b/usr.bin/tcopy/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/tee/Makefile.depend
+++ b/usr.bin/tee/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/tftp/Makefile.depend b/usr.bin/tftp/Makefile.depend
index 0ca3031c40a5..6033e4a5149c 100644
--- a/usr.bin/tftp/Makefile.depend
+++ b/usr.bin/tftp/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/time/Makefile.depend
+++ b/usr.bin/time/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/tip/tip/Makefile.depend
+++ b/usr.bin/tip/tip/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 f66c56b61909..ad0f13a519b1 100644
--- a/usr.bin/top/Makefile.depend
+++ b/usr.bin/top/Makefile.depend
@@ -3,12 +3,15 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
+ lib/libjail \
lib/libkvm \
lib/msun \
lib/ncurses/ncurses \
diff --git a/usr.bin/touch/Makefile.depend b/usr.bin/touch/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/touch/Makefile.depend
+++ b/usr.bin/touch/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/tput/Makefile.depend
+++ b/usr.bin/tput/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/tr/Makefile.depend
+++ b/usr.bin/tr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 9547aa79a6f4..ed02837d7018 100644
--- a/usr.bin/true/Makefile.depend
+++ b/usr.bin/true/Makefile.depend
@@ -3,9 +3,11 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
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 afbe02588041..40b445f04779 100644
--- a/usr.bin/truncate/Makefile.depend
+++ b/usr.bin/truncate/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 7c9eb58b782b..34492d5ffcd7 100644
--- a/usr.bin/truss/Makefile.depend.amd64
+++ b/usr.bin/truss/Makefile.depend.amd64
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ 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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/tset/Makefile.depend
+++ b/usr.bin/tset/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/tsort/Makefile.depend
+++ b/usr.bin/tsort/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/tty/Makefile.depend
+++ b/usr.bin/tty/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 dd43fad9b357..233a7c6cd0b8 100644
--- a/usr.bin/ul/Makefile.depend
+++ b/usr.bin/ul/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/uname/Makefile.depend
+++ b/usr.bin/uname/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/unexpand/Makefile.depend
+++ b/usr.bin/unexpand/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/unifdef/Makefile.depend
+++ b/usr.bin/unifdef/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/uniq/Makefile.depend
+++ b/usr.bin/uniq/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 c244cb86490a..e7af95cdf21a 100644
--- a/usr.bin/units/Makefile.depend
+++ b/usr.bin/units/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/unvis/Makefile.depend
+++ b/usr.bin/unvis/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/usbhidaction/Makefile.depend b/usr.bin/usbhidaction/Makefile.depend
index 86ee446e313e..0cf2f69216dd 100644
--- a/usr.bin/usbhidaction/Makefile.depend
+++ b/usr.bin/usbhidaction/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 86ee446e313e..0cf2f69216dd 100644
--- a/usr.bin/usbhidctl/Makefile.depend
+++ b/usr.bin/usbhidctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/users/Makefile.depend
+++ b/usr.bin/users/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/uudecode/Makefile.depend
+++ b/usr.bin/uudecode/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/uuencode/Makefile.depend
+++ b/usr.bin/uuencode/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 799cb2895e14..4f613d1fc876 100644
--- a/usr.bin/vacation/Makefile.depend
+++ b/usr.bin/vacation/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/vgrind/Makefile.depend
+++ b/usr.bin/vgrind/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 9d7543f3525f..41f7b7051ee1 100644
--- a/usr.bin/vi/Makefile.depend
+++ b/usr.bin/vi/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/vis/Makefile.depend
+++ b/usr.bin/vis/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8f934055b0c5..c26fc4630e14 100644
--- a/usr.bin/vmstat/Makefile.depend
+++ b/usr.bin/vmstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 963ecaeaf315..2d49890bb27e 100644
--- a/usr.bin/w/Makefile.depend
+++ b/usr.bin/w/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/wall/Makefile.depend
+++ b/usr.bin/wall/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/wc/Makefile.depend
+++ b/usr.bin/wc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/what/Makefile.depend
+++ b/usr.bin/what/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/whereis/Makefile.depend
+++ b/usr.bin/whereis/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/which/Makefile.depend
+++ b/usr.bin/which/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/who/Makefile.depend
+++ b/usr.bin/who/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 26cf1959f6fe..5269280d143c 100644
--- a/usr.bin/whois/Makefile.depend
+++ b/usr.bin/whois/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/write/Makefile.depend
+++ b/usr.bin/write/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/xargs/Makefile.depend
+++ b/usr.bin/xargs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 97ae6066098d..43462417933d 100644
--- a/usr.bin/xinstall/Makefile.depend
+++ b/usr.bin/xinstall/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 4715298eeb90..2cf17dca4ec9 100644
--- a/usr.bin/xlint/lint1/Makefile.depend
+++ b/usr.bin/xlint/lint1/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/xlint/lint2/Makefile.depend
+++ b/usr.bin/xlint/lint2/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/xlint/xlint/Makefile.depend
+++ b/usr.bin/xlint/xlint/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/xstr/Makefile.depend
+++ b/usr.bin/xstr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8375ef67fd6d..6da741b42b7f 100644
--- a/usr.bin/xz/Makefile.depend
+++ b/usr.bin/xz/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 8375ef67fd6d..6da741b42b7f 100644
--- a/usr.bin/xzdec/Makefile.depend
+++ b/usr.bin/xzdec/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 65ce5679ccda..6caf55f2706e 100644
--- a/usr.bin/yacc/Makefile.depend
+++ b/usr.bin/yacc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
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 82222e2879c7..e9a1dda6ca51 100644
--- a/usr.bin/yes/Makefile.depend
+++ b/usr.bin/yes/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
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 d074335f4466..5930524f9ce7 100644
--- a/usr.bin/ypcat/Makefile.depend
+++ b/usr.bin/ypcat/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 d074335f4466..5930524f9ce7 100644
--- a/usr.bin/ypmatch/Makefile.depend
+++ b/usr.bin/ypmatch/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
@@ -10,6 +11,7 @@ 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 8800879854fe..1c61866765c9 100644
--- a/usr.bin/ypwhich/Makefile.depend
+++ b/usr.bin/ypwhich/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ac/Makefile.depend b/usr.sbin/ac/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/ac/Makefile.depend
+++ b/usr.sbin/ac/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/accton/Makefile.depend b/usr.sbin/accton/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/accton/Makefile.depend
+++ b/usr.sbin/accton/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/acpi/acpiconf/Makefile.depend b/usr.sbin/acpi/acpiconf/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/acpi/acpiconf/Makefile.depend
+++ b/usr.sbin/acpi/acpiconf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/acpi/acpidb/Makefile.depend b/usr.sbin/acpi/acpidb/Makefile.depend
index 9926a3a7caa6..e1ba49601114 100644
--- a/usr.sbin/acpi/acpidb/Makefile.depend
+++ b/usr.sbin/acpi/acpidb/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
diff --git a/usr.sbin/acpi/acpidump/Makefile.depend b/usr.sbin/acpi/acpidump/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/acpi/acpidump/Makefile.depend
+++ b/usr.sbin/acpi/acpidump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/acpi/iasl/Makefile.depend b/usr.sbin/acpi/iasl/Makefile.depend
index 2d5671eabcd8..107b2f1db4bd 100644
--- a/usr.sbin/acpi/iasl/Makefile.depend
+++ b/usr.sbin/acpi/iasl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/amd/amd/Makefile.depend b/usr.sbin/amd/amd/Makefile.depend
index f251242ceea2..9fe831b1c564 100644
--- a/usr.sbin/amd/amd/Makefile.depend
+++ b/usr.sbin/amd/amd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/amq/Makefile.depend b/usr.sbin/amd/amq/Makefile.depend
index 1c84a42c87fd..092b301ab9b2 100644
--- a/usr.sbin/amd/amq/Makefile.depend
+++ b/usr.sbin/amd/amq/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/fixmount/Makefile.depend b/usr.sbin/amd/fixmount/Makefile.depend
index 00b10ef6ddd6..d7a7ddc139fc 100644
--- a/usr.sbin/amd/fixmount/Makefile.depend
+++ b/usr.sbin/amd/fixmount/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libwrap \
diff --git a/usr.sbin/amd/fsinfo/Makefile.depend b/usr.sbin/amd/fsinfo/Makefile.depend
index 875ca03a4ca9..293b77888407 100644
--- a/usr.sbin/amd/fsinfo/Makefile.depend
+++ b/usr.sbin/amd/fsinfo/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/hlfsd/Makefile.depend b/usr.sbin/amd/hlfsd/Makefile.depend
index 1c84a42c87fd..092b301ab9b2 100644
--- a/usr.sbin/amd/hlfsd/Makefile.depend
+++ b/usr.sbin/amd/hlfsd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/mk-amd-map/Makefile.depend b/usr.sbin/amd/mk-amd-map/Makefile.depend
index 1c84a42c87fd..092b301ab9b2 100644
--- a/usr.sbin/amd/mk-amd-map/Makefile.depend
+++ b/usr.sbin/amd/mk-amd-map/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/pawd/Makefile.depend b/usr.sbin/amd/pawd/Makefile.depend
index 1c84a42c87fd..092b301ab9b2 100644
--- a/usr.sbin/amd/pawd/Makefile.depend
+++ b/usr.sbin/amd/pawd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/amd/wire-test/Makefile.depend b/usr.sbin/amd/wire-test/Makefile.depend
index 1c84a42c87fd..092b301ab9b2 100644
--- a/usr.sbin/amd/wire-test/Makefile.depend
+++ b/usr.sbin/amd/wire-test/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
usr.sbin/amd/include \
diff --git a/usr.sbin/ancontrol/Makefile.depend b/usr.sbin/ancontrol/Makefile.depend
index f73af6bdb0a2..c1f494f87eff 100644
--- a/usr.sbin/ancontrol/Makefile.depend
+++ b/usr.sbin/ancontrol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
diff --git a/usr.sbin/apm/Makefile.depend b/usr.sbin/apm/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/apm/Makefile.depend
+++ b/usr.sbin/apm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/arp/Makefile.depend b/usr.sbin/arp/Makefile.depend
index 26cf1959f6fe..5269280d143c 100644
--- a/usr.sbin/arp/Makefile.depend
+++ b/usr.sbin/arp/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/asf/Makefile.depend b/usr.sbin/asf/Makefile.depend
index d65cbb5d7110..b7d414c85aeb 100644
--- a/usr.sbin/asf/Makefile.depend
+++ b/usr.sbin/asf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.sbin/audit/Makefile.depend b/usr.sbin/audit/Makefile.depend
index 86905b4e7296..cfab52535a52 100644
--- a/usr.sbin/audit/Makefile.depend
+++ b/usr.sbin/audit/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/auditd/Makefile.depend b/usr.sbin/auditd/Makefile.depend
index 6930b9381da8..0de12f7d62a6 100644
--- a/usr.sbin/auditd/Makefile.depend
+++ b/usr.sbin/auditd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/libauditd \
lib/libbsm \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/auditreduce/Makefile.depend b/usr.sbin/auditreduce/Makefile.depend
index 86905b4e7296..cfab52535a52 100644
--- a/usr.sbin/auditreduce/Makefile.depend
+++ b/usr.sbin/auditreduce/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbsm \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/authpf/Makefile.depend b/usr.sbin/authpf/Makefile.depend
index b13e8fa18e96..5a23e70ffbae 100644
--- a/usr.sbin/authpf/Makefile.depend
+++ b/usr.sbin/authpf/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libutil \
diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile.depend b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
index e7ad4fafade0..fad2a1d2fe7b 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile.depend
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
lib/libusb \
diff --git a/usr.sbin/bluetooth/bcmfw/Makefile.depend b/usr.sbin/bluetooth/bcmfw/Makefile.depend
index 0fadb2183fbe..f5603505d900 100644
--- a/usr.sbin/bluetooth/bcmfw/Makefile.depend
+++ b/usr.sbin/bluetooth/bcmfw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/bluetooth/bt3cfw/Makefile.depend b/usr.sbin/bluetooth/bt3cfw/Makefile.depend
index 0fadb2183fbe..f5603505d900 100644
--- a/usr.sbin/bluetooth/bt3cfw/Makefile.depend
+++ b/usr.sbin/bluetooth/bt3cfw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
index 9d5ce26f3e7e..93c221eb4ad8 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
lib/libusbhid \
diff --git a/usr.sbin/bluetooth/bthidd/Makefile.depend b/usr.sbin/bluetooth/bthidd/Makefile.depend
index dd522cf64a22..b9d70b78114e 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile.depend
+++ b/usr.sbin/bluetooth/bthidd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libusbhid \
diff --git a/usr.sbin/bluetooth/btpand/Makefile.depend b/usr.sbin/bluetooth/btpand/Makefile.depend
index 51c0276323a3..994099d3d0fd 100644
--- a/usr.sbin/bluetooth/btpand/Makefile.depend
+++ b/usr.sbin/bluetooth/btpand/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
lib/libutil \
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile.depend b/usr.sbin/bluetooth/hccontrol/Makefile.depend
index 2a95a05d0df9..334348050096 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/hccontrol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile.depend b/usr.sbin/bluetooth/hcsecd/Makefile.depend
index 7af5744dfd34..71286d98a1a7 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile.depend
+++ b/usr.sbin/bluetooth/hcsecd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile.depend b/usr.sbin/bluetooth/hcseriald/Makefile.depend
index 0fadb2183fbe..f5603505d900 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile.depend
+++ b/usr.sbin/bluetooth/hcseriald/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
diff --git a/usr.sbin/bluetooth/l2control/Makefile.depend b/usr.sbin/bluetooth/l2control/Makefile.depend
index 2a95a05d0df9..334348050096 100644
--- a/usr.sbin/bluetooth/l2control/Makefile.depend
+++ b/usr.sbin/bluetooth/l2control/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/l2ping/Makefile.depend b/usr.sbin/bluetooth/l2ping/Makefile.depend
index 1b2f1e2c7240..beb640354e0e 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile.depend
+++ b/usr.sbin/bluetooth/l2ping/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
index 71d0106e87c2..8402227f3aa8 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
index 71d0106e87c2..8402227f3aa8 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.sbin/bluetooth/sdpd/Makefile.depend b/usr.sbin/bluetooth/sdpd/Makefile.depend
index 8724ad104b03..461c623490a6 100644
--- a/usr.sbin/bluetooth/sdpd/Makefile.depend
+++ b/usr.sbin/bluetooth/sdpd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.sbin/boot0cfg/Makefile.depend b/usr.sbin/boot0cfg/Makefile.depend
index 099436d63905..bac69c034a3b 100644
--- a/usr.sbin/boot0cfg/Makefile.depend
+++ b/usr.sbin/boot0cfg/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile.depend b/usr.sbin/bootparamd/bootparamd/Makefile.depend
index c774bad0ac70..49a473e8ad26 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile.depend
+++ b/usr.sbin/bootparamd/bootparamd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bootparamd/callbootd/Makefile.depend b/usr.sbin/bootparamd/callbootd/Makefile.depend
index 9a29bf8b8e62..2b23406601da 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile.depend
+++ b/usr.sbin/bootparamd/callbootd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
index c82f3b2f7ff9..c0c3ad805dba 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libdialog \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
+++ b/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/btxld/Makefile.depend b/usr.sbin/btxld/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/btxld/Makefile.depend
+++ b/usr.sbin/btxld/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/cdcontrol/Makefile.depend b/usr.sbin/cdcontrol/Makefile.depend
index 0ca3031c40a5..6033e4a5149c 100644
--- a/usr.sbin/cdcontrol/Makefile.depend
+++ b/usr.sbin/cdcontrol/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.sbin/chkgrp/Makefile.depend b/usr.sbin/chkgrp/Makefile.depend
index 65ce5679ccda..6caf55f2706e 100644
--- a/usr.sbin/chkgrp/Makefile.depend
+++ b/usr.sbin/chkgrp/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \