summaryrefslogtreecommitdiff
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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 09144cacba33e..8792a2fdc9d0a 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 591ea4c790a04..b3c03a71825a3 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 65ce5679ccda0..6caf55f2706e0 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 afbe02588041e..40b445f047795 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 ce3b6ab0d1b3d..26e188813d669 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 ad3c317dabfe4..b8efbdcd65f1f 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 d65cbb5d71101..b7d414c85aebe 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 d0dee83e31ae7..55f64b8f923e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 5d4653b26ee4a..369993741a21c 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 1ce8bcc32ceaa..8c34e2e9ee315 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 82222e2879c71..e9a1dda6ca510 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 7cebd167f56bc..8289d12000c88 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 3ecdaf9d9f7eb..8f7dd109b8ff6 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 c0e2c4ad739db..26b0cb7f5ddef 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 21b3f4a4d49cd..c37dc06029e66 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 5491942bf46ed..d4b30864d0e63 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 f7e66f1c71d7c..e6ee354f02f62 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 ea888b8dd98f9..bbd5273b1c9b4 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 21820009e1101..ee2b9c1e6e665 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 0dfef4dcd5185..6a7ea61cc73b6 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 ada171346726c..2dd7922d54ae8 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 0dfef4dcd5185..6a7ea61cc73b6 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 df2384b66d871..659d7cca1ad8a 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 866f4dfca1283..672391411234b 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 7b76f1bf9ac6e..e31b2b34708f7 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 d6ce1e90a61c9..0c093416d1b6f 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 e5f3c82c5133a..516fe6780d656 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 e5e0670ecbf53..1accae89ba856 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 866f4dfca1283..672391411234b 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 866f4dfca1283..672391411234b 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 65ce5679ccda0..6caf55f2706e0 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 c0e2c4ad739db..26b0cb7f5ddef 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 c0e2c4ad739db..26b0cb7f5ddef 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 82222e2879c71..e9a1dda6ca510 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 c0e2c4ad739db..26b0cb7f5ddef 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 65ce5679ccda0..6caf55f2706e0 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 1375164ddc52a..796e9bf46bb61 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 cbb43ab610c4b..1fbfd7fffcf5e 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 e9550952ded00..71accaeebd526 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 dd43fad9b357b..233a7c6cd0b81 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 aeea88b2fa870..c64a40fd9bc11 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 f9644cd4852c6..e24c102fd2169 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 5d533a4fcd45b..1afbe8be911cf 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 e583d947164b4..f720db2bf7fb8 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 03255c03729a3..c9c4fe5b3febe 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 d12d3720b2c31..9a0d07116a188 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 e583d947164b4..f720db2bf7fb8 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 e583d947164b4..f720db2bf7fb8 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 0b25f2ae2ac46..b21a71066e66c 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 e583d947164b4..f720db2bf7fb8 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 e583d947164b4..f720db2bf7fb8 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 e583d947164b4..f720db2bf7fb8 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 e583d947164b4..f720db2bf7fb8 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 d16e7b05543ee..2652a148e659b 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 2db3c0066df07..fa5c21cf859c4 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 12613ee5fe5b3..87b6d9d514bfe 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 986bc33a6253b..05572c6be3583 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 d16e7b05543ee..2652a148e659b 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 2db3c0066df07..fa5c21cf859c4 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 35a0b670a376a..546cb43f4f041 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 51d3c70a7766d..ead1ad513fac8 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 26cf1959f6fea..5269280d143cc 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 a1f877240498f..97cb0bdfd01e7 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 a1f877240498f..97cb0bdfd01e7 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 a1f877240498f..97cb0bdfd01e7 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 a1f877240498f..97cb0bdfd01e7 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 a1f877240498f..97cb0bdfd01e7 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 a1f877240498f..97cb0bdfd01e7 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 6666db6dddaed..f380135722553 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 5a1d3f9ca69b3..6936f25a9e7a6 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 5a1d3f9ca69b3..6936f25a9e7a6 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 e57b66ca5165f..aea5b2d8cc45a 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 c42313497c77e..345d8fbb2d229 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 5a1d3f9ca69b3..6936f25a9e7a6 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 5a1d3f9ca69b3..6936f25a9e7a6 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 5a1d3f9ca69b3..6936f25a9e7a6 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 a7a2cfe57d2c5..80cfb86ca689b 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 5a1d3f9ca69b3..6936f25a9e7a6 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 5a1d3f9ca69b3..6936f25a9e7a6 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 ffeaed7041b44..5f92b0df5f81c 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 ffeaed7041b44..5f92b0df5f81c 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 ffeaed7041b44..5f92b0df5f81c 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 30aa918292040..b4de749641064 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 5a1d3f9ca69b3..6936f25a9e7a6 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 78b71f28e9a22..0e57857f4e80d 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 f9f14bd89125f..3c6803038b80a 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 eb62ba113e3da..4300e83bcc164 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 e3b3fdbac9fb9..adec3fdafec65 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 e3b3fdbac9fb9..adec3fdafec65 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 e3b3fdbac9fb9..adec3fdafec65 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 e3b3fdbac9fb9..adec3fdafec65 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 b82dd514321df..a8e1a3f5ba333 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 9926a3a7caa65..e1ba49601114f 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 120f352c39208..1bd43f6f33600 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 d1272937d3bce..13680b314856b 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 d679d16abc168..27304ee9f793a 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 7ae977189d603..5e661c1bddb27 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 085cac44091c0..2d1668bda45ca 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 25028476c082c..c515f44f9e7d1 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 d8062556edc38..752a34352cc27 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 fc6d95f383e3e..6f092c9115312 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 7424055480c9d..bc14f56bdfff3 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 b030effca2ff8..616f3ba77615e 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 82222e2879c71..e9a1dda6ca510 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 8a69c213c3c20..a1157119ad51d 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 ab94ddd24ec72..67b4ef08e1f9b 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 d65cbb5d71101..b7d414c85aebe 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 60e33a7ed174a..1b2ce3e41ae69 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 11dc760ac2db3..af92ff9ef9e3f 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 b5d32499cb84b..7c6b7073c2eee 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 df2384b66d871..659d7cca1ad8a 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 65ce5679ccda0..6caf55f2706e0 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 b55a47429e7a3..a66d580db4dcf 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 82222e2879c71..e9a1dda6ca510 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 a0b3a1c093fd2..841cdfd90dabe 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 e5717fca49c27..89518b5ff2907 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 569fd1c18b9a9..8d258dfd965ed 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 6d52fa5934c96..9561917e02934 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 d65cbb5d71101..b7d414c85aebe 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 9ca55561cff56..92baf08bda74f 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 f73af6bdb0a2e..c1f494f87eff7 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 65ce5679ccda0..6caf55f2706e0 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 499706a8d1318..f44d17dcca74b 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 d12466d6a6185..afe8c8b3c68f0 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 499706a8d1318..f44d17dcca74b 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 499706a8d1318..f44d17dcca74b 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 499706a8d1318..f44d17dcca74b 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 499706a8d1318..f44d17dcca74b 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 499706a8d1318..f44d17dcca74b 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 499706a8d1318..f44d17dcca74b 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 499706a8d1318..f44d17dcca74b 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 5947196b49e41..3d8c2f306ad00 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 3bef9098f85c1..91d27924dfb52 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 bbe263ef92172..94ab2e8f6fbf0 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 07deaf653875b..89eac3ede0d5c 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 d12466d6a6185..afe8c8b3c68f0 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 499706a8d1318..f44d17dcca74b 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 d12466d6a6185..afe8c8b3c68f0 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 499706a8d1318..f44d17dcca74b 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 d12466d6a6185..afe8c8b3c68f0 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 8dd8b0abde1d3..bc4b7343419e7 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 f34115b0ca05d..13a84801d0c2a 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 32085ed846458..2b635d7fa37e3 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 65ce5679ccda0..6caf55f2706e0 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 b00a701196186..363d9a0730b3b 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 3444d93877685..7e162f7cd899d 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 4764e3d90d2f3..4651ca83b9196 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 7053f44c85447..7b1e7f4f70157 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 9926a3a7caa65..e1ba49601114f 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 ec27fe402f3bc..6b94eaeeb5afa 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 65ce5679ccda0..6caf55f2706e0 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 1b2f1e2c7240b..beb640354e0e5 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 fc61e1a879375..b1a67cd37ad91 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 65ce5679ccda0..6caf55f2706e0 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 9926a3a7caa65..e1ba49601114f 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 f73af6bdb0a2e..c1f494f87eff7 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 5d619f8fac055..f3adefe058019 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 9926a3a7caa65..e1ba49601114f 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 afbe02588041e..40b445f047795 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 26cf1959f6fea..5269280d143cc 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 cca28a5934a62..619ca757937cc 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 44fd13d38a6c7..9363728953258 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 d8fdf1b99945a..e942aba988765 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 64dab5575bd50..3ca328f016d0d 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 d46744f5e033b..981ac37cd263c 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 fb4de0c0af0b5..6274ac87202f3 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 78f9b8a1f9ee3..b26f3c2fe5c7a 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 5db7c851afdf9..e5c91fb693ef0 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 9cc13a251fbfc..c5a301e94c818 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 5947196b49e41..3d8c2f306ad00 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 26cf1959f6fea..5269280d143cc 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 26cf1959f6fea..5269280d143cc 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 ee948eaa011ec..e3af08532eec4 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 44ee786b7e19c..a648938b6ff49 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 afbe02588041e..40b445f047795 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 1d3e8d899246e..d4bbfb2aa92ac 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 d074335f44664..5930524f9ce7f 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 2b972daf01f6c..a2060055a2421 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 ee948eaa011ec..e3af08532eec4 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 74982d7fcb453..27a6a4a115b8c 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 35a6e3704da8e..e7870b4b49c37 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 f3b4295fa83f6..8d990c379a157 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 bd7098e0b6ce5..d9693fd647523 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 6514930150d7e..3b0eba6af4e15 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 9473758ae4656..e513c61c35481 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 6515b7d984daf..47096166cc737 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 48e46367c59a0..11fa4d730adce 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 52befbc6e6ade..8452af99c632f 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 26cf1959f6fea..5269280d143cc 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 74a1dd9afe701..a02eba6f2277b 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 b1f47e3d7a34f..dfe8b1b467897 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 37e8f0c298b46..9641db9a41760 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 65ce5679ccda0..6caf55f2706e0 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 374b5e7b5c949..7fb8fce4559ac 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 099436d63905c..bac69c034a3b6 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 0b2207fafdc46..c79bce5f2287a 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 099436d63905c..bac69c034a3b6 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 d65cbb5d71101..b7d414c85aebe 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 65ce5679ccda0..6caf55f2706e0 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 ee948eaa011ec..e3af08532eec4 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 d65cbb5d71101..b7d414c85aebe 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 591ea4c790a04..b3c03a71825a3 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 374b5e7b5c949..7fb8fce4559ac 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 099436d63905c..bac69c034a3b6 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 374b5e7b5c949..7fb8fce4559ac 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 65ce5679ccda0..6caf55f2706e0 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 374b5e7b5c949..7fb8fce4559ac 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 65ce5679ccda0..6caf55f2706e0 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 be095ed989dfd..749626347205a 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 afbe02588041e..40b445f047795 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 e4727db7c7cd3..b9c27745e1562 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 1f1fba6599ac6..bc686f5b76426 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 1f1fba6599ac6..bc686f5b76426 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 8511c7e6b492e..83f19b190dd7e 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 1f1fba6599ac6..bc686f5b76426 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 096ef6a38bc94..6ba212c71e01a 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 1f1fba6599ac6..bc686f5b76426 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 1f1fba6599ac6..bc686f5b76426 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 1f1fba6599ac6..bc686f5b76426 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 5a31f61e93b3c..a6d50feedd981 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 096ef6a38bc94..6ba212c71e01a 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 096ef6a38bc94..6ba212c71e01a 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 1f1fba6599ac6..bc686f5b76426 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 1f1fba6599ac6..bc686f5b76426 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 1f1fba6599ac6..bc686f5b76426 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 1f1fba6599ac6..bc686f5b76426 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 e45c05bdbf529..f9880dbe60751 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 f02e48a244126..ae94793659447 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 5390077c58053..85448cf03bfff 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 f769d32fd3a4c..2ad23bc89f48e 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 afbe02588041e..40b445f047795 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 af362c6df9d9e..ab889550d0b60 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 4ab51a8797f87..63a1548cafe57 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 e6bd1bdc009b4..1b2a0bde85e06 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 758bc4a86581a..2532b4df7c6be 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 a529f3d9bf0d4..ae05e22e3b02e 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 ced2fec81ba6e..4023f007f83db 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 66f35a9d7324a..2acc1cb14510c 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 de6d116b4359c..38d4caa8bbdb6 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 2567c30aa30ae..221f0bceb10a6 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 ee54bccf27ab9..e039ce09709e7 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 a086482f151b4..eed6565d0e1f9 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 007e48a6829be..59ad864f74e51 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 f517717238363..f58230065ebe3 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 5d619f8fac055..f3adefe058019 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 5166c2950d6da..0b555dc8a5eab 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 afbe02588041e..40b445f047795 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 fc61e1a879375..b1a67cd37ad91 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 65ce5679ccda0..6caf55f2706e0 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 1c47396976055..22fad8deab8a4 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 8800879854fef..1c61866765c98 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 65ce5679ccda0..6caf55f2706e0 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 02925dbfb3c86..b7e649d8d7d67 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 65ce5679ccda0..6caf55f2706e0 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 4895a6be1adc5..a15829ca96b8c 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 5d3e06f00b2bf..d6d2939dca6d0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 2bcf5c8ba6532..c4ddd860abced 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 33251c64b4c02..b42437a19d440 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 39b873c5e2d95..dbc78f8a03843 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 cabd9aaaf7e1c..57b18a823075f 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 afbe02588041e..40b445f047795 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 ec5b06b88b13a..c642cb1106ce8 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 591ea4c790a04..b3c03a71825a3 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 6eb2cfd3e1d4d..b8fd554574794 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 98a7ed97a3ba2..28d49cc899666 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 26cf1959f6fea..5269280d143cc 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 569fd1c18b9a9..8d258dfd965ed 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 ca1104186a79a..736ae92288020 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 afbe02588041e..40b445f047795 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 65ce5679ccda0..6caf55f2706e0 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 374b5e7b5c949..7fb8fce4559ac 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 d074335f44664..5930524f9ce7f 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 82222e2879c71..e9a1dda6ca510 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 8a69c213c3c20..a1157119ad51d 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 f584b912ab47a..1d7d03c9ac9ca 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 6add1330aa925..5b1f96fd4a824 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 6a928de283004..3cc8704c86d63 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 65ce5679ccda0..6caf55f2706e0 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 2a95a05d0df9c..3343480500967 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 233d193fa383f..c8112080776af 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 71d0106e87c2c..8402227f3aa8b 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 154abfc2fcdc2..eaf546ae1d126 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 65ce5679ccda0..6caf55f2706e0 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 815fd2408131b..e13f9731efe88 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 815fd2408131b..e13f9731efe88 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 f2d5926917ad7..7616a5eeee2c7 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 c0e2c4ad739db..26b0cb7f5ddef 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 32257f8560518..eff6559d030b2 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 99cfa04656b71..8249cb41cd02b 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 dc76041756694..b442c85b1bfad 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 50f15cd0e6cbe..4ee17dedb94b7 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 afbe02588041e..40b445f047795 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 ecfa29edb7137..59126995bf0c5 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 a88f1ac3e5e23..5d1fe0e16cf9d 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 82222e2879c71..e9a1dda6ca510 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 bcc0a7a3c0163..9e4103f0ee3d0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 488c0034e6332..c811358a1162a 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 82222e2879c71..e9a1dda6ca510 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 ff175d71ad8f2..1adc0d1cd8b44 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 01589a3343d00..c121cbc81234e 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 26cf1959f6fea..5269280d143cc 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 57b0e222f1296..2b3f880dc2a77 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 8e92349d52914..886683c668e93 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 75c9e12966444..e06aa1dcb23b3 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 2649c1675bc9f..e59b5376efc35 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 86905b4e72962..cfab52535a521 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 65ce5679ccda0..6caf55f2706e0 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 d65cbb5d71101..b7d414c85aebe 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 d65cbb5d71101..b7d414c85aebe 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 3790ba0cea850..abb06b4523079 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 6514930150d7e..3b0eba6af4e15 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 d074335f44664..5930524f9ce7f 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 ac8f6253c6070..4ece791e62b47 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 65ce5679ccda0..6caf55f2706e0 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 d65cbb5d71101..b7d414c85aebe 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 afbe02588041e..40b445f047795 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 ecfa29edb7137..59126995bf0c5 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 cc80c7c09c21d..5dbe42cdaf550 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 8375ef67fd6de..6da741b42b7f8 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 6ea36dcc046d5..429b9f2eddc21 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 65ce5679ccda0..6caf55f2706e0 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 569fd1c18b9a9..8d258dfd965ed 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 baa289a3eb1ca..b6149c033a2f0 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 65ce5679ccda0..6caf55f2706e0 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 569fd1c18b9a9..8d258dfd965ed 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 c0e2c4ad739db..26b0cb7f5ddef 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 65ce5679ccda0..6caf55f2706e0 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 c534fe6ed1c65..38018d75b3438 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 8375ef67fd6de..6da741b42b7f8 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 569fd1c18b9a9..8d258dfd965ed 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 25b01eb5a09b9..46ae5afac68be 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 6f21a492a45d3..22a43b9738e31 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 258cf562a2c10..12d044647034a 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 1797aa74422f7..8c9b44e8e0a42 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 d65cbb5d71101..b7d414c85aebe 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 4c63db9b24967..8607f43734459 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 4c63db9b24967..8607f43734459 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 4c63db9b24967..8607f43734459 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 d12466d6a6185..afe8c8b3c68f0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 a6a3edcfd0f1a..232852e0fd165 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 f3b4295fa83f6..8d990c379a157 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 afbe02588041e..40b445f047795 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 8e92349d52914..886683c668e93 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 65ce5679ccda0..6caf55f2706e0 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 afbe02588041e..40b445f047795 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 75cde037ea8fd..30a67fae3522c 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 591ea4c790a04..b3c03a71825a3 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 75cde037ea8fd..30a67fae3522c 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 d074335f44664..5930524f9ce7f 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 591ea4c790a04..b3c03a71825a3 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 afbe02588041e..40b445f047795 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 65ce5679ccda0..6caf55f2706e0 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 c0e2c4ad739db..26b0cb7f5ddef 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 d074335f44664..5930524f9ce7f 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 26cf1959f6fea..5269280d143cc 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 8e6ef04f61bf6..d95413e604090 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 afbe02588041e..40b445f047795 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 cc80c7c09c21d..5dbe42cdaf550 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 ea1044b9c9398..ae33ba8766362 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 86fad698731bf..310bef38e9295 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 0ca3031c40a5d..6033e4a5149c4 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 f66c56b61909a..ad0f13a519b15 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 65ce5679ccda0..6caf55f2706e0 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 9547aa79a6f4c..ed02837d70184 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 afbe02588041e..40b445f047795 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 7c9eb58b782b1..34492d5ffcd77 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 dd43fad9b357b..233a7c6cd0b81 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 dd43fad9b357b..233a7c6cd0b81 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 c244cb86490a6..e7af95cdf21a1 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 82222e2879c71..e9a1dda6ca510 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 86ee446e313e8..0cf2f69216dd5 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 86ee446e313e8..0cf2f69216dd5 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 26cf1959f6fea..5269280d143cc 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 799cb2895e14b..4f613d1fc876e 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 65ce5679ccda0..6caf55f2706e0 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 9d7543f3525fd..41f7b7051ee1a 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 65ce5679ccda0..6caf55f2706e0 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 8f934055b0c55..c26fc4630e144 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 963ecaeaf3152..2d49890bb27ef 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 97ae6066098d5..43462417933dc 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 4715298eeb901..2cf17dca4ec92 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 8375ef67fd6de..6da741b42b7f8 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 8375ef67fd6de..6da741b42b7f8 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 65ce5679ccda0..6caf55f2706e0 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 82222e2879c71..e9a1dda6ca510 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 d074335f44664..5930524f9ce7f 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 d074335f44664..5930524f9ce7f 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 8800879854fef..1c61866765c98 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 9926a3a7caa65..e1ba49601114f 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 65ce5679ccda0..6caf55f2706e0 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 2d5671eabcd8c..107b2f1db4bde 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 f251242ceea29..9fe831b1c5642 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 1c84a42c87fd6..092b301ab9b22 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 00b10ef6ddd6a..d7a7ddc139fc1 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 875ca03a4ca9e..293b778884070 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 1c84a42c87fd6..092b301ab9b22 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 1c84a42c87fd6..092b301ab9b22 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 1c84a42c87fd6..092b301ab9b22 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 1c84a42c87fd6..092b301ab9b22 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 f73af6bdb0a2e..c1f494f87eff7 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 65ce5679ccda0..6caf55f2706e0 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 26cf1959f6fea..5269280d143cc 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 d65cbb5d71101..b7d414c85aebe 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 86905b4e72962..cfab52535a521 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 6930b9381da83..0de12f7d62a69 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 86905b4e72962..cfab52535a521 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 b13e8fa18e962..5a23e70ffbae9 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 e7ad4fafade09..fad2a1d2fe7be 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 0fadb2183fbe8..f5603505d9008 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 0fadb2183fbe8..f5603505d9008 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 9d5ce26f3e7ef..93c221eb4ad81 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 dd522cf64a229..b9d70b78114ef 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 51c0276323a3d..994099d3d0fd1 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 2a95a05d0df9c..3343480500967 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 7af5744dfd345..71286d98a1a7c 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 0fadb2183fbe8..f5603505d9008 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 2a95a05d0df9c..3343480500967 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 1b2f1e2c7240b..beb640354e0e5 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 71d0106e87c2c..8402227f3aa8b 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 71d0106e87c2c..8402227f3aa8b 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 8724ad104b03f..461c623490a63 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 099436d63905c..bac69c034a3b6 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 c774bad0ac70d..49a473e8ad267 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 9a29bf8b8e623..2b23406601dae 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 c82f3b2f7ff93..c0c3ad805dba1 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 65ce5679ccda0..6caf55f2706e0 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 65ce5679ccda0..6caf55f2706e0 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 0ca3031c40a5d..6033e4a5149c4 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 65ce5679ccda0..6caf55f2706e0 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 \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/chown/Makefile.depend b/usr.sbin/chown/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/chown/Makefile.depend
+++ b/usr.sbin/chown/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/chroot/Makefile.depend b/usr.sbin/chroot/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/chroot/Makefile.depend
+++ b/usr.sbin/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 \
diff --git a/usr.sbin/ckdist/Makefile.depend b/usr.sbin/ckdist/Makefile.depend
index 5d619f8fac055..f3adefe058019 100644
--- a/usr.sbin/ckdist/Makefile.depend
+++ b/usr.sbin/ckdist/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/clear_locks/Makefile.depend b/usr.sbin/clear_locks/Makefile.depend
index 6514930150d7e..3b0eba6af4e15 100644
--- a/usr.sbin/clear_locks/Makefile.depend
+++ b/usr.sbin/clear_locks/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.sbin/config/Makefile.depend b/usr.sbin/config/Makefile.depend
index fff9db282af7d..37666058320e6 100644
--- a/usr.sbin/config/Makefile.depend
+++ b/usr.sbin/config/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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 \
usr.bin/lex/lib \
diff --git a/usr.sbin/cpucontrol/Makefile.depend b/usr.sbin/cpucontrol/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/cpucontrol/Makefile.depend
+++ b/usr.sbin/cpucontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/cron/cron/Makefile.depend b/usr.sbin/cron/cron/Makefile.depend
index fb82275224600..956f11385666d 100644
--- a/usr.sbin/cron/cron/Makefile.depend
+++ b/usr.sbin/cron/cron/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/cron/crontab/Makefile.depend b/usr.sbin/cron/crontab/Makefile.depend
index f04de102faebb..479fd4bc824fa 100644
--- a/usr.sbin/cron/crontab/Makefile.depend
+++ b/usr.sbin/cron/crontab/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/crunch/crunchgen/Makefile.depend b/usr.sbin/crunch/crunchgen/Makefile.depend
index f1dd969d39d95..b0880915ddc9f 100644
--- a/usr.sbin/crunch/crunchgen/Makefile.depend
+++ b/usr.sbin/crunch/crunchgen/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/crunch/crunchide/Makefile.depend b/usr.sbin/crunch/crunchide/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/crunch/crunchide/Makefile.depend
+++ b/usr.sbin/crunch/crunchide/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/ctladm/Makefile.depend b/usr.sbin/ctladm/Makefile.depend
index abbcb84aaa9fe..9fb65fb33df1c 100644
--- a/usr.sbin/ctladm/Makefile.depend
+++ b/usr.sbin/ctladm/Makefile.depend
@@ -3,11 +3,13 @@
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/libexpat \
diff --git a/usr.sbin/ctm/ctm/Makefile.depend b/usr.sbin/ctm/ctm/Makefile.depend
index 5d619f8fac055..f3adefe058019 100644
--- a/usr.sbin/ctm/ctm/Makefile.depend
+++ b/usr.sbin/ctm/ctm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/ctm/ctm_dequeue/Makefile.depend b/usr.sbin/ctm/ctm_dequeue/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile.depend
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/ctm/ctm_rmail/Makefile.depend b/usr.sbin/ctm/ctm_rmail/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/ctm/ctm_rmail/Makefile.depend
+++ b/usr.sbin/ctm/ctm_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 \
diff --git a/usr.sbin/ctm/ctm_smail/Makefile.depend b/usr.sbin/ctm/ctm_smail/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile.depend
+++ b/usr.sbin/ctm/ctm_smail/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/daemon/Makefile.depend b/usr.sbin/daemon/Makefile.depend
index 7417785c6430b..bd2426af0eca4 100644
--- a/usr.sbin/daemon/Makefile.depend
+++ b/usr.sbin/daemon/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/libutil \
diff --git a/usr.sbin/dconschat/Makefile.depend b/usr.sbin/dconschat/Makefile.depend
index d7113b4351cf1..803dc63a94f7f 100644
--- a/usr.sbin/dconschat/Makefile.depend
+++ b/usr.sbin/dconschat/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 \
diff --git a/usr.sbin/devinfo/Makefile.depend b/usr.sbin/devinfo/Makefile.depend
index f56fdc6cc68df..62d696039291a 100644
--- a/usr.sbin/devinfo/Makefile.depend
+++ b/usr.sbin/devinfo/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/libdevinfo \
diff --git a/usr.sbin/digictl/Makefile.depend b/usr.sbin/digictl/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/digictl/Makefile.depend
+++ b/usr.sbin/digictl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/diskinfo/Makefile.depend b/usr.sbin/diskinfo/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/diskinfo/Makefile.depend
+++ b/usr.sbin/diskinfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/dumpcis/Makefile.depend b/usr.sbin/dumpcis/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/dumpcis/Makefile.depend
+++ b/usr.sbin/dumpcis/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/editmap/Makefile.depend b/usr.sbin/editmap/Makefile.depend
index fcc2f04134f98..93db1c449e5c2 100644
--- a/usr.sbin/editmap/Makefile.depend
+++ b/usr.sbin/editmap/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/edquota/Makefile.depend b/usr.sbin/edquota/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/edquota/Makefile.depend
+++ b/usr.sbin/edquota/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/extattr/Makefile.depend b/usr.sbin/extattr/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/extattr/Makefile.depend
+++ b/usr.sbin/extattr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/extattrctl/Makefile.depend b/usr.sbin/extattrctl/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/extattrctl/Makefile.depend
+++ b/usr.sbin/extattrctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/faithd/Makefile.depend b/usr.sbin/faithd/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/usr.sbin/faithd/Makefile.depend
+++ b/usr.sbin/faithd/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/usr.sbin/fdcontrol/Makefile.depend b/usr.sbin/fdcontrol/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/fdcontrol/Makefile.depend
+++ b/usr.sbin/fdcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/fdformat/Makefile.depend b/usr.sbin/fdformat/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/fdformat/Makefile.depend
+++ b/usr.sbin/fdformat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/fdread/Makefile.depend b/usr.sbin/fdread/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/fdread/Makefile.depend
+++ b/usr.sbin/fdread/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/fdwrite/Makefile.depend b/usr.sbin/fdwrite/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/fdwrite/Makefile.depend
+++ b/usr.sbin/fdwrite/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/fifolog/fifolog_create/Makefile.depend b/usr.sbin/fifolog/fifolog_create/Makefile.depend
index 26ca8b56e34f6..8e9bccfd1293c 100644
--- a/usr.sbin/fifolog/fifolog_create/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_create/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/libutil \
usr.sbin/fifolog/lib \
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile.depend b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
index 28635880e3382..e1918714b78dd 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libz \
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile.depend b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
index 28635880e3382..e1918714b78dd 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile.depend
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libz \
diff --git a/usr.sbin/flowctl/Makefile.depend b/usr.sbin/flowctl/Makefile.depend
index 2b972daf01f6c..a2060055a2421 100644
--- a/usr.sbin/flowctl/Makefile.depend
+++ b/usr.sbin/flowctl/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/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend b/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend
index 262510be803e3..149691f61243e 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend
+++ b/usr.sbin/ftp-proxy/ftp-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 \
usr.sbin/ftp-proxy/libevent \
diff --git a/usr.sbin/fwcontrol/Makefile.depend b/usr.sbin/fwcontrol/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/fwcontrol/Makefile.depend
+++ b/usr.sbin/fwcontrol/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/getfmac/Makefile.depend b/usr.sbin/getfmac/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/getfmac/Makefile.depend
+++ b/usr.sbin/getfmac/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/getpmac/Makefile.depend b/usr.sbin/getpmac/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/getpmac/Makefile.depend
+++ b/usr.sbin/getpmac/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/gpioctl/Makefile.depend b/usr.sbin/gpioctl/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/gpioctl/Makefile.depend
+++ b/usr.sbin/gpioctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/gstat/Makefile.depend b/usr.sbin/gstat/Makefile.depend
index 4c1d38fb0a900..35163f86750f8 100644
--- a/usr.sbin/gstat/Makefile.depend
+++ b/usr.sbin/gstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/i2c/Makefile.depend b/usr.sbin/i2c/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/i2c/Makefile.depend
+++ b/usr.sbin/i2c/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/ifmcstat/Makefile.depend b/usr.sbin/ifmcstat/Makefile.depend
index d7113b4351cf1..803dc63a94f7f 100644
--- a/usr.sbin/ifmcstat/Makefile.depend
+++ b/usr.sbin/ifmcstat/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 \
diff --git a/usr.sbin/inetd/Makefile.depend b/usr.sbin/inetd/Makefile.depend
index f76682596a626..9143faf6062de 100644
--- a/usr.sbin/inetd/Makefile.depend
+++ b/usr.sbin/inetd/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/libipsec \
lib/libutil \
diff --git a/usr.sbin/iostat/Makefile.depend b/usr.sbin/iostat/Makefile.depend
index 7078381a77e63..7c9f840d29487 100644
--- a/usr.sbin/iostat/Makefile.depend
+++ b/usr.sbin/iostat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/ip6addrctl/Makefile.depend b/usr.sbin/ip6addrctl/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/ip6addrctl/Makefile.depend
+++ b/usr.sbin/ip6addrctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/ipfwpcap/Makefile.depend b/usr.sbin/ipfwpcap/Makefile.depend
index 33251c64b4c02..b42437a19d440 100644
--- a/usr.sbin/ipfwpcap/Makefile.depend
+++ b/usr.sbin/ipfwpcap/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/jail/Makefile.depend b/usr.sbin/jail/Makefile.depend
index 9ac6f68694242..db8479a2a1238 100644
--- a/usr.sbin/jail/Makefile.depend
+++ b/usr.sbin/jail/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/libjail \
lib/libkvm \
diff --git a/usr.sbin/jexec/Makefile.depend b/usr.sbin/jexec/Makefile.depend
index beac2722e7de1..427ef996336d6 100644
--- a/usr.sbin/jexec/Makefile.depend
+++ b/usr.sbin/jexec/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/libjail \
lib/libutil \
diff --git a/usr.sbin/jls/Makefile.depend b/usr.sbin/jls/Makefile.depend
index b323301e7ab84..6a22d19e6ba5e 100644
--- a/usr.sbin/jls/Makefile.depend
+++ b/usr.sbin/jls/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/libjail \
diff --git a/usr.sbin/kbdcontrol/Makefile.depend b/usr.sbin/kbdcontrol/Makefile.depend
index 49de3bc70fc08..cd4d236402c63 100644
--- a/usr.sbin/kbdcontrol/Makefile.depend
+++ b/usr.sbin/kbdcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.bin/lex/lib \
diff --git a/usr.sbin/kbdmap/Makefile.depend b/usr.sbin/kbdmap/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/kbdmap/Makefile.depend
+++ b/usr.sbin/kbdmap/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/kgmon/Makefile.depend b/usr.sbin/kgmon/Makefile.depend
index d65cbb5d71101..b7d414c85aebe 100644
--- a/usr.sbin/kgmon/Makefile.depend
+++ b/usr.sbin/kgmon/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/kldxref/Makefile.depend b/usr.sbin/kldxref/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/kldxref/Makefile.depend
+++ b/usr.sbin/kldxref/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/lastlogin/Makefile.depend b/usr.sbin/lastlogin/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/lastlogin/Makefile.depend
+++ b/usr.sbin/lastlogin/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/lmcconfig/Makefile.depend b/usr.sbin/lmcconfig/Makefile.depend
index 0fadb2183fbe8..f5603505d9008 100644
--- a/usr.sbin/lmcconfig/Makefile.depend
+++ b/usr.sbin/lmcconfig/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/lpr/chkprintcap/Makefile.depend b/usr.sbin/lpr/chkprintcap/Makefile.depend
index 8f77f91c01d28..72675faee6505 100644
--- a/usr.sbin/lpr/chkprintcap/Makefile.depend
+++ b/usr.sbin/lpr/chkprintcap/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
index 82222e2879c71..e9a1dda6ca510 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2855/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.sbin/lpr/filters.ru/koi2alt/Makefile.depend b/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
index 82222e2879c71..e9a1dda6ca510 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
+++ b/usr.sbin/lpr/filters.ru/koi2alt/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.sbin/lpr/filters/Makefile.depend b/usr.sbin/lpr/filters/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/lpr/filters/Makefile.depend
+++ b/usr.sbin/lpr/filters/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/lpr/lpc/Makefile.depend b/usr.sbin/lpr/lpc/Makefile.depend
index 6d57f0188bb6d..9d5d53e5e417a 100644
--- a/usr.sbin/lpr/lpc/Makefile.depend
+++ b/usr.sbin/lpr/lpc/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/lpr/lpd/Makefile.depend b/usr.sbin/lpr/lpd/Makefile.depend
index 0243d450e61b2..9c027ea14c726 100644
--- a/usr.sbin/lpr/lpd/Makefile.depend
+++ b/usr.sbin/lpr/lpd/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.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lpq/Makefile.depend b/usr.sbin/lpr/lpq/Makefile.depend
index 8f77f91c01d28..72675faee6505 100644
--- a/usr.sbin/lpr/lpq/Makefile.depend
+++ b/usr.sbin/lpr/lpq/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lpr/Makefile.depend b/usr.sbin/lpr/lpr/Makefile.depend
index 8f77f91c01d28..72675faee6505 100644
--- a/usr.sbin/lpr/lpr/Makefile.depend
+++ b/usr.sbin/lpr/lpr/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lprm/Makefile.depend b/usr.sbin/lpr/lprm/Makefile.depend
index 8f77f91c01d28..72675faee6505 100644
--- a/usr.sbin/lpr/lprm/Makefile.depend
+++ b/usr.sbin/lpr/lprm/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lpr/lptest/Makefile.depend b/usr.sbin/lpr/lptest/Makefile.depend
index 82222e2879c71..e9a1dda6ca510 100644
--- a/usr.sbin/lpr/lptest/Makefile.depend
+++ b/usr.sbin/lpr/lptest/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.sbin/lpr/pac/Makefile.depend b/usr.sbin/lpr/pac/Makefile.depend
index 8f77f91c01d28..72675faee6505 100644
--- a/usr.sbin/lpr/pac/Makefile.depend
+++ b/usr.sbin/lpr/pac/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.sbin/lpr/common_source \
diff --git a/usr.sbin/lptcontrol/Makefile.depend b/usr.sbin/lptcontrol/Makefile.depend
index 82222e2879c71..e9a1dda6ca510 100644
--- a/usr.sbin/lptcontrol/Makefile.depend
+++ b/usr.sbin/lptcontrol/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.sbin/mailstats/Makefile.depend b/usr.sbin/mailstats/Makefile.depend
index 86a4151e97009..58c5c7f30c7f3 100644
--- a/usr.sbin/mailstats/Makefile.depend
+++ b/usr.sbin/mailstats/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libsmutil \
diff --git a/usr.sbin/mailwrapper/Makefile.depend b/usr.sbin/mailwrapper/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/mailwrapper/Makefile.depend
+++ b/usr.sbin/mailwrapper/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/makefs/Makefile.depend b/usr.sbin/makefs/Makefile.depend
index e549f55152198..8f76fa4c1fc96 100644
--- a/usr.sbin/makefs/Makefile.depend
+++ b/usr.sbin/makefs/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libnetbsd \
lib/libsbuf \
diff --git a/usr.sbin/makemap/Makefile.depend b/usr.sbin/makemap/Makefile.depend
index 3363ae1d72615..f0d84e2e7b2a2 100644
--- a/usr.sbin/makemap/Makefile.depend
+++ b/usr.sbin/makemap/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/memcontrol/Makefile.depend b/usr.sbin/memcontrol/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/memcontrol/Makefile.depend
+++ b/usr.sbin/memcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/mfiutil/Makefile.depend b/usr.sbin/mfiutil/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/mfiutil/Makefile.depend
+++ b/usr.sbin/mfiutil/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/mixer/Makefile.depend b/usr.sbin/mixer/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/mixer/Makefile.depend
+++ b/usr.sbin/mixer/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/mld6query/Makefile.depend b/usr.sbin/mld6query/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/mld6query/Makefile.depend
+++ b/usr.sbin/mld6query/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/mlxcontrol/Makefile.depend b/usr.sbin/mlxcontrol/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/mlxcontrol/Makefile.depend
+++ b/usr.sbin/mlxcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/mountd/Makefile.depend b/usr.sbin/mountd/Makefile.depend
index bd7098e0b6ce5..d9693fd647523 100644
--- a/usr.sbin/mountd/Makefile.depend
+++ b/usr.sbin/mountd/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/usr.sbin/moused/Makefile.depend b/usr.sbin/moused/Makefile.depend
index ccc35b8af14f7..6e19c15e849b2 100644
--- a/usr.sbin/moused/Makefile.depend
+++ b/usr.sbin/moused/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/msun \
diff --git a/usr.sbin/mptable/Makefile.depend b/usr.sbin/mptable/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/mptable/Makefile.depend
+++ b/usr.sbin/mptable/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/mptutil/Makefile.depend b/usr.sbin/mptutil/Makefile.depend
index 0b2207fafdc46..c79bce5f2287a 100644
--- a/usr.sbin/mptutil/Makefile.depend
+++ b/usr.sbin/mptutil/Makefile.depend
@@ -3,11 +3,13 @@
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/usr.sbin/mtest/Makefile.depend b/usr.sbin/mtest/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/mtest/Makefile.depend
+++ b/usr.sbin/mtest/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/mtree/Makefile.depend b/usr.sbin/mtree/Makefile.depend
index 5d619f8fac055..f3adefe058019 100644
--- a/usr.sbin/mtree/Makefile.depend
+++ b/usr.sbin/mtree/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/ndiscvt/Makefile.depend b/usr.sbin/ndiscvt/Makefile.depend
index 717e7b61a9743..a4e44851d4694 100644
--- a/usr.sbin/ndiscvt/Makefile.depend
+++ b/usr.sbin/ndiscvt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
usr.bin/lex/lib \
diff --git a/usr.sbin/ndp/Makefile.depend b/usr.sbin/ndp/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/ndp/Makefile.depend
+++ b/usr.sbin/ndp/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/newsyslog/Makefile.depend b/usr.sbin/newsyslog/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/newsyslog/Makefile.depend
+++ b/usr.sbin/newsyslog/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/nfscbd/Makefile.depend b/usr.sbin/nfscbd/Makefile.depend
index 0de3a4ae3d330..eaaeea993366c 100644
--- a/usr.sbin/nfscbd/Makefile.depend
+++ b/usr.sbin/nfscbd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/nfsd/Makefile.depend b/usr.sbin/nfsd/Makefile.depend
index 8800879854fef..1c61866765c98 100644
--- a/usr.sbin/nfsd/Makefile.depend
+++ b/usr.sbin/nfsd/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/nfsdumpstate/Makefile.depend b/usr.sbin/nfsdumpstate/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/nfsdumpstate/Makefile.depend
+++ b/usr.sbin/nfsdumpstate/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/nfsrevoke/Makefile.depend b/usr.sbin/nfsrevoke/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/nfsrevoke/Makefile.depend
+++ b/usr.sbin/nfsrevoke/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/nfsuserd/Makefile.depend b/usr.sbin/nfsuserd/Makefile.depend
index 0de3a4ae3d330..eaaeea993366c 100644
--- a/usr.sbin/nfsuserd/Makefile.depend
+++ b/usr.sbin/nfsuserd/Makefile.depend
@@ -3,12 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.sbin/ngctl/Makefile.depend b/usr.sbin/ngctl/Makefile.depend
index 272b5cc87938c..37af2e2aa525c 100644
--- a/usr.sbin/ngctl/Makefile.depend
+++ b/usr.sbin/ngctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libnetgraph \
diff --git a/usr.sbin/nghook/Makefile.depend b/usr.sbin/nghook/Makefile.depend
index 0fadb2183fbe8..f5603505d9008 100644
--- a/usr.sbin/nghook/Makefile.depend
+++ b/usr.sbin/nghook/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/nologin/Makefile.depend b/usr.sbin/nologin/Makefile.depend
index 6871eb59a0e88..0e905603c6602 100644
--- a/usr.sbin/nologin/Makefile.depend
+++ b/usr.sbin/nologin/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
include \
lib/${CSU_DIR} \
lib/libc \
diff --git a/usr.sbin/nscd/Makefile.depend b/usr.sbin/nscd/Makefile.depend
index a4729648ced70..467cf7b913731 100644
--- a/usr.sbin/nscd/Makefile.depend
+++ b/usr.sbin/nscd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libutil \
diff --git a/usr.sbin/ntp/sntp/Makefile.depend b/usr.sbin/ntp/sntp/Makefile.depend
index 4433894e8af91..9ceac4ec3f26a 100644
--- a/usr.sbin/ntp/sntp/Makefile.depend
+++ b/usr.sbin/ntp/sntp/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/msun \
usr.sbin/ntp/libopts \
diff --git a/usr.sbin/pciconf/Makefile.depend b/usr.sbin/pciconf/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/pciconf/Makefile.depend
+++ b/usr.sbin/pciconf/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/pmcannotate/Makefile.depend b/usr.sbin/pmcannotate/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/pmcannotate/Makefile.depend
+++ b/usr.sbin/pmcannotate/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/pmccontrol/Makefile.depend b/usr.sbin/pmccontrol/Makefile.depend
index 6a9aed0d32d97..efab25b028156 100644
--- a/usr.sbin/pmccontrol/Makefile.depend
+++ b/usr.sbin/pmccontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libpmc \
diff --git a/usr.sbin/pmcstat/Makefile.depend b/usr.sbin/pmcstat/Makefile.depend
index bed53d87edb3a..a12bc72ddbb57 100644
--- a/usr.sbin/pmcstat/Makefile.depend
+++ b/usr.sbin/pmcstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/portsnap/make_index/Makefile.depend b/usr.sbin/portsnap/make_index/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/portsnap/make_index/Makefile.depend
+++ b/usr.sbin/portsnap/make_index/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/portsnap/phttpget/Makefile.depend b/usr.sbin/portsnap/phttpget/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/portsnap/phttpget/Makefile.depend
+++ b/usr.sbin/portsnap/phttpget/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/powerd/Makefile.depend b/usr.sbin/powerd/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/powerd/Makefile.depend
+++ b/usr.sbin/powerd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/pppctl/Makefile.depend b/usr.sbin/pppctl/Makefile.depend
index 7df722139e91f..33f37206d1545 100644
--- a/usr.sbin/pppctl/Makefile.depend
+++ b/usr.sbin/pppctl/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/libthr \
diff --git a/usr.sbin/praliases/Makefile.depend b/usr.sbin/praliases/Makefile.depend
index 7c8c5bc0ced64..742a51b9c7165 100644
--- a/usr.sbin/praliases/Makefile.depend
+++ b/usr.sbin/praliases/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/praudit/Makefile.depend b/usr.sbin/praudit/Makefile.depend
index 86905b4e72962..cfab52535a521 100644
--- a/usr.sbin/praudit/Makefile.depend
+++ b/usr.sbin/praudit/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/procctl/Makefile.depend b/usr.sbin/procctl/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/procctl/Makefile.depend
+++ b/usr.sbin/procctl/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/pstat/Makefile.depend b/usr.sbin/pstat/Makefile.depend
index 8ab5cd4582a19..d5037d299cbfe 100644
--- a/usr.sbin/pstat/Makefile.depend
+++ b/usr.sbin/pstat/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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 \
lib/libutil \
diff --git a/usr.sbin/pw/Makefile.depend b/usr.sbin/pw/Makefile.depend
index 1797aa74422f7..8c9b44e8e0a42 100644
--- a/usr.sbin/pw/Makefile.depend
+++ b/usr.sbin/pw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/pwd_mkdb/Makefile.depend b/usr.sbin/pwd_mkdb/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/pwd_mkdb/Makefile.depend
+++ b/usr.sbin/pwd_mkdb/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/quot/Makefile.depend b/usr.sbin/quot/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/quot/Makefile.depend
+++ b/usr.sbin/quot/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/quotaon/Makefile.depend b/usr.sbin/quotaon/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/quotaon/Makefile.depend
+++ b/usr.sbin/quotaon/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/rarpd/Makefile.depend b/usr.sbin/rarpd/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/usr.sbin/rarpd/Makefile.depend
+++ b/usr.sbin/rarpd/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/usr.sbin/repquota/Makefile.depend b/usr.sbin/repquota/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/repquota/Makefile.depend
+++ b/usr.sbin/repquota/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/rip6query/Makefile.depend b/usr.sbin/rip6query/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/rip6query/Makefile.depend
+++ b/usr.sbin/rip6query/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/rmt/Makefile.depend b/usr.sbin/rmt/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/rmt/Makefile.depend
+++ b/usr.sbin/rmt/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/route6d/Makefile.depend b/usr.sbin/route6d/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/route6d/Makefile.depend
+++ b/usr.sbin/route6d/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/rpc.lockd/Makefile.depend b/usr.sbin/rpc.lockd/Makefile.depend
index 3c9d7a38f9ec5..036f9836837cf 100644
--- a/usr.sbin/rpc.lockd/Makefile.depend
+++ b/usr.sbin/rpc.lockd/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/usr.sbin/rpc.statd/Makefile.depend b/usr.sbin/rpc.statd/Makefile.depend
index 74608330b6206..57f69dadf00a4 100644
--- a/usr.sbin/rpc.statd/Makefile.depend
+++ b/usr.sbin/rpc.statd/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.sbin/rpc.umntall/Makefile.depend b/usr.sbin/rpc.umntall/Makefile.depend
index d074335f44664..5930524f9ce7f 100644
--- a/usr.sbin/rpc.umntall/Makefile.depend
+++ b/usr.sbin/rpc.umntall/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.sbin/rpc.yppasswdd/Makefile.depend b/usr.sbin/rpc.yppasswdd/Makefile.depend
index d8b9fa8fcb514..a3e7a5eca9fac 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile.depend
+++ b/usr.sbin/rpc.yppasswdd/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/libcrypt \
lib/librpcsvc \
diff --git a/usr.sbin/rpc.ypupdated/Makefile.depend b/usr.sbin/rpc.ypupdated/Makefile.depend
index b88e71079efb5..e39027bd7c0b1 100644
--- a/usr.sbin/rpc.ypupdated/Makefile.depend
+++ b/usr.sbin/rpc.ypupdated/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.sbin/rpc.ypxfrd/Makefile.depend b/usr.sbin/rpc.ypxfrd/Makefile.depend
index 48f98922bdad7..91c9284ebd47f 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile.depend
+++ b/usr.sbin/rpc.ypxfrd/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.sbin/rpcbind/Makefile.depend b/usr.sbin/rpcbind/Makefile.depend
index 2503b486bf4ee..924e5c4aae693 100644
--- a/usr.sbin/rpcbind/Makefile.depend
+++ b/usr.sbin/rpcbind/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 \
lib/libwrap \
diff --git a/usr.sbin/rrenumd/Makefile.depend b/usr.sbin/rrenumd/Makefile.depend
index 368f2482f09d5..4416d5f8ea676 100644
--- a/usr.sbin/rrenumd/Makefile.depend
+++ b/usr.sbin/rrenumd/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/usr.sbin/rtadvctl/Makefile.depend b/usr.sbin/rtadvctl/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/rtadvctl/Makefile.depend
+++ b/usr.sbin/rtadvctl/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/rtadvd/Makefile.depend b/usr.sbin/rtadvd/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/usr.sbin/rtadvd/Makefile.depend
+++ b/usr.sbin/rtadvd/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/usr.sbin/rtprio/Makefile.depend b/usr.sbin/rtprio/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/rtprio/Makefile.depend
+++ b/usr.sbin/rtprio/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/rtsold/Makefile.depend b/usr.sbin/rtsold/Makefile.depend
index d7113b4351cf1..803dc63a94f7f 100644
--- a/usr.sbin/rtsold/Makefile.depend
+++ b/usr.sbin/rtsold/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 \
diff --git a/usr.sbin/rwhod/Makefile.depend b/usr.sbin/rwhod/Makefile.depend
index 48e46367c59a0..11fa4d730adce 100644
--- a/usr.sbin/rwhod/Makefile.depend
+++ b/usr.sbin/rwhod/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.sbin/sa/Makefile.depend b/usr.sbin/sa/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/sa/Makefile.depend
+++ b/usr.sbin/sa/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/services_mkdb/Makefile.depend b/usr.sbin/services_mkdb/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/services_mkdb/Makefile.depend
+++ b/usr.sbin/services_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 \
lib/libutil \
diff --git a/usr.sbin/setfib/Makefile.depend b/usr.sbin/setfib/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/setfib/Makefile.depend
+++ b/usr.sbin/setfib/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/setfmac/Makefile.depend b/usr.sbin/setfmac/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/setfmac/Makefile.depend
+++ b/usr.sbin/setfmac/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/setpmac/Makefile.depend b/usr.sbin/setpmac/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/setpmac/Makefile.depend
+++ b/usr.sbin/setpmac/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/sicontrol/Makefile.depend b/usr.sbin/sicontrol/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/sicontrol/Makefile.depend
+++ b/usr.sbin/sicontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/smbmsg/Makefile.depend b/usr.sbin/smbmsg/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/smbmsg/Makefile.depend
+++ b/usr.sbin/smbmsg/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/snapinfo/Makefile.depend b/usr.sbin/snapinfo/Makefile.depend
index 374b5e7b5c949..7fb8fce4559ac 100644
--- a/usr.sbin/snapinfo/Makefile.depend
+++ b/usr.sbin/snapinfo/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usr.sbin/spray/Makefile.depend b/usr.sbin/spray/Makefile.depend
index 6514930150d7e..3b0eba6af4e15 100644
--- a/usr.sbin/spray/Makefile.depend
+++ b/usr.sbin/spray/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.sbin/syslogd/Makefile.depend b/usr.sbin/syslogd/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/usr.sbin/syslogd/Makefile.depend
+++ b/usr.sbin/syslogd/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/usr.sbin/tcpdchk/Makefile.depend b/usr.sbin/tcpdchk/Makefile.depend
index 74a1dd9afe701..a02eba6f2277b 100644
--- a/usr.sbin/tcpdchk/Makefile.depend
+++ b/usr.sbin/tcpdchk/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/usr.sbin/tcpdmatch/Makefile.depend b/usr.sbin/tcpdmatch/Makefile.depend
index 74a1dd9afe701..a02eba6f2277b 100644
--- a/usr.sbin/tcpdmatch/Makefile.depend
+++ b/usr.sbin/tcpdmatch/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/usr.sbin/tcpdrop/Makefile.depend b/usr.sbin/tcpdrop/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/tcpdrop/Makefile.depend
+++ b/usr.sbin/tcpdrop/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/timed/timed/Makefile.depend b/usr.sbin/timed/timed/Makefile.depend
index 87c803cdcc896..b298230158b85 100644
--- a/usr.sbin/timed/timed/Makefile.depend
+++ b/usr.sbin/timed/timed/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/libutil \
lib/msun \
diff --git a/usr.sbin/timed/timedc/Makefile.depend b/usr.sbin/timed/timedc/Makefile.depend
index 48e46367c59a0..11fa4d730adce 100644
--- a/usr.sbin/timed/timedc/Makefile.depend
+++ b/usr.sbin/timed/timedc/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.sbin/traceroute/Makefile.depend b/usr.sbin/traceroute/Makefile.depend
index a34f13856acd6..8ef0d4e1c0bdc 100644
--- a/usr.sbin/traceroute/Makefile.depend
+++ b/usr.sbin/traceroute/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.sbin/traceroute6/Makefile.depend b/usr.sbin/traceroute6/Makefile.depend
index 25b01eb5a09b9..46ae5afac68be 100644
--- a/usr.sbin/traceroute6/Makefile.depend
+++ b/usr.sbin/traceroute6/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.sbin/trpt/Makefile.depend b/usr.sbin/trpt/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/trpt/Makefile.depend
+++ b/usr.sbin/trpt/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/tzsetup/Makefile.depend b/usr.sbin/tzsetup/Makefile.depend
index 35a0b670a376a..546cb43f4f041 100644
--- a/usr.sbin/tzsetup/Makefile.depend
+++ b/usr.sbin/tzsetup/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/usr.sbin/uathload/Makefile.depend b/usr.sbin/uathload/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/uathload/Makefile.depend
+++ b/usr.sbin/uathload/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/ugidfw/Makefile.depend b/usr.sbin/ugidfw/Makefile.depend
index d0b08acfebf42..0c062e1f1df6e 100644
--- a/usr.sbin/ugidfw/Makefile.depend
+++ b/usr.sbin/ugidfw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/libugidfw \
diff --git a/usr.sbin/uhsoctl/Makefile.depend b/usr.sbin/uhsoctl/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/usr.sbin/uhsoctl/Makefile.depend
+++ b/usr.sbin/uhsoctl/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/usr.sbin/usbconfig/Makefile.depend b/usr.sbin/usbconfig/Makefile.depend
index e7ad4fafade09..fad2a1d2fe7be 100644
--- a/usr.sbin/usbconfig/Makefile.depend
+++ b/usr.sbin/usbconfig/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/usbdump/Makefile.depend b/usr.sbin/usbdump/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/usbdump/Makefile.depend
+++ b/usr.sbin/usbdump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/utx/Makefile.depend b/usr.sbin/utx/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/utx/Makefile.depend
+++ b/usr.sbin/utx/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/vidcontrol/Makefile.depend b/usr.sbin/vidcontrol/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/vidcontrol/Makefile.depend
+++ b/usr.sbin/vidcontrol/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/vipw/Makefile.depend b/usr.sbin/vipw/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/usr.sbin/vipw/Makefile.depend
+++ b/usr.sbin/vipw/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/wake/Makefile.depend b/usr.sbin/wake/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/wake/Makefile.depend
+++ b/usr.sbin/wake/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/watch/Makefile.depend b/usr.sbin/watch/Makefile.depend
index dd43fad9b357b..233a7c6cd0b81 100644
--- a/usr.sbin/watch/Makefile.depend
+++ b/usr.sbin/watch/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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.sbin/watchdogd/Makefile.depend b/usr.sbin/watchdogd/Makefile.depend
index ccc35b8af14f7..6e19c15e849b2 100644
--- a/usr.sbin/watchdogd/Makefile.depend
+++ b/usr.sbin/watchdogd/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/msun \
diff --git a/usr.sbin/wlandebug/Makefile.depend b/usr.sbin/wlandebug/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/wlandebug/Makefile.depend
+++ b/usr.sbin/wlandebug/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/wpa/hostapd_cli/Makefile.depend b/usr.sbin/wpa/hostapd_cli/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile.depend
+++ b/usr.sbin/wpa/hostapd_cli/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/wpa/ndis_events/Makefile.depend b/usr.sbin/wpa/ndis_events/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/wpa/ndis_events/Makefile.depend
+++ b/usr.sbin/wpa/ndis_events/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/wpa/wpa_cli/Makefile.depend b/usr.sbin/wpa/wpa_cli/Makefile.depend
index 0ca3031c40a5d..6033e4a5149c4 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile.depend
+++ b/usr.sbin/wpa/wpa_cli/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/wpa/wpa_passphrase/Makefile.depend b/usr.sbin/wpa/wpa_passphrase/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile.depend
+++ b/usr.sbin/wpa/wpa_passphrase/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/yp_mkdb/Makefile.depend b/usr.sbin/yp_mkdb/Makefile.depend
index d074335f44664..5930524f9ce7f 100644
--- a/usr.sbin/yp_mkdb/Makefile.depend
+++ b/usr.sbin/yp_mkdb/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.sbin/ypbind/Makefile.depend b/usr.sbin/ypbind/Makefile.depend
index 8800879854fef..1c61866765c98 100644
--- a/usr.sbin/ypbind/Makefile.depend
+++ b/usr.sbin/ypbind/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/yppoll/Makefile.depend b/usr.sbin/yppoll/Makefile.depend
index d074335f44664..5930524f9ce7f 100644
--- a/usr.sbin/yppoll/Makefile.depend
+++ b/usr.sbin/yppoll/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.sbin/yppush/Makefile.depend b/usr.sbin/yppush/Makefile.depend
index a13e0bc329c80..52a8367eeebd7 100644
--- a/usr.sbin/yppush/Makefile.depend
+++ b/usr.sbin/yppush/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.sbin/ypserv/Makefile.depend b/usr.sbin/ypserv/Makefile.depend
index 9748bb8e62610..2d2fd8adc8568 100644
--- a/usr.sbin/ypserv/Makefile.depend
+++ b/usr.sbin/ypserv/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 \
diff --git a/usr.sbin/ypset/Makefile.depend b/usr.sbin/ypset/Makefile.depend
index 8800879854fef..1c61866765c98 100644
--- a/usr.sbin/ypset/Makefile.depend
+++ b/usr.sbin/ypset/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/zic/zdump/Makefile.depend b/usr.sbin/zic/zdump/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/zic/zdump/Makefile.depend
+++ b/usr.sbin/zic/zdump/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_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/zic/zic/Makefile.depend b/usr.sbin/zic/zic/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/usr.sbin/zic/zic/Makefile.depend
+++ b/usr.sbin/zic/zic/Makefile.depend
@@ -3,11 +3,13 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc_nonshared \
lib/libcompiler_rt \