aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/cat/Makefile.depend1
-rw-r--r--bin/chflags/Makefile.depend1
-rw-r--r--bin/chio/Makefile.depend1
-rw-r--r--bin/chmod/Makefile.depend1
-rw-r--r--bin/cp/Makefile.depend1
-rw-r--r--bin/csh/Makefile.depend1
-rw-r--r--bin/date/Makefile.depend1
-rw-r--r--bin/dd/Makefile.depend1
-rw-r--r--bin/df/Makefile.depend1
-rw-r--r--bin/domainname/Makefile.depend1
-rw-r--r--bin/echo/Makefile.depend1
-rw-r--r--bin/ed/Makefile.depend1
-rw-r--r--bin/expr/Makefile.depend1
-rw-r--r--bin/getfacl/Makefile.depend1
-rw-r--r--bin/hostname/Makefile.depend1
-rw-r--r--bin/kenv/Makefile.depend1
-rw-r--r--bin/kill/Makefile.depend1
-rw-r--r--bin/ln/Makefile.depend1
-rw-r--r--bin/ls/Makefile.depend1
-rw-r--r--bin/mkdir/Makefile.depend1
-rw-r--r--bin/mv/Makefile.depend1
-rw-r--r--bin/pax/Makefile.depend1
-rw-r--r--bin/pkill/Makefile.depend1
-rw-r--r--bin/ps/Makefile.depend1
-rw-r--r--bin/pwait/Makefile.depend1
-rw-r--r--bin/pwd/Makefile.depend1
-rw-r--r--bin/rcp/Makefile.depend1
-rw-r--r--bin/realpath/Makefile.depend1
-rw-r--r--bin/rm/Makefile.depend1
-rw-r--r--bin/rmail/Makefile.depend1
-rw-r--r--bin/rmdir/Makefile.depend1
-rw-r--r--bin/setfacl/Makefile.depend1
-rw-r--r--bin/sh/Makefile.depend1
-rw-r--r--bin/sleep/Makefile.depend1
-rw-r--r--bin/stty/Makefile.depend1
-rw-r--r--bin/sync/Makefile.depend1
-rw-r--r--bin/test/Makefile.depend1
-rw-r--r--bin/uuidgen/Makefile.depend1
-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.depend1
-rw-r--r--cddl/sbin/zpool/Makefile.depend1
-rw-r--r--cddl/usr.bin/sgsmsg/Makefile.depend1
-rw-r--r--cddl/usr.bin/zinject/Makefile.depend1
-rw-r--r--cddl/usr.bin/zstreamdump/Makefile.depend1
-rw-r--r--cddl/usr.bin/ztest/Makefile.depend1
-rw-r--r--cddl/usr.sbin/lockstat/Makefile.depend1
-rw-r--r--cddl/usr.sbin/zdb/Makefile.depend1
-rw-r--r--cddl/usr.sbin/zhack/Makefile.depend1
-rw-r--r--games/bcd/Makefile.depend1
-rw-r--r--games/caesar/Makefile.depend1
-rw-r--r--games/factor/Makefile.depend1
-rw-r--r--games/fortune/fortune/Makefile.depend1
-rw-r--r--games/fortune/strfile/Makefile.depend1
-rw-r--r--games/fortune/unstr/Makefile.depend1
-rw-r--r--games/grdc/Makefile.depend1
-rw-r--r--games/morse/Makefile.depend1
-rw-r--r--games/number/Makefile.depend1
-rw-r--r--games/pom/Makefile.depend1
-rw-r--r--games/ppt/Makefile.depend1
-rw-r--r--games/primes/Makefile.depend1
-rw-r--r--games/random/Makefile.depend1
-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.depend1
-rw-r--r--gnu/usr.bin/binutils/nm/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/objcopy/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/objdump/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/readelf/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/size/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/strings/Makefile.depend1
-rw-r--r--gnu/usr.bin/binutils/strip/Makefile.depend1
-rw-r--r--gnu/usr.bin/dialog/Makefile.depend1
-rw-r--r--gnu/usr.bin/diff3/Makefile.depend1
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile.depend1
-rw-r--r--gnu/usr.bin/gdb/gdbserver/Makefile.depend1
-rw-r--r--gnu/usr.bin/gdb/gdbtui/Makefile.depend1
-rw-r--r--gnu/usr.bin/gdb/kgdb/Makefile.depend.amd641
-rw-r--r--gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/devices/grops/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/devices/grotty/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/grn/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/pic/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/refer/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/roff/groff/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend1
-rw-r--r--gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/ci/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/co/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/ident/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/merge/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/rcs/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/rcsclean/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/Makefile.depend1
-rw-r--r--gnu/usr.bin/rcs/rlog/Makefile.depend1
-rw-r--r--gnu/usr.bin/sdiff/Makefile.depend1
-rw-r--r--gnu/usr.bin/texinfo/info/Makefile.depend1
-rw-r--r--gnu/usr.bin/texinfo/infokey/Makefile.depend1
-rw-r--r--gnu/usr.bin/texinfo/install-info/Makefile.depend1
-rw-r--r--gnu/usr.bin/texinfo/makeinfo/Makefile.depend1
-rw-r--r--gnu/usr.bin/texinfo/texindex/Makefile.depend1
-rw-r--r--include/Makefile.depend1
-rw-r--r--kerberos5/lib/libasn1/Makefile.depend2
-rw-r--r--kerberos5/lib/libgssapi_krb5/Makefile.depend2
-rw-r--r--kerberos5/lib/libgssapi_ntlm/Makefile.depend2
-rw-r--r--kerberos5/lib/libgssapi_spnego/Makefile.depend2
-rw-r--r--kerberos5/lib/libhdb/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimbase/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimipcc/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimipcs/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimntlm/Makefile.depend2
-rw-r--r--kerberos5/lib/libheimsqlite/Makefile.depend2
-rw-r--r--kerberos5/lib/libhx509/Makefile.depend2
-rw-r--r--kerberos5/lib/libkadm5clnt/Makefile.depend2
-rw-r--r--kerberos5/lib/libkadm5srv/Makefile.depend2
-rw-r--r--kerberos5/lib/libkafs5/Makefile.depend2
-rw-r--r--kerberos5/lib/libkdc/Makefile.depend2
-rw-r--r--kerberos5/lib/libkrb5/Makefile.depend2
-rw-r--r--kerberos5/lib/libroken/Makefile.depend2
-rw-r--r--kerberos5/lib/libwind/Makefile.depend2
-rw-r--r--kerberos5/libexec/digest-service/Makefile.depend1
-rw-r--r--kerberos5/libexec/hprop/Makefile.depend1
-rw-r--r--kerberos5/libexec/hpropd/Makefile.depend1
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile.depend1
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile.depend1
-rw-r--r--kerberos5/libexec/kadmind/Makefile.depend1
-rw-r--r--kerberos5/libexec/kcm/Makefile.depend1
-rw-r--r--kerberos5/libexec/kdc/Makefile.depend1
-rw-r--r--kerberos5/libexec/kdigest/Makefile.depend1
-rw-r--r--kerberos5/libexec/kfd/Makefile.depend1
-rw-r--r--kerberos5/libexec/kimpersonate/Makefile.depend1
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile.depend1
-rw-r--r--kerberos5/tools/asn1_compile/Makefile.depend1
-rw-r--r--kerberos5/tools/make-roken/Makefile.depend1
-rw-r--r--kerberos5/tools/slc/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/hxtool/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kcc/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kf/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kgetcred/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kinit/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/ksu/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/string2key/Makefile.depend1
-rw-r--r--kerberos5/usr.bin/verify_krb5_conf/Makefile.depend1
-rw-r--r--kerberos5/usr.sbin/iprop-log/Makefile.depend1
-rw-r--r--kerberos5/usr.sbin/kstash/Makefile.depend1
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile.depend1
-rw-r--r--lib/atf/libatf-c++/Makefile.depend10
-rw-r--r--lib/atf/libatf-c/Makefile.depend2
-rw-r--r--lib/clang/libclanganalysis/Makefile.depend15
-rw-r--r--lib/clang/libclangarcmigrate/Makefile.depend11
-rw-r--r--lib/clang/libclangast/Makefile.depend43
-rw-r--r--lib/clang/libclangbasic/Makefile.depend4
-rw-r--r--lib/clang/libclangcodegen/Makefile.depend31
-rw-r--r--lib/clang/libclangdriver/Makefile.depend18
-rw-r--r--lib/clang/libclangedit/Makefile.depend3
-rw-r--r--lib/clang/libclangfrontend/Makefile.depend26
-rw-r--r--lib/clang/libclangfrontendtool/Makefile.depend4
-rw-r--r--lib/clang/libclanglex/Makefile.depend4
-rw-r--r--lib/clang/libclangparse/Makefile.depend9
-rw-r--r--lib/clang/libclangrewritecore/Makefile.depend3
-rw-r--r--lib/clang/libclangrewritefrontend/Makefile.depend3
-rw-r--r--lib/clang/libclangsema/Makefile.depend13
-rw-r--r--lib/clang/libclangserialization/Makefile.depend7
-rw-r--r--lib/clang/libclangstaticanalyzercheckers/Makefile.depend13
-rw-r--r--lib/clang/libclangstaticanalyzercore/Makefile.depend9
-rw-r--r--lib/clang/libclangstaticanalyzerfrontend/Makefile.depend3
-rw-r--r--lib/clang/libllvmanalysis/Makefile.depend3
-rw-r--r--lib/clang/libllvmarmasmparser/Makefile.depend3
-rw-r--r--lib/clang/libllvmarmcodegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmarmdesc/Makefile.depend9
-rw-r--r--lib/clang/libllvmarmdisassembler/Makefile.depend3
-rw-r--r--lib/clang/libllvmarminfo/Makefile.depend3
-rw-r--r--lib/clang/libllvmarminstprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmasmparser/Makefile.depend4
-rw-r--r--lib/clang/libllvmasmprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmbitreader/Makefile.depend3
-rw-r--r--lib/clang/libllvmbitwriter/Makefile.depend4
-rw-r--r--lib/clang/libllvmcodegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmcore/Makefile.depend3
-rw-r--r--lib/clang/libllvmdebuginfo/Makefile.depend4
-rw-r--r--lib/clang/libllvmexecutionengine/Makefile.depend3
-rw-r--r--lib/clang/libllvminstcombine/Makefile.depend3
-rw-r--r--lib/clang/libllvminstrumentation/Makefile.depend7
-rw-r--r--lib/clang/libllvminterpreter/Makefile.depend3
-rw-r--r--lib/clang/libllvmipa/Makefile.depend3
-rw-r--r--lib/clang/libllvmipo/Makefile.depend3
-rw-r--r--lib/clang/libllvmirreader/Makefile.depend4
-rw-r--r--lib/clang/libllvmjit/Makefile.depend3
-rw-r--r--lib/clang/libllvmlinker/Makefile.depend4
-rw-r--r--lib/clang/libllvmmc/Makefile.depend3
-rw-r--r--lib/clang/libllvmmcdisassembler/Makefile.depend4
-rw-r--r--lib/clang/libllvmmcjit/Makefile.depend3
-rw-r--r--lib/clang/libllvmmcparser/Makefile.depend4
-rw-r--r--lib/clang/libllvmmipsasmparser/Makefile.depend3
-rw-r--r--lib/clang/libllvmmipscodegen/Makefile.depend9
-rw-r--r--lib/clang/libllvmmipsdesc/Makefile.depend11
-rw-r--r--lib/clang/libllvmmipsdisassembler/Makefile.depend3
-rw-r--r--lib/clang/libllvmmipsinfo/Makefile.depend3
-rw-r--r--lib/clang/libllvmmipsinstprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmobjcarcopts/Makefile.depend3
-rw-r--r--lib/clang/libllvmobject/Makefile.depend4
-rw-r--r--lib/clang/libllvmpowerpccodegen/Makefile.depend17
-rw-r--r--lib/clang/libllvmpowerpcdesc/Makefile.depend9
-rw-r--r--lib/clang/libllvmpowerpcinfo/Makefile.depend3
-rw-r--r--lib/clang/libllvmpowerpcinstprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmruntimedyld/Makefile.depend4
-rw-r--r--lib/clang/libllvmscalaropts/Makefile.depend9
-rw-r--r--lib/clang/libllvmselectiondag/Makefile.depend3
-rw-r--r--lib/clang/libllvmsupport/Makefile.depend3
-rw-r--r--lib/clang/libllvmtablegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmtarget/Makefile.depend4
-rw-r--r--lib/clang/libllvmtransformutils/Makefile.depend5
-rw-r--r--lib/clang/libllvmvectorize/Makefile.depend5
-rw-r--r--lib/clang/libllvmx86asmparser/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86codegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86desc/Makefile.depend15
-rw-r--r--lib/clang/libllvmx86disassembler/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86info/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86instprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86utils/Makefile.depend4
-rw-r--r--lib/libalias/libalias/Makefile.depend2
-rw-r--r--lib/libalias/modules/cuseeme/Makefile.depend1
-rw-r--r--lib/libalias/modules/dummy/Makefile.depend1
-rw-r--r--lib/libalias/modules/ftp/Makefile.depend1
-rw-r--r--lib/libalias/modules/irc/Makefile.depend1
-rw-r--r--lib/libalias/modules/nbt/Makefile.depend1
-rw-r--r--lib/libalias/modules/pptp/Makefile.depend1
-rw-r--r--lib/libalias/modules/skinny/Makefile.depend1
-rw-r--r--lib/libalias/modules/smedia/Makefile.depend1
-rw-r--r--lib/libarchive/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/libbsnmp/libbsnmp/Makefile.depend2
-rw-r--r--lib/libbz2/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/libfetch/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/libiconv_modules/BIG5/Makefile.depend6
-rw-r--r--lib/libiconv_modules/DECHanyu/Makefile.depend6
-rw-r--r--lib/libiconv_modules/EUC/Makefile.depend6
-rw-r--r--lib/libiconv_modules/EUCTW/Makefile.depend6
-rw-r--r--lib/libiconv_modules/GBK2K/Makefile.depend6
-rw-r--r--lib/libiconv_modules/HZ/Makefile.depend6
-rw-r--r--lib/libiconv_modules/ISO2022/Makefile.depend6
-rw-r--r--lib/libiconv_modules/JOHAB/Makefile.depend6
-rw-r--r--lib/libiconv_modules/MSKanji/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UES/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UTF1632/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UTF7/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UTF8/Makefile.depend6
-rw-r--r--lib/libiconv_modules/VIQR/Makefile.depend6
-rw-r--r--lib/libiconv_modules/ZW/Makefile.depend6
-rw-r--r--lib/libiconv_modules/iconv_none/Makefile.depend6
-rw-r--r--lib/libiconv_modules/iconv_std/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_646/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_none/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_parallel/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_serial/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_std/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_zone/Makefile.depend6
-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/libldns/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/libmp/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_krb5/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_ksu/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_radius/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_ssh/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/libprocstat/zfs/Makefile.depend1
-rw-r--r--lib/libradius/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/libstand/Makefile.depend1
-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/libunbound/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.depend2
-rw-r--r--lib/ncurses/formw/Makefile.depend2
-rw-r--r--lib/ncurses/menu/Makefile.depend2
-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.depend2
-rw-r--r--lib/ncurses/panelw/Makefile.depend2
-rw-r--r--libexec/atf/atf-check/Makefile.depend5
-rw-r--r--libexec/atrun/Makefile.depend1
-rw-r--r--libexec/bootpd/bootpgw/Makefile.depend1
-rw-r--r--libexec/bootpd/tools/bootpef/Makefile.depend1
-rw-r--r--libexec/bootpd/tools/bootptest/Makefile.depend1
-rw-r--r--libexec/comsat/Makefile.depend1
-rw-r--r--libexec/fingerd/Makefile.depend1
-rw-r--r--libexec/ftpd/Makefile.depend1
-rw-r--r--libexec/getty/Makefile.depend1
-rw-r--r--libexec/mail.local/Makefile.depend1
-rw-r--r--libexec/mknetid/Makefile.depend1
-rw-r--r--libexec/pppoed/Makefile.depend1
-rw-r--r--libexec/rbootd/Makefile.depend1
-rw-r--r--libexec/revnetgroup/Makefile.depend1
-rw-r--r--libexec/rlogind/Makefile.depend1
-rw-r--r--libexec/rpc.rquotad/Makefile.depend1
-rw-r--r--libexec/rpc.rstatd/Makefile.depend1
-rw-r--r--libexec/rpc.rusersd/Makefile.depend1
-rw-r--r--libexec/rpc.rwalld/Makefile.depend1
-rw-r--r--libexec/rpc.sprayd/Makefile.depend1
-rw-r--r--libexec/rshd/Makefile.depend1
-rw-r--r--libexec/smrsh/Makefile.depend1
-rw-r--r--libexec/talkd/Makefile.depend1
-rw-r--r--libexec/tcpd/Makefile.depend1
-rw-r--r--libexec/telnetd/Makefile.depend1
-rw-r--r--libexec/tftp-proxy/Makefile.depend1
-rw-r--r--libexec/tftpd/Makefile.depend1
-rw-r--r--libexec/ulog-helper/Makefile.depend1
-rw-r--r--libexec/ypxfr/Makefile.depend1
-rw-r--r--sbin/adjkerntz/Makefile.depend1
-rw-r--r--sbin/atm/atmconfig/Makefile.depend1
-rw-r--r--sbin/badsect/Makefile.depend1
-rw-r--r--sbin/bsdlabel/Makefile.depend1
-rw-r--r--sbin/camcontrol/Makefile.depend1
-rw-r--r--sbin/ccdconfig/Makefile.depend1
-rw-r--r--sbin/clri/Makefile.depend1
-rw-r--r--sbin/comcontrol/Makefile.depend1
-rw-r--r--sbin/conscontrol/Makefile.depend1
-rw-r--r--sbin/ddb/Makefile.depend1
-rw-r--r--sbin/devd/Makefile.depend4
-rw-r--r--sbin/devfs/Makefile.depend1
-rw-r--r--sbin/dhclient/Makefile.depend1
-rw-r--r--sbin/dmesg/Makefile.depend1
-rw-r--r--sbin/dump/Makefile.depend1
-rw-r--r--sbin/dumpfs/Makefile.depend1
-rw-r--r--sbin/dumpon/Makefile.depend1
-rw-r--r--sbin/etherswitchcfg/Makefile.depend1
-rw-r--r--sbin/fdisk/Makefile.depend1
-rw-r--r--sbin/ffsinfo/Makefile.depend1
-rw-r--r--sbin/fsck/Makefile.depend1
-rw-r--r--sbin/fsck_ffs/Makefile.depend1
-rw-r--r--sbin/fsck_msdosfs/Makefile.depend1
-rw-r--r--sbin/fsdb/Makefile.depend1
-rw-r--r--sbin/fsirand/Makefile.depend1
-rw-r--r--sbin/gbde/Makefile.depend1
-rw-r--r--sbin/geom/class/cache/Makefile.depend1
-rw-r--r--sbin/geom/class/concat/Makefile.depend1
-rw-r--r--sbin/geom/class/eli/Makefile.depend1
-rw-r--r--sbin/geom/class/journal/Makefile.depend1
-rw-r--r--sbin/geom/class/label/Makefile.depend1
-rw-r--r--sbin/geom/class/mirror/Makefile.depend1
-rw-r--r--sbin/geom/class/mountver/Makefile.depend1
-rw-r--r--sbin/geom/class/multipath/Makefile.depend1
-rw-r--r--sbin/geom/class/nop/Makefile.depend1
-rw-r--r--sbin/geom/class/part/Makefile.depend1
-rw-r--r--sbin/geom/class/raid/Makefile.depend1
-rw-r--r--sbin/geom/class/raid3/Makefile.depend1
-rw-r--r--sbin/geom/class/sched/Makefile.depend1
-rw-r--r--sbin/geom/class/shsec/Makefile.depend1
-rw-r--r--sbin/geom/class/stripe/Makefile.depend1
-rw-r--r--sbin/geom/class/virstor/Makefile.depend1
-rw-r--r--sbin/geom/core/Makefile.depend1
-rw-r--r--sbin/ggate/ggatec/Makefile.depend1
-rw-r--r--sbin/ggate/ggated/Makefile.depend1
-rw-r--r--sbin/ggate/ggatel/Makefile.depend1
-rw-r--r--sbin/growfs/Makefile.depend1
-rw-r--r--sbin/gvinum/Makefile.depend1
-rw-r--r--sbin/hastctl/Makefile.depend1
-rw-r--r--sbin/hastd/Makefile.depend1
-rw-r--r--sbin/ifconfig/Makefile.depend1
-rw-r--r--sbin/ipf/ipf/Makefile.depend1
-rw-r--r--sbin/ipf/ipfs/Makefile.depend1
-rw-r--r--sbin/ipf/ipfstat/Makefile.depend1
-rw-r--r--sbin/ipf/ipftest/Makefile.depend1
-rw-r--r--sbin/ipf/ipmon/Makefile.depend1
-rw-r--r--sbin/ipf/ipnat/Makefile.depend1
-rw-r--r--sbin/ipf/ippool/Makefile.depend1
-rw-r--r--sbin/ipf/ipresend/Makefile.depend1
-rw-r--r--sbin/ipfw/Makefile.depend1
-rw-r--r--sbin/iscontrol/Makefile.depend1
-rw-r--r--sbin/kldconfig/Makefile.depend1
-rw-r--r--sbin/kldload/Makefile.depend1
-rw-r--r--sbin/kldstat/Makefile.depend1
-rw-r--r--sbin/kldunload/Makefile.depend1
-rw-r--r--sbin/ldconfig/Makefile.depend1
-rw-r--r--sbin/md5/Makefile.depend1
-rw-r--r--sbin/mdconfig/Makefile.depend1
-rw-r--r--sbin/mdmfs/Makefile.depend1
-rw-r--r--sbin/mknod/Makefile.depend1
-rw-r--r--sbin/mksnap_ffs/Makefile.depend1
-rw-r--r--sbin/mount/Makefile.depend1
-rw-r--r--sbin/mount_cd9660/Makefile.depend1
-rw-r--r--sbin/mount_fusefs/Makefile.depend1
-rw-r--r--sbin/mount_msdosfs/Makefile.depend1
-rw-r--r--sbin/mount_nfs/Makefile.depend1
-rw-r--r--sbin/mount_nullfs/Makefile.depend1
-rw-r--r--sbin/mount_udf/Makefile.depend1
-rw-r--r--sbin/mount_unionfs/Makefile.depend1
-rw-r--r--sbin/natd/Makefile.depend1
-rw-r--r--sbin/newfs/Makefile.depend1
-rw-r--r--sbin/newfs_msdos/Makefile.depend1
-rw-r--r--sbin/nfsiod/Makefile.depend1
-rw-r--r--sbin/nos-tun/Makefile.depend1
-rw-r--r--sbin/nvmecontrol/Makefile.depend1
-rw-r--r--sbin/pfctl/Makefile.depend1
-rw-r--r--sbin/pflogd/Makefile.depend1
-rw-r--r--sbin/ping/Makefile.depend1
-rw-r--r--sbin/ping6/Makefile.depend1
-rw-r--r--sbin/quotacheck/Makefile.depend1
-rw-r--r--sbin/rcorder/Makefile.depend1
-rw-r--r--sbin/reboot/Makefile.depend1
-rw-r--r--sbin/recoverdisk/Makefile.depend1
-rw-r--r--sbin/restore/Makefile.depend1
-rw-r--r--sbin/route/Makefile.depend1
-rw-r--r--sbin/routed/rtquery/Makefile.depend1
-rw-r--r--sbin/rtsol/Makefile.depend1
-rw-r--r--sbin/savecore/Makefile.depend1
-rw-r--r--sbin/setkey/Makefile.depend1
-rw-r--r--sbin/shutdown/Makefile.depend1
-rw-r--r--sbin/spppcontrol/Makefile.depend1
-rw-r--r--sbin/swapon/Makefile.depend1
-rw-r--r--sbin/sysctl/Makefile.depend1
-rw-r--r--sbin/tunefs/Makefile.depend1
-rw-r--r--sbin/umount/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/Makefile.depend2
-rw-r--r--secure/lib/libcrypto/engines/lib4758cca/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libaep/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libatalla/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libchil/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libcswift/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libgost/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libnuron/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libsureware/Makefile.depend1
-rw-r--r--secure/lib/libcrypto/engines/libubsec/Makefile.depend1
-rw-r--r--secure/lib/libssh/Makefile.depend2
-rw-r--r--secure/lib/libssl/Makefile.depend2
-rw-r--r--secure/libexec/sftp-server/Makefile.depend1
-rw-r--r--secure/libexec/ssh-keysign/Makefile.depend1
-rw-r--r--secure/libexec/ssh-pkcs11-helper/Makefile.depend1
-rw-r--r--secure/usr.bin/bdes/Makefile.depend1
-rw-r--r--secure/usr.bin/openssl/Makefile.depend1
-rw-r--r--secure/usr.bin/scp/Makefile.depend1
-rw-r--r--secure/usr.bin/sftp/Makefile.depend1
-rw-r--r--secure/usr.bin/ssh-add/Makefile.depend1
-rw-r--r--secure/usr.bin/ssh-agent/Makefile.depend1
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile.depend1
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile.depend1
-rw-r--r--secure/usr.bin/ssh/Makefile.depend2
-rw-r--r--secure/usr.sbin/sshd/Makefile.depend1
-rw-r--r--share/syscons/scrnmaps/Makefile.depend1
-rw-r--r--usr.bin/apply/Makefile.depend1
-rw-r--r--usr.bin/ar/Makefile.depend1
-rw-r--r--usr.bin/asa/Makefile.depend1
-rw-r--r--usr.bin/at/Makefile.depend1
-rw-r--r--usr.bin/atf/atf-sh/Makefile.depend5
-rw-r--r--usr.bin/atm/sscop/Makefile.depend1
-rw-r--r--usr.bin/awk/Makefile.depend1
-rw-r--r--usr.bin/banner/Makefile.depend1
-rw-r--r--usr.bin/basename/Makefile.depend1
-rw-r--r--usr.bin/bc/Makefile.depend1
-rw-r--r--usr.bin/biff/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/bthost/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/btsockstat/Makefile.depend1
-rw-r--r--usr.bin/bluetooth/rfcomm_sppd/Makefile.depend1
-rw-r--r--usr.bin/brandelf/Makefile.depend1
-rw-r--r--usr.bin/bsdiff/bsdiff/Makefile.depend1
-rw-r--r--usr.bin/bsdiff/bspatch/Makefile.depend1
-rw-r--r--usr.bin/bzip2/Makefile.depend1
-rw-r--r--usr.bin/bzip2recover/Makefile.depend1
-rw-r--r--usr.bin/c89/Makefile.depend1
-rw-r--r--usr.bin/c99/Makefile.depend1
-rw-r--r--usr.bin/calendar/Makefile.depend1
-rw-r--r--usr.bin/cap_mkdb/Makefile.depend1
-rw-r--r--usr.bin/catman/Makefile.depend1
-rw-r--r--usr.bin/chat/Makefile.depend1
-rw-r--r--usr.bin/checknr/Makefile.depend1
-rw-r--r--usr.bin/chkey/Makefile.depend1
-rw-r--r--usr.bin/chpass/Makefile.depend1
-rw-r--r--usr.bin/cksum/Makefile.depend1
-rw-r--r--usr.bin/clang/clang-tblgen/Makefile.depend6
-rw-r--r--usr.bin/clang/clang/Makefile.depend6
-rw-r--r--usr.bin/clang/tblgen/Makefile.depend6
-rw-r--r--usr.bin/cmp/Makefile.depend1
-rw-r--r--usr.bin/col/Makefile.depend1
-rw-r--r--usr.bin/colcrt/Makefile.depend1
-rw-r--r--usr.bin/colldef/Makefile.depend1
-rw-r--r--usr.bin/colrm/Makefile.depend1
-rw-r--r--usr.bin/column/Makefile.depend1
-rw-r--r--usr.bin/comm/Makefile.depend1
-rw-r--r--usr.bin/compile_et/Makefile.depend1
-rw-r--r--usr.bin/compress/Makefile.depend1
-rw-r--r--usr.bin/cpio/Makefile.depend1
-rw-r--r--usr.bin/cpuset/Makefile.depend1
-rw-r--r--usr.bin/csplit/Makefile.depend1
-rw-r--r--usr.bin/csup/Makefile.depend1
-rw-r--r--usr.bin/ctags/Makefile.depend1
-rw-r--r--usr.bin/ctlstat/Makefile.depend1
-rw-r--r--usr.bin/cut/Makefile.depend1
-rw-r--r--usr.bin/dc/Makefile.depend1
-rw-r--r--usr.bin/dirname/Makefile.depend1
-rw-r--r--usr.bin/du/Makefile.depend1
-rw-r--r--usr.bin/ee/Makefile.depend1
-rw-r--r--usr.bin/elf2aout/Makefile.depend1
-rw-r--r--usr.bin/elfdump/Makefile.depend1
-rw-r--r--usr.bin/enigma/Makefile.depend1
-rw-r--r--usr.bin/env/Makefile.depend1
-rw-r--r--usr.bin/expand/Makefile.depend1
-rw-r--r--usr.bin/false/Makefile.depend1
-rw-r--r--usr.bin/fetch/Makefile.depend1
-rw-r--r--usr.bin/file/Makefile.depend1
-rw-r--r--usr.bin/file2c/Makefile.depend1
-rw-r--r--usr.bin/find/Makefile.depend1
-rw-r--r--usr.bin/finger/Makefile.depend1
-rw-r--r--usr.bin/fmt/Makefile.depend1
-rw-r--r--usr.bin/fold/Makefile.depend1
-rw-r--r--usr.bin/from/Makefile.depend1
-rw-r--r--usr.bin/fstat/Makefile.depend1
-rw-r--r--usr.bin/fsync/Makefile.depend1
-rw-r--r--usr.bin/ftp/Makefile.depend1
-rw-r--r--usr.bin/gcore/Makefile.depend1
-rw-r--r--usr.bin/gencat/Makefile.depend1
-rw-r--r--usr.bin/getconf/Makefile.depend1
-rw-r--r--usr.bin/getent/Makefile.depend1
-rw-r--r--usr.bin/getopt/Makefile.depend1
-rw-r--r--usr.bin/gprof/Makefile.depend1
-rw-r--r--usr.bin/grep/Makefile.depend1
-rw-r--r--usr.bin/gzip/Makefile.depend1
-rw-r--r--usr.bin/head/Makefile.depend1
-rw-r--r--usr.bin/hexdump/Makefile.depend1
-rw-r--r--usr.bin/host/Makefile.depend1
-rw-r--r--usr.bin/id/Makefile.depend1
-rw-r--r--usr.bin/indent/Makefile.depend1
-rw-r--r--usr.bin/ipcrm/Makefile.depend1
-rw-r--r--usr.bin/ipcs/Makefile.depend1
-rw-r--r--usr.bin/join/Makefile.depend1
-rw-r--r--usr.bin/jot/Makefile.depend1
-rw-r--r--usr.bin/kdump/Makefile.depend1
-rw-r--r--usr.bin/keylogin/Makefile.depend1
-rw-r--r--usr.bin/keylogout/Makefile.depend1
-rw-r--r--usr.bin/killall/Makefile.depend1
-rw-r--r--usr.bin/ktrace/Makefile.depend1
-rw-r--r--usr.bin/ktrdump/Makefile.depend1
-rw-r--r--usr.bin/lam/Makefile.depend1
-rw-r--r--usr.bin/last/Makefile.depend1
-rw-r--r--usr.bin/lastcomm/Makefile.depend1
-rw-r--r--usr.bin/ldd/Makefile.depend1
-rw-r--r--usr.bin/leave/Makefile.depend1
-rw-r--r--usr.bin/less/Makefile.depend1
-rw-r--r--usr.bin/lessecho/Makefile.depend1
-rw-r--r--usr.bin/lesskey/Makefile.depend1
-rw-r--r--usr.bin/limits/Makefile.depend1
-rw-r--r--usr.bin/locale/Makefile.depend1
-rw-r--r--usr.bin/locate/bigram/Makefile.depend1
-rw-r--r--usr.bin/locate/code/Makefile.depend1
-rw-r--r--usr.bin/locate/locate/Makefile.depend1
-rw-r--r--usr.bin/lock/Makefile.depend1
-rw-r--r--usr.bin/lockf/Makefile.depend1
-rw-r--r--usr.bin/logger/Makefile.depend1
-rw-r--r--usr.bin/login/Makefile.depend1
-rw-r--r--usr.bin/logins/Makefile.depend1
-rw-r--r--usr.bin/logname/Makefile.depend1
-rw-r--r--usr.bin/look/Makefile.depend1
-rw-r--r--usr.bin/lsvfs/Makefile.depend1
-rw-r--r--usr.bin/lzmainfo/Makefile.depend1
-rw-r--r--usr.bin/m4/Makefile.depend1
-rw-r--r--usr.bin/mail/Makefile.depend1
-rw-r--r--usr.bin/makewhatis/Makefile.depend1
-rw-r--r--usr.bin/mandoc/Makefile.depend1
-rw-r--r--usr.bin/mesg/Makefile.depend1
-rw-r--r--usr.bin/minigzip/Makefile.depend1
-rw-r--r--usr.bin/ministat/Makefile.depend1
-rw-r--r--usr.bin/mkfifo/Makefile.depend1
-rw-r--r--usr.bin/mklocale/Makefile.depend1
-rw-r--r--usr.bin/mkstr/Makefile.depend1
-rw-r--r--usr.bin/mktemp/Makefile.depend1
-rw-r--r--usr.bin/mkulzma/Makefile.depend1
-rw-r--r--usr.bin/mkuzip/Makefile.depend1
-rw-r--r--usr.bin/msgs/Makefile.depend1
-rw-r--r--usr.bin/mt/Makefile.depend1
-rw-r--r--usr.bin/nc/Makefile.depend1
-rw-r--r--usr.bin/ncal/Makefile.depend1
-rw-r--r--usr.bin/netstat/Makefile.depend1
-rw-r--r--usr.bin/newgrp/Makefile.depend1
-rw-r--r--usr.bin/newkey/Makefile.depend1
-rw-r--r--usr.bin/nfsstat/Makefile.depend1
-rw-r--r--usr.bin/nice/Makefile.depend1
-rw-r--r--usr.bin/nl/Makefile.depend1
-rw-r--r--usr.bin/nohup/Makefile.depend1
-rw-r--r--usr.bin/opieinfo/Makefile.depend1
-rw-r--r--usr.bin/opiekey/Makefile.depend1
-rw-r--r--usr.bin/opiepasswd/Makefile.depend1
-rw-r--r--usr.bin/passwd/Makefile.depend1
-rw-r--r--usr.bin/paste/Makefile.depend1
-rw-r--r--usr.bin/pathchk/Makefile.depend1
-rw-r--r--usr.bin/perror/Makefile.depend1
-rw-r--r--usr.bin/pr/Makefile.depend1
-rw-r--r--usr.bin/printenv/Makefile.depend1
-rw-r--r--usr.bin/printf/Makefile.depend1
-rw-r--r--usr.bin/procstat/Makefile.depend1
-rw-r--r--usr.bin/quota/Makefile.depend1
-rw-r--r--usr.bin/rctl/Makefile.depend1
-rw-r--r--usr.bin/renice/Makefile.depend1
-rw-r--r--usr.bin/rev/Makefile.depend1
-rw-r--r--usr.bin/revoke/Makefile.depend1
-rw-r--r--usr.bin/rlogin/Makefile.depend1
-rw-r--r--usr.bin/rpcgen/Makefile.depend1
-rw-r--r--usr.bin/rpcinfo/Makefile.depend1
-rw-r--r--usr.bin/rs/Makefile.depend1
-rw-r--r--usr.bin/rsh/Makefile.depend1
-rw-r--r--usr.bin/rup/Makefile.depend1
-rw-r--r--usr.bin/ruptime/Makefile.depend1
-rw-r--r--usr.bin/rusers/Makefile.depend1
-rw-r--r--usr.bin/rwall/Makefile.depend1
-rw-r--r--usr.bin/rwho/Makefile.depend1
-rw-r--r--usr.bin/script/Makefile.depend1
-rw-r--r--usr.bin/sed/Makefile.depend1
-rw-r--r--usr.bin/seq/Makefile.depend1
-rw-r--r--usr.bin/showmount/Makefile.depend1
-rw-r--r--usr.bin/sockstat/Makefile.depend1
-rw-r--r--usr.bin/sort/Makefile.depend1
-rw-r--r--usr.bin/split/Makefile.depend1
-rw-r--r--usr.bin/stat/Makefile.depend1
-rw-r--r--usr.bin/stdbuf/Makefile.depend1
-rw-r--r--usr.bin/su/Makefile.depend1
-rw-r--r--usr.bin/systat/Makefile.depend1
-rw-r--r--usr.bin/tabs/Makefile.depend1
-rw-r--r--usr.bin/tail/Makefile.depend1
-rw-r--r--usr.bin/talk/Makefile.depend1
-rw-r--r--usr.bin/tar/Makefile.depend1
-rw-r--r--usr.bin/tcopy/Makefile.depend1
-rw-r--r--usr.bin/tee/Makefile.depend1
-rw-r--r--usr.bin/telnet/Makefile.depend1
-rw-r--r--usr.bin/tftp/Makefile.depend1
-rw-r--r--usr.bin/time/Makefile.depend1
-rw-r--r--usr.bin/tip/tip/Makefile.depend1
-rw-r--r--usr.bin/top/Makefile.depend1
-rw-r--r--usr.bin/touch/Makefile.depend1
-rw-r--r--usr.bin/tput/Makefile.depend1
-rw-r--r--usr.bin/tr/Makefile.depend1
-rw-r--r--usr.bin/true/Makefile.depend1
-rw-r--r--usr.bin/truncate/Makefile.depend1
-rw-r--r--usr.bin/truss/Makefile.depend.amd641
-rw-r--r--usr.bin/tset/Makefile.depend1
-rw-r--r--usr.bin/tsort/Makefile.depend1
-rw-r--r--usr.bin/tty/Makefile.depend1
-rw-r--r--usr.bin/ul/Makefile.depend1
-rw-r--r--usr.bin/uname/Makefile.depend1
-rw-r--r--usr.bin/unexpand/Makefile.depend1
-rw-r--r--usr.bin/unifdef/Makefile.depend1
-rw-r--r--usr.bin/uniq/Makefile.depend1
-rw-r--r--usr.bin/units/Makefile.depend1
-rw-r--r--usr.bin/unvis/Makefile.depend1
-rw-r--r--usr.bin/unzip/Makefile.depend1
-rw-r--r--usr.bin/usbhidaction/Makefile.depend1
-rw-r--r--usr.bin/usbhidctl/Makefile.depend1
-rw-r--r--usr.bin/users/Makefile.depend1
-rw-r--r--usr.bin/uudecode/Makefile.depend1
-rw-r--r--usr.bin/uuencode/Makefile.depend1
-rw-r--r--usr.bin/vacation/Makefile.depend1
-rw-r--r--usr.bin/vgrind/Makefile.depend1
-rw-r--r--usr.bin/vi/Makefile.depend1
-rw-r--r--usr.bin/vis/Makefile.depend1
-rw-r--r--usr.bin/vmstat/Makefile.depend1
-rw-r--r--usr.bin/w/Makefile.depend1
-rw-r--r--usr.bin/wall/Makefile.depend1
-rw-r--r--usr.bin/wc/Makefile.depend1
-rw-r--r--usr.bin/what/Makefile.depend1
-rw-r--r--usr.bin/whereis/Makefile.depend1
-rw-r--r--usr.bin/which/Makefile.depend1
-rw-r--r--usr.bin/who/Makefile.depend1
-rw-r--r--usr.bin/whois/Makefile.depend1
-rw-r--r--usr.bin/write/Makefile.depend1
-rw-r--r--usr.bin/xargs/Makefile.depend1
-rw-r--r--usr.bin/xinstall/Makefile.depend1
-rw-r--r--usr.bin/xlint/lint1/Makefile.depend1
-rw-r--r--usr.bin/xlint/lint2/Makefile.depend1
-rw-r--r--usr.bin/xlint/xlint/Makefile.depend1
-rw-r--r--usr.bin/xstr/Makefile.depend1
-rw-r--r--usr.bin/xz/Makefile.depend1
-rw-r--r--usr.bin/xzdec/Makefile.depend1
-rw-r--r--usr.bin/yacc/Makefile.depend1
-rw-r--r--usr.bin/yes/Makefile.depend1
-rw-r--r--usr.bin/ypcat/Makefile.depend1
-rw-r--r--usr.bin/ypmatch/Makefile.depend1
-rw-r--r--usr.bin/ypwhich/Makefile.depend1
-rw-r--r--usr.sbin/ac/Makefile.depend1
-rw-r--r--usr.sbin/accton/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpiconf/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpidb/Makefile.depend1
-rw-r--r--usr.sbin/acpi/acpidump/Makefile.depend1
-rw-r--r--usr.sbin/acpi/iasl/Makefile.depend1
-rw-r--r--usr.sbin/amd/amd/Makefile.depend1
-rw-r--r--usr.sbin/amd/amq/Makefile.depend1
-rw-r--r--usr.sbin/amd/fixmount/Makefile.depend1
-rw-r--r--usr.sbin/amd/fsinfo/Makefile.depend1
-rw-r--r--usr.sbin/amd/hlfsd/Makefile.depend1
-rw-r--r--usr.sbin/amd/mk-amd-map/Makefile.depend1
-rw-r--r--usr.sbin/amd/pawd/Makefile.depend1
-rw-r--r--usr.sbin/amd/wire-test/Makefile.depend1
-rw-r--r--usr.sbin/ancontrol/Makefile.depend1
-rw-r--r--usr.sbin/apm/Makefile.depend1
-rw-r--r--usr.sbin/arp/Makefile.depend1
-rw-r--r--usr.sbin/asf/Makefile.depend1
-rw-r--r--usr.sbin/audit/Makefile.depend1
-rw-r--r--usr.sbin/auditd/Makefile.depend1
-rw-r--r--usr.sbin/auditreduce/Makefile.depend1
-rw-r--r--usr.sbin/authpf/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/ath3kfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bcmfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bt3cfw/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bthidcontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/btpand/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hccontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hcsecd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/hcseriald/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/l2control/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/l2ping/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/sdpcontrol/Makefile.depend1
-rw-r--r--usr.sbin/bluetooth/sdpd/Makefile.depend1
-rw-r--r--usr.sbin/boot0cfg/Makefile.depend1
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile.depend1
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile.depend1
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/gensnmptree/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend2
-rw-r--r--usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend1
-rw-r--r--usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend2
-rw-r--r--usr.sbin/btxld/Makefile.depend1
-rw-r--r--usr.sbin/cdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/chkgrp/Makefile.depend1
-rw-r--r--usr.sbin/chown/Makefile.depend1
-rw-r--r--usr.sbin/chroot/Makefile.depend1
-rw-r--r--usr.sbin/ckdist/Makefile.depend1
-rw-r--r--usr.sbin/clear_locks/Makefile.depend1
-rw-r--r--usr.sbin/config/Makefile.depend1
-rw-r--r--usr.sbin/cpucontrol/Makefile.depend1
-rw-r--r--usr.sbin/cron/cron/Makefile.depend1
-rw-r--r--usr.sbin/cron/crontab/Makefile.depend1
-rw-r--r--usr.sbin/crunch/crunchgen/Makefile.depend1
-rw-r--r--usr.sbin/crunch/crunchide/Makefile.depend1
-rw-r--r--usr.sbin/ctladm/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm_dequeue/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm_rmail/Makefile.depend1
-rw-r--r--usr.sbin/ctm/ctm_smail/Makefile.depend1
-rw-r--r--usr.sbin/daemon/Makefile.depend1
-rw-r--r--usr.sbin/dconschat/Makefile.depend1
-rw-r--r--usr.sbin/devinfo/Makefile.depend1
-rw-r--r--usr.sbin/digictl/Makefile.depend1
-rw-r--r--usr.sbin/diskinfo/Makefile.depend1
-rw-r--r--usr.sbin/dumpcis/Makefile.depend1
-rw-r--r--usr.sbin/editmap/Makefile.depend1
-rw-r--r--usr.sbin/edquota/Makefile.depend1
-rw-r--r--usr.sbin/extattr/Makefile.depend1
-rw-r--r--usr.sbin/extattrctl/Makefile.depend1
-rw-r--r--usr.sbin/faithd/Makefile.depend1
-rw-r--r--usr.sbin/fdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/fdformat/Makefile.depend1
-rw-r--r--usr.sbin/fdread/Makefile.depend1
-rw-r--r--usr.sbin/fdwrite/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_create/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_reader/Makefile.depend1
-rw-r--r--usr.sbin/fifolog/fifolog_writer/Makefile.depend1
-rw-r--r--usr.sbin/flowctl/Makefile.depend1
-rw-r--r--usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend1
-rw-r--r--usr.sbin/fwcontrol/Makefile.depend1
-rw-r--r--usr.sbin/getfmac/Makefile.depend1
-rw-r--r--usr.sbin/getpmac/Makefile.depend1
-rw-r--r--usr.sbin/gpioctl/Makefile.depend1
-rw-r--r--usr.sbin/gssd/Makefile.depend1
-rw-r--r--usr.sbin/gstat/Makefile.depend1
-rw-r--r--usr.sbin/i2c/Makefile.depend1
-rw-r--r--usr.sbin/ifmcstat/Makefile.depend1
-rw-r--r--usr.sbin/inetd/Makefile.depend1
-rw-r--r--usr.sbin/iostat/Makefile.depend1
-rw-r--r--usr.sbin/ip6addrctl/Makefile.depend1
-rw-r--r--usr.sbin/ipfwpcap/Makefile.depend1
-rw-r--r--usr.sbin/jail/Makefile.depend1
-rw-r--r--usr.sbin/jexec/Makefile.depend1
-rw-r--r--usr.sbin/jls/Makefile.depend1
-rw-r--r--usr.sbin/kbdcontrol/Makefile.depend1
-rw-r--r--usr.sbin/kbdmap/Makefile.depend1
-rw-r--r--usr.sbin/keyserv/Makefile.depend1
-rw-r--r--usr.sbin/kgmon/Makefile.depend1
-rw-r--r--usr.sbin/kldxref/Makefile.depend1
-rw-r--r--usr.sbin/lastlogin/Makefile.depend1
-rw-r--r--usr.sbin/lmcconfig/Makefile.depend1
-rw-r--r--usr.sbin/lpr/chkprintcap/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend1
-rw-r--r--usr.sbin/lpr/filters/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpc/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpd/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpq/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lpr/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lprm/Makefile.depend1
-rw-r--r--usr.sbin/lpr/lptest/Makefile.depend1
-rw-r--r--usr.sbin/lpr/pac/Makefile.depend1
-rw-r--r--usr.sbin/lptcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mailstats/Makefile.depend1
-rw-r--r--usr.sbin/mailwrapper/Makefile.depend1
-rw-r--r--usr.sbin/makefs/Makefile.depend1
-rw-r--r--usr.sbin/makemap/Makefile.depend1
-rw-r--r--usr.sbin/memcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mfiutil/Makefile.depend1
-rw-r--r--usr.sbin/mixer/Makefile.depend1
-rw-r--r--usr.sbin/mld6query/Makefile.depend1
-rw-r--r--usr.sbin/mlxcontrol/Makefile.depend1
-rw-r--r--usr.sbin/mountd/Makefile.depend1
-rw-r--r--usr.sbin/moused/Makefile.depend1
-rw-r--r--usr.sbin/mptable/Makefile.depend1
-rw-r--r--usr.sbin/mptutil/Makefile.depend1
-rw-r--r--usr.sbin/mtest/Makefile.depend1
-rw-r--r--usr.sbin/mtree/Makefile.depend1
-rw-r--r--usr.sbin/ndiscvt/Makefile.depend1
-rw-r--r--usr.sbin/ndp/Makefile.depend1
-rw-r--r--usr.sbin/newsyslog/Makefile.depend1
-rw-r--r--usr.sbin/nfscbd/Makefile.depend1
-rw-r--r--usr.sbin/nfsd/Makefile.depend1
-rw-r--r--usr.sbin/nfsdumpstate/Makefile.depend1
-rw-r--r--usr.sbin/nfsrevoke/Makefile.depend1
-rw-r--r--usr.sbin/nfsuserd/Makefile.depend1
-rw-r--r--usr.sbin/ngctl/Makefile.depend1
-rw-r--r--usr.sbin/nghook/Makefile.depend1
-rw-r--r--usr.sbin/nscd/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpd/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntpq/Makefile.depend1
-rw-r--r--usr.sbin/ntp/ntptime/Makefile.depend1
-rw-r--r--usr.sbin/ntp/sntp/Makefile.depend1
-rw-r--r--usr.sbin/pciconf/Makefile.depend1
-rw-r--r--usr.sbin/pkg/Makefile.depend4
-rw-r--r--usr.sbin/pmcannotate/Makefile.depend1
-rw-r--r--usr.sbin/pmccontrol/Makefile.depend1
-rw-r--r--usr.sbin/pmcstat/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/make_index/Makefile.depend1
-rw-r--r--usr.sbin/portsnap/phttpget/Makefile.depend1
-rw-r--r--usr.sbin/powerd/Makefile.depend1
-rw-r--r--usr.sbin/ppp/Makefile.depend1
-rw-r--r--usr.sbin/pppctl/Makefile.depend1
-rw-r--r--usr.sbin/praliases/Makefile.depend1
-rw-r--r--usr.sbin/praudit/Makefile.depend1
-rw-r--r--usr.sbin/procctl/Makefile.depend1
-rw-r--r--usr.sbin/pstat/Makefile.depend1
-rw-r--r--usr.sbin/pw/Makefile.depend1
-rw-r--r--usr.sbin/pwd_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/quot/Makefile.depend1
-rw-r--r--usr.sbin/quotaon/Makefile.depend1
-rw-r--r--usr.sbin/rarpd/Makefile.depend1
-rw-r--r--usr.sbin/repquota/Makefile.depend1
-rw-r--r--usr.sbin/rip6query/Makefile.depend1
-rw-r--r--usr.sbin/rmt/Makefile.depend1
-rw-r--r--usr.sbin/route6d/Makefile.depend1
-rw-r--r--usr.sbin/rpc.lockd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.statd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.umntall/Makefile.depend1
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile.depend1
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile.depend1
-rw-r--r--usr.sbin/rpc.ypxfrd/Makefile.depend1
-rw-r--r--usr.sbin/rpcbind/Makefile.depend1
-rw-r--r--usr.sbin/rrenumd/Makefile.depend1
-rw-r--r--usr.sbin/rtadvctl/Makefile.depend1
-rw-r--r--usr.sbin/rtadvd/Makefile.depend1
-rw-r--r--usr.sbin/rtprio/Makefile.depend1
-rw-r--r--usr.sbin/rtsold/Makefile.depend1
-rw-r--r--usr.sbin/rwhod/Makefile.depend1
-rw-r--r--usr.sbin/sa/Makefile.depend1
-rw-r--r--usr.sbin/sendmail/Makefile.depend1
-rw-r--r--usr.sbin/services_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/setfib/Makefile.depend1
-rw-r--r--usr.sbin/setfmac/Makefile.depend1
-rw-r--r--usr.sbin/setpmac/Makefile.depend1
-rw-r--r--usr.sbin/sicontrol/Makefile.depend1
-rw-r--r--usr.sbin/smbmsg/Makefile.depend1
-rw-r--r--usr.sbin/snapinfo/Makefile.depend1
-rw-r--r--usr.sbin/spray/Makefile.depend1
-rw-r--r--usr.sbin/syslogd/Makefile.depend1
-rw-r--r--usr.sbin/tcpdchk/Makefile.depend1
-rw-r--r--usr.sbin/tcpdmatch/Makefile.depend1
-rw-r--r--usr.sbin/tcpdrop/Makefile.depend1
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile.depend3
-rw-r--r--usr.sbin/timed/timed/Makefile.depend1
-rw-r--r--usr.sbin/timed/timedc/Makefile.depend1
-rw-r--r--usr.sbin/traceroute/Makefile.depend1
-rw-r--r--usr.sbin/traceroute6/Makefile.depend1
-rw-r--r--usr.sbin/trpt/Makefile.depend1
-rw-r--r--usr.sbin/tzsetup/Makefile.depend1
-rw-r--r--usr.sbin/uathload/Makefile.depend1
-rw-r--r--usr.sbin/ugidfw/Makefile.depend1
-rw-r--r--usr.sbin/uhsoctl/Makefile.depend1
-rw-r--r--usr.sbin/usbconfig/Makefile.depend1
-rw-r--r--usr.sbin/usbdump/Makefile.depend1
-rw-r--r--usr.sbin/utx/Makefile.depend1
-rw-r--r--usr.sbin/vidcontrol/Makefile.depend1
-rw-r--r--usr.sbin/vipw/Makefile.depend1
-rw-r--r--usr.sbin/wake/Makefile.depend1
-rw-r--r--usr.sbin/watch/Makefile.depend1
-rw-r--r--usr.sbin/watchdogd/Makefile.depend1
-rw-r--r--usr.sbin/wlandebug/Makefile.depend1
-rw-r--r--usr.sbin/wpa/hostapd/Makefile.depend1
-rw-r--r--usr.sbin/wpa/hostapd_cli/Makefile.depend1
-rw-r--r--usr.sbin/wpa/ndis_events/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_cli/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_passphrase/Makefile.depend1
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile.depend1
-rw-r--r--usr.sbin/yp_mkdb/Makefile.depend1
-rw-r--r--usr.sbin/ypbind/Makefile.depend1
-rw-r--r--usr.sbin/yppoll/Makefile.depend1
-rw-r--r--usr.sbin/yppush/Makefile.depend1
-rw-r--r--usr.sbin/ypserv/Makefile.depend1
-rw-r--r--usr.sbin/ypset/Makefile.depend1
-rw-r--r--usr.sbin/zic/zdump/Makefile.depend1
-rw-r--r--usr.sbin/zic/zic/Makefile.depend1
1026 files changed, 692 insertions, 1029 deletions
diff --git a/bin/cat/Makefile.depend b/bin/cat/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/bin/cat/Makefile.depend
+++ b/bin/cat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/chflags/Makefile.depend
+++ b/bin/chflags/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/chio/Makefile.depend
+++ b/bin/chio/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/chmod/Makefile.depend
+++ b/bin/chmod/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/cp/Makefile.depend
+++ b/bin/cp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 8792a2fdc9d0..7d24a2b5c71f 100644
--- a/bin/csh/Makefile.depend
+++ b/bin/csh/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 b3c03a71825a..4a9f7867ec6d 100644
--- a/bin/date/Makefile.depend
+++ b/bin/date/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/dd/Makefile.depend
+++ b/bin/dd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/bin/df/Makefile.depend
+++ b/bin/df/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/bin/domainname/Makefile.depend b/bin/domainname/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/bin/domainname/Makefile.depend
+++ b/bin/domainname/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/echo/Makefile.depend
+++ b/bin/echo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/bin/ed/Makefile.depend b/bin/ed/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/bin/ed/Makefile.depend
+++ b/bin/ed/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/bin/expr/Makefile.depend b/bin/expr/Makefile.depend
index 26e188813d66..1c402a90a785 100644
--- a/bin/expr/Makefile.depend
+++ b/bin/expr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/getfacl/Makefile.depend
+++ b/bin/getfacl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/hostname/Makefile.depend
+++ b/bin/hostname/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/kenv/Makefile.depend
+++ b/bin/kenv/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/kill/Makefile.depend
+++ b/bin/kill/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/ln/Makefile.depend
+++ b/bin/ln/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 b8efbdcd65f1..fa30ba59a752 100644
--- a/bin/ls/Makefile.depend
+++ b/bin/ls/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/mkdir/Makefile.depend
+++ b/bin/mkdir/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/mv/Makefile.depend
+++ b/bin/mv/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/pax/Makefile.depend
+++ b/bin/pax/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 b7d414c85aeb..384b6754a9ab 100644
--- a/bin/pkill/Makefile.depend
+++ b/bin/pkill/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/bin/ps/Makefile.depend b/bin/ps/Makefile.depend
index 55f64b8f923e..a1b416dc3b7c 100644
--- a/bin/ps/Makefile.depend
+++ b/bin/ps/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libjail \
lib/libkvm \
diff --git a/bin/pwait/Makefile.depend b/bin/pwait/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/bin/pwait/Makefile.depend
+++ b/bin/pwait/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/pwd/Makefile.depend
+++ b/bin/pwd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/rcp/Makefile.depend
+++ b/bin/rcp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e9a1dda6ca51..2d9ec507cd13 100644
--- a/bin/realpath/Makefile.depend
+++ b/bin/realpath/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/rm/Makefile.depend
+++ b/bin/rm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 369993741a21..38c9111f896a 100644
--- a/bin/rmail/Makefile.depend
+++ b/bin/rmail/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/rmdir/Makefile.depend
+++ b/bin/rmdir/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/setfacl/Makefile.depend
+++ b/bin/setfacl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 8c34e2e9ee31..cd6f78e660fc 100644
--- a/bin/sh/Makefile.depend
+++ b/bin/sh/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/bin/sleep/Makefile.depend b/bin/sleep/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/bin/sleep/Makefile.depend
+++ b/bin/sleep/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/stty/Makefile.depend
+++ b/bin/stty/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e9a1dda6ca51..2d9ec507cd13 100644
--- a/bin/sync/Makefile.depend
+++ b/bin/sync/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/bin/test/Makefile.depend
+++ b/bin/test/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e9a1dda6ca51..2d9ec507cd13 100644
--- a/bin/uuidgen/Makefile.depend
+++ b/bin/uuidgen/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 e9a1dda6ca51..7cedd5f867c7 100644
--- a/cddl/lib/libavl/Makefile.depend
+++ b/cddl/lib/libavl/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libctf/Makefile.depend b/cddl/lib/libctf/Makefile.depend
index 8289d12000c8..8c281dd942e7 100644
--- a/cddl/lib/libctf/Makefile.depend
+++ b/cddl/lib/libctf/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libz \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libdtrace/Makefile.depend b/cddl/lib/libdtrace/Makefile.depend
index 8f7dd109b8ff..8d30ace22df6 100644
--- a/cddl/lib/libdtrace/Makefile.depend
+++ b/cddl/lib/libdtrace/Makefile.depend
@@ -10,11 +10,11 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libproc \
lib/librtld_db \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libnvpair/Makefile.depend b/cddl/lib/libnvpair/Makefile.depend
index 26b0cb7f5dde..bee153c2a7af 100644
--- a/cddl/lib/libnvpair/Makefile.depend
+++ b/cddl/lib/libnvpair/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libumem/Makefile.depend b/cddl/lib/libumem/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/cddl/lib/libumem/Makefile.depend
+++ b/cddl/lib/libumem/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libuutil/Makefile.depend b/cddl/lib/libuutil/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/cddl/lib/libuutil/Makefile.depend
+++ b/cddl/lib/libuutil/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzfs/Makefile.depend b/cddl/lib/libzfs/Makefile.depend
index c37dc06029e6..79c81b8d5772 100644
--- a/cddl/lib/libzfs/Makefile.depend
+++ b/cddl/lib/libzfs/Makefile.depend
@@ -12,13 +12,13 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
lib/libmd \
lib/libthr \
lib/libutil \
lib/msun \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzfs_core/Makefile.depend b/cddl/lib/libzfs_core/Makefile.depend
index d4b30864d0e6..cce84af56921 100644
--- a/cddl/lib/libzfs_core/Makefile.depend
+++ b/cddl/lib/libzfs_core/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/lib/libzpool/Makefile.depend b/cddl/lib/libzpool/Makefile.depend
index e6ee354f02f6..4ee502210e97 100644
--- a/cddl/lib/libzpool/Makefile.depend
+++ b/cddl/lib/libzpool/Makefile.depend
@@ -9,12 +9,12 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libthr \
lib/libz \
lib/msun \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/cddl/sbin/zfs/Makefile.depend b/cddl/sbin/zfs/Makefile.depend
index bbd5273b1c9b..c3b3a22bb026 100644
--- a/cddl/sbin/zfs/Makefile.depend
+++ b/cddl/sbin/zfs/Makefile.depend
@@ -14,7 +14,6 @@ DIRDEPS = \
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 ee2b9c1e6e66..5486a80db25b 100644
--- a/cddl/sbin/zpool/Makefile.depend
+++ b/cddl/sbin/zpool/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/usr.bin/sgsmsg/Makefile.depend b/cddl/usr.bin/sgsmsg/Makefile.depend
index 659d7cca1ad8..56f580e457d3 100644
--- a/cddl/usr.bin/sgsmsg/Makefile.depend
+++ b/cddl/usr.bin/sgsmsg/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 672391411234..529f1d7d5ddc 100644
--- a/cddl/usr.bin/zinject/Makefile.depend
+++ b/cddl/usr.bin/zinject/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
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 e31b2b34708f..b44a5fda14b7 100644
--- a/cddl/usr.bin/zstreamdump/Makefile.depend
+++ b/cddl/usr.bin/zstreamdump/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
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 0c093416d1b6..2a76b0ebb740 100644
--- a/cddl/usr.bin/ztest/Makefile.depend
+++ b/cddl/usr.bin/ztest/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libgeom \
diff --git a/cddl/usr.sbin/lockstat/Makefile.depend b/cddl/usr.sbin/lockstat/Makefile.depend
index 1accae89ba85..3dec902e6c68 100644
--- a/cddl/usr.sbin/lockstat/Makefile.depend
+++ b/cddl/usr.sbin/lockstat/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
diff --git a/cddl/usr.sbin/zdb/Makefile.depend b/cddl/usr.sbin/zdb/Makefile.depend
index 672391411234..529f1d7d5ddc 100644
--- a/cddl/usr.sbin/zdb/Makefile.depend
+++ b/cddl/usr.sbin/zdb/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
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 672391411234..529f1d7d5ddc 100644
--- a/cddl/usr.sbin/zhack/Makefile.depend
+++ b/cddl/usr.sbin/zhack/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/games/bcd/Makefile.depend
+++ b/games/bcd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 26b0cb7f5dde..da4f56b373df 100644
--- a/games/caesar/Makefile.depend
+++ b/games/caesar/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/games/factor/Makefile.depend b/games/factor/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/games/factor/Makefile.depend
+++ b/games/factor/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/games/fortune/fortune/Makefile.depend b/games/fortune/fortune/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/games/fortune/fortune/Makefile.depend
+++ b/games/fortune/fortune/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/games/fortune/strfile/Makefile.depend
+++ b/games/fortune/strfile/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/games/fortune/unstr/Makefile.depend
+++ b/games/fortune/unstr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 233a7c6cd0b8..4f4df6520bd4 100644
--- a/games/grdc/Makefile.depend
+++ b/games/grdc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/games/morse/Makefile.depend b/games/morse/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/games/morse/Makefile.depend
+++ b/games/morse/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/games/number/Makefile.depend
+++ b/games/number/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 26b0cb7f5dde..da4f56b373df 100644
--- a/games/pom/Makefile.depend
+++ b/games/pom/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/games/ppt/Makefile.depend b/games/ppt/Makefile.depend
index e9a1dda6ca51..2d9ec507cd13 100644
--- a/games/ppt/Makefile.depend
+++ b/games/ppt/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 26b0cb7f5dde..da4f56b373df 100644
--- a/games/primes/Makefile.depend
+++ b/games/primes/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/games/random/Makefile.depend b/games/random/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/games/random/Makefile.depend
+++ b/games/random/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 796e9bf46bb6..4f075dab95e0 100644
--- a/gnu/lib/libdialog/Makefile.depend
+++ b/gnu/lib/libdialog/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index 1fbfd7fffcf5..5a788db1e041 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -8,7 +8,7 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libgomp/Makefile.depend b/gnu/lib/libgomp/Makefile.depend
index 71accaeebd52..59f451a66000 100644
--- a/gnu/lib/libgomp/Makefile.depend
+++ b/gnu/lib/libgomp/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile.depend b/gnu/lib/libreadline/readline/Makefile.depend
index 233a7c6cd0b8..c23402005508 100644
--- a/gnu/lib/libreadline/readline/Makefile.depend
+++ b/gnu/lib/libreadline/readline/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libregex/Makefile.depend b/gnu/lib/libregex/Makefile.depend
index c64a40fd9bc1..aa86386d4c32 100644
--- a/gnu/lib/libregex/Makefile.depend
+++ b/gnu/lib/libregex/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libstdc++/Makefile.depend b/gnu/lib/libstdc++/Makefile.depend
index e24c102fd216..7155be6f266c 100644
--- a/gnu/lib/libstdc++/Makefile.depend
+++ b/gnu/lib/libstdc++/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/lib/libsupc++/Makefile.depend b/gnu/lib/libsupc++/Makefile.depend
index 1afbe8be911c..dcb5bb9dea54 100644
--- a/gnu/lib/libsupc++/Makefile.depend
+++ b/gnu/lib/libsupc++/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile.depend b/gnu/usr.bin/binutils/addr2line/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile.depend
+++ b/gnu/usr.bin/binutils/addr2line/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/nm/Makefile.depend b/gnu/usr.bin/binutils/nm/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/nm/Makefile.depend
+++ b/gnu/usr.bin/binutils/nm/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile.depend b/gnu/usr.bin/binutils/objcopy/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile.depend
+++ b/gnu/usr.bin/binutils/objcopy/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/objdump/Makefile.depend b/gnu/usr.bin/binutils/objdump/Makefile.depend
index b21a71066e66..ca80e98ef859 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile.depend
+++ b/gnu/usr.bin/binutils/objdump/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/readelf/Makefile.depend b/gnu/usr.bin/binutils/readelf/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile.depend
+++ b/gnu/usr.bin/binutils/readelf/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/size/Makefile.depend b/gnu/usr.bin/binutils/size/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/size/Makefile.depend
+++ b/gnu/usr.bin/binutils/size/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/strings/Makefile.depend b/gnu/usr.bin/binutils/strings/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/strings/Makefile.depend
+++ b/gnu/usr.bin/binutils/strings/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/binutils/strip/Makefile.depend b/gnu/usr.bin/binutils/strip/Makefile.depend
index f720db2bf7fb..4ed5ef1f4a47 100644
--- a/gnu/usr.bin/binutils/strip/Makefile.depend
+++ b/gnu/usr.bin/binutils/strip/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/dialog/Makefile.depend b/gnu/usr.bin/dialog/Makefile.depend
index 546cb43f4f04..d9cc8893dc80 100644
--- a/gnu/usr.bin/dialog/Makefile.depend
+++ b/gnu/usr.bin/dialog/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
lib/ncurses/ncursesw \
diff --git a/gnu/usr.bin/diff3/Makefile.depend b/gnu/usr.bin/diff3/Makefile.depend
index ead1ad513fac..71c3d5e9b0de 100644
--- a/gnu/usr.bin/diff3/Makefile.depend
+++ b/gnu/usr.bin/diff3/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/gdb/gdb/Makefile.depend b/gnu/usr.bin/gdb/gdb/Makefile.depend
index c3a2af4da2f6..4572bc150e30 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdb/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/lib/libreadline/readline \
gnu/lib/libregex \
diff --git a/gnu/usr.bin/gdb/gdbserver/Makefile.depend b/gnu/usr.bin/gdb/gdbserver/Makefile.depend
index 5269280d143c..b68b4bb5daf9 100644
--- a/gnu/usr.bin/gdb/gdbserver/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdbserver/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile.depend b/gnu/usr.bin/gdb/gdbtui/Makefile.depend
index 8ba7b928ece2..1d50acab904e 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile.depend
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/lib/libreadline/readline \
gnu/lib/libregex \
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
index d2192d3b2971..165f4f0ff780 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
+++ b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
gnu/lib/libreadline/readline \
gnu/lib/libregex \
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
index 97cb0bdfd01e..b5a6296105ba 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend b/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
index 97cb0bdfd01e..b5a6296105ba 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
index 97cb0bdfd01e..b5a6296105ba 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
index 97cb0bdfd01e..b5a6296105ba 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
index 97cb0bdfd01e..b5a6296105ba 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
index 97cb0bdfd01e..b5a6296105ba 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
index f38013572255..78b43b7136d4 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile.depend b/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
index aea5b2d8cc45..dd0bc4c6445a 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
index 345d8fbb2d22..661e26a334fd 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
index 80cfb86ca689..093a8eec5e78 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
index 5f92b0df5f81..48d82090baa7 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
index 5f92b0df5f81..48d82090baa7 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
index 5f92b0df5f81..48d82090baa7 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
index b4de74964106..fd3efc3ce774 100644
--- a/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
index 6936f25a9e7a..df023f12a0d1 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libc++ \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/gnu/usr.bin/rcs/ci/Makefile.depend b/gnu/usr.bin/rcs/ci/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/ci/Makefile.depend
+++ b/gnu/usr.bin/rcs/ci/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/co/Makefile.depend b/gnu/usr.bin/rcs/co/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/co/Makefile.depend
+++ b/gnu/usr.bin/rcs/co/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/ident/Makefile.depend b/gnu/usr.bin/rcs/ident/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/ident/Makefile.depend
+++ b/gnu/usr.bin/rcs/ident/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/merge/Makefile.depend b/gnu/usr.bin/rcs/merge/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/merge/Makefile.depend
+++ b/gnu/usr.bin/rcs/merge/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/rcs/Makefile.depend b/gnu/usr.bin/rcs/rcs/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/rcs/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcs/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/rcsclean/Makefile.depend b/gnu/usr.bin/rcs/rcsclean/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/rcsclean/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsclean/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/rcsdiff/Makefile.depend b/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile.depend b/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
+++ b/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/rcs/rlog/Makefile.depend b/gnu/usr.bin/rcs/rlog/Makefile.depend
index 0e57857f4e80..12b27259d9a0 100644
--- a/gnu/usr.bin/rcs/rlog/Makefile.depend
+++ b/gnu/usr.bin/rcs/rlog/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/sdiff/Makefile.depend b/gnu/usr.bin/sdiff/Makefile.depend
index 3c6803038b80..243191967bf4 100644
--- a/gnu/usr.bin/sdiff/Makefile.depend
+++ b/gnu/usr.bin/sdiff/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/texinfo/info/Makefile.depend b/gnu/usr.bin/texinfo/info/Makefile.depend
index 4300e83bcc16..1afa811efa51 100644
--- a/gnu/usr.bin/texinfo/info/Makefile.depend
+++ b/gnu/usr.bin/texinfo/info/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
diff --git a/gnu/usr.bin/texinfo/infokey/Makefile.depend b/gnu/usr.bin/texinfo/infokey/Makefile.depend
index adec3fdafec6..ffe9a50f8400 100644
--- a/gnu/usr.bin/texinfo/infokey/Makefile.depend
+++ b/gnu/usr.bin/texinfo/infokey/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile.depend b/gnu/usr.bin/texinfo/install-info/Makefile.depend
index adec3fdafec6..ffe9a50f8400 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile.depend
+++ b/gnu/usr.bin/texinfo/install-info/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile.depend b/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
index adec3fdafec6..ffe9a50f8400 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile.depend b/gnu/usr.bin/texinfo/texindex/Makefile.depend
index adec3fdafec6..ffe9a50f8400 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile.depend
+++ b/gnu/usr.bin/texinfo/texindex/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/include/Makefile.depend b/include/Makefile.depend
index 57b7e10c3d71..8b97128420c9 100644
--- a/include/Makefile.depend
+++ b/include/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libasn1/Makefile.depend b/kerberos5/lib/libasn1/Makefile.depend
index a8e1a3f5ba33..ef5a7ac2bb05 100644
--- a/kerberos5/lib/libasn1/Makefile.depend
+++ b/kerberos5/lib/libasn1/Makefile.depend
@@ -11,9 +11,9 @@ DIRDEPS = \
kerberos5/lib/libroken \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend
index 3806b8fdf44b..53eaa7a7933b 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile.depend
+++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -20,6 +21,7 @@ DIRDEPS = \
lib/libcrypt \
lib/libgssapi \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile.depend b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
index 750e245754e2..a43012612ccf 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile.depend
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -17,6 +18,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libgssapi \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile.depend b/kerberos5/lib/libgssapi_spnego/Makefile.depend
index 4c515bba5be2..6fd1d4bc7afc 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile.depend
+++ b/kerberos5/lib/libgssapi_spnego/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libgssapi \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend
index 57b04f9a36d4..b4e36db527fa 100644
--- a/kerberos5/lib/libhdb/Makefile.depend
+++ b/kerberos5/lib/libhdb/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -19,6 +20,7 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimbase/Makefile.depend b/kerberos5/lib/libheimbase/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/kerberos5/lib/libheimbase/Makefile.depend
+++ b/kerberos5/lib/libheimbase/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimipcc/Makefile.depend b/kerberos5/lib/libheimipcc/Makefile.depend
index 1bd43f6f3360..2e6c752672cd 100644
--- a/kerberos5/lib/libheimipcc/Makefile.depend
+++ b/kerberos5/lib/libheimipcc/Makefile.depend
@@ -13,9 +13,9 @@ DIRDEPS = \
kerberos5/lib/libroken \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimipcs/Makefile.depend b/kerberos5/lib/libheimipcs/Makefile.depend
index 7e91e8acea5a..b025a8a77f0a 100644
--- a/kerberos5/lib/libheimipcs/Makefile.depend
+++ b/kerberos5/lib/libheimipcs/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend
index 80d5c7a4d4be..3efab050e19f 100644
--- a/kerberos5/lib/libheimntlm/Makefile.depend
+++ b/kerberos5/lib/libheimntlm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimsqlite/Makefile.depend b/kerberos5/lib/libheimsqlite/Makefile.depend
index 13680b314856..2fe55c2304c6 100644
--- a/kerberos5/lib/libheimsqlite/Makefile.depend
+++ b/kerberos5/lib/libheimsqlite/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend
index a0673df9d6d6..c36ae15e2a48 100644
--- a/kerberos5/lib/libhx509/Makefile.depend
+++ b/kerberos5/lib/libhx509/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libcom_err \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend
index 8481de4880e0..8cb61ee781af 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile.depend
+++ b/kerberos5/lib/libkadm5clnt/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend
index 58c19dcc9660..48db2a548135 100644
--- a/kerberos5/lib/libkadm5srv/Makefile.depend
+++ b/kerberos5/lib/libkadm5srv/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libc \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend
index 1abcc6a570df..3eaa22ab602c 100644
--- a/kerberos5/lib/libkafs5/Makefile.depend
+++ b/kerberos5/lib/libkafs5/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -14,6 +15,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkdc/Makefile.depend b/kerberos5/lib/libkdc/Makefile.depend
index b906e0fbfef4..14e302a31bea 100644
--- a/kerberos5/lib/libkdc/Makefile.depend
+++ b/kerberos5/lib/libkdc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -22,6 +23,7 @@ DIRDEPS = \
lib/libcrypt \
lib/libutil \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libkrb5/Makefile.depend b/kerberos5/lib/libkrb5/Makefile.depend
index 420c842f72d0..3e1417105421 100644
--- a/kerberos5/lib/libkrb5/Makefile.depend
+++ b/kerberos5/lib/libkrb5/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -19,6 +20,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcrypt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libroken/Makefile.depend b/kerberos5/lib/libroken/Makefile.depend
index 27304ee9f793..631ef86406f8 100644
--- a/kerberos5/lib/libroken/Makefile.depend
+++ b/kerberos5/lib/libroken/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/lib/libwind/Makefile.depend b/kerberos5/lib/libwind/Makefile.depend
index 5e661c1bddb2..eb1ed587d341 100644
--- a/kerberos5/lib/libwind/Makefile.depend
+++ b/kerberos5/lib/libwind/Makefile.depend
@@ -11,9 +11,9 @@ DIRDEPS = \
kerberos5/lib/libroken \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcom_err \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/kerberos5/libexec/digest-service/Makefile.depend b/kerberos5/libexec/digest-service/Makefile.depend
index 898ac2e02ce8..2ced5dae0874 100644
--- a/kerberos5/libexec/digest-service/Makefile.depend
+++ b/kerberos5/libexec/digest-service/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/hprop/Makefile.depend b/kerberos5/libexec/hprop/Makefile.depend
index 26bea350cb0d..b407aae6d99d 100644
--- a/kerberos5/libexec/hprop/Makefile.depend
+++ b/kerberos5/libexec/hprop/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/hpropd/Makefile.depend b/kerberos5/libexec/hpropd/Makefile.depend
index 053da8cc1e3a..63599a91e694 100644
--- a/kerberos5/libexec/hpropd/Makefile.depend
+++ b/kerberos5/libexec/hpropd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/ipropd-master/Makefile.depend b/kerberos5/libexec/ipropd-master/Makefile.depend
index d204f959c357..4cd3c9b1e3d3 100644
--- a/kerberos5/libexec/ipropd-master/Makefile.depend
+++ b/kerberos5/libexec/ipropd-master/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/ipropd-slave/Makefile.depend b/kerberos5/libexec/ipropd-slave/Makefile.depend
index c55271d163dc..5adbfed78c72 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile.depend
+++ b/kerberos5/libexec/ipropd-slave/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kadmind/Makefile.depend b/kerberos5/libexec/kadmind/Makefile.depend
index 5c380b2df6ac..ff1fa9fb1f0e 100644
--- a/kerberos5/libexec/kadmind/Makefile.depend
+++ b/kerberos5/libexec/kadmind/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kcm/Makefile.depend b/kerberos5/libexec/kcm/Makefile.depend
index b9d7a6d3f8c8..35a316f8b7ac 100644
--- a/kerberos5/libexec/kcm/Makefile.depend
+++ b/kerberos5/libexec/kcm/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kdc/Makefile.depend b/kerberos5/libexec/kdc/Makefile.depend
index fe889f155981..814936143089 100644
--- a/kerberos5/libexec/kdc/Makefile.depend
+++ b/kerberos5/libexec/kdc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kdigest/Makefile.depend b/kerberos5/libexec/kdigest/Makefile.depend
index 05ab28f57f02..28e098540a89 100644
--- a/kerberos5/libexec/kdigest/Makefile.depend
+++ b/kerberos5/libexec/kdigest/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kfd/Makefile.depend b/kerberos5/libexec/kfd/Makefile.depend
index 94c1eaa6520d..ff20361da26b 100644
--- a/kerberos5/libexec/kfd/Makefile.depend
+++ b/kerberos5/libexec/kfd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kimpersonate/Makefile.depend b/kerberos5/libexec/kimpersonate/Makefile.depend
index 8bbf5d756990..3a7e74bf4d5e 100644
--- a/kerberos5/libexec/kimpersonate/Makefile.depend
+++ b/kerberos5/libexec/kimpersonate/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/libexec/kpasswdd/Makefile.depend b/kerberos5/libexec/kpasswdd/Makefile.depend
index 7d45ea20def9..2cda4e9e15c0 100644
--- a/kerberos5/libexec/kpasswdd/Makefile.depend
+++ b/kerberos5/libexec/kpasswdd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend
index 2d1668bda45c..2364b2929905 100644
--- a/kerberos5/tools/asn1_compile/Makefile.depend
+++ b/kerberos5/tools/asn1_compile/Makefile.depend
@@ -12,7 +12,6 @@ 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 c515f44f9e7d..0347dd3a14ae 100644
--- a/kerberos5/tools/make-roken/Makefile.depend
+++ b/kerberos5/tools/make-roken/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 752a34352cc2..8c9acfb604b3 100644
--- a/kerberos5/tools/slc/Makefile.depend
+++ b/kerberos5/tools/slc/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
kerberos5/lib/libvers \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/kerberos5/usr.bin/hxtool/Makefile.depend b/kerberos5/usr.bin/hxtool/Makefile.depend
index 5f5b0c89c678..fc0959323f07 100644
--- a/kerberos5/usr.bin/hxtool/Makefile.depend
+++ b/kerberos5/usr.bin/hxtool/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kadmin/Makefile.depend b/kerberos5/usr.bin/kadmin/Makefile.depend
index 378e201cd505..17a95c6a6b70 100644
--- a/kerberos5/usr.bin/kadmin/Makefile.depend
+++ b/kerberos5/usr.bin/kadmin/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kcc/Makefile.depend b/kerberos5/usr.bin/kcc/Makefile.depend
index 3a3a863a001e..57e50ba9ef60 100644
--- a/kerberos5/usr.bin/kcc/Makefile.depend
+++ b/kerberos5/usr.bin/kcc/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kdestroy/Makefile.depend b/kerberos5/usr.bin/kdestroy/Makefile.depend
index 8bbf5d756990..3a7e74bf4d5e 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile.depend
+++ b/kerberos5/usr.bin/kdestroy/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kf/Makefile.depend b/kerberos5/usr.bin/kf/Makefile.depend
index 94c1eaa6520d..ff20361da26b 100644
--- a/kerberos5/usr.bin/kf/Makefile.depend
+++ b/kerberos5/usr.bin/kf/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kgetcred/Makefile.depend b/kerberos5/usr.bin/kgetcred/Makefile.depend
index 6ac7a46f3ff8..0bc3ece1140b 100644
--- a/kerberos5/usr.bin/kgetcred/Makefile.depend
+++ b/kerberos5/usr.bin/kgetcred/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kinit/Makefile.depend b/kerberos5/usr.bin/kinit/Makefile.depend
index 8bbf5d756990..3a7e74bf4d5e 100644
--- a/kerberos5/usr.bin/kinit/Makefile.depend
+++ b/kerberos5/usr.bin/kinit/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/kpasswd/Makefile.depend b/kerberos5/usr.bin/kpasswd/Makefile.depend
index 693ae4b476bd..6a1350b452c9 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile.depend
+++ b/kerberos5/usr.bin/kpasswd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/ksu/Makefile.depend b/kerberos5/usr.bin/ksu/Makefile.depend
index 6ac7a46f3ff8..0bc3ece1140b 100644
--- a/kerberos5/usr.bin/ksu/Makefile.depend
+++ b/kerberos5/usr.bin/ksu/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/string2key/Makefile.depend b/kerberos5/usr.bin/string2key/Makefile.depend
index 053da8cc1e3a..63599a91e694 100644
--- a/kerberos5/usr.bin/string2key/Makefile.depend
+++ b/kerberos5/usr.bin/string2key/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
index 6ac7a46f3ff8..0bc3ece1140b 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend
index adaaf0433614..5cbb43b7a402 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile.depend
+++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.sbin/kstash/Makefile.depend b/kerberos5/usr.sbin/kstash/Makefile.depend
index 053da8cc1e3a..63599a91e694 100644
--- a/kerberos5/usr.sbin/kstash/Makefile.depend
+++ b/kerberos5/usr.sbin/kstash/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/kerberos5/usr.sbin/ktutil/Makefile.depend b/kerberos5/usr.sbin/ktutil/Makefile.depend
index 9c7835106721..7cee2f03d5c2 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile.depend
+++ b/kerberos5/usr.sbin/ktutil/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend
index 6f092c911531..c93850e2886e 100644
--- a/lib/atf/libatf-c++/Makefile.depend
+++ b/lib/atf/libatf-c++/Makefile.depend
@@ -3,17 +3,11 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
- lib/${CSU_DIR} \
lib/atf/libatf-c \
- lib/libc \
- lib/libc_nonshared \
- lib/libcompiler_rt \
+ lib/libc++ \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/atf/libatf-c/Makefile.depend b/lib/atf/libatf-c/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/atf/libatf-c/Makefile.depend
+++ b/lib/atf/libatf-c/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend
index c50852eb86f5..3e73ed20437f 100644
--- a/lib/clang/libclanganalysis/Makefile.depend
+++ b/lib/clang/libclanganalysis/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -59,6 +58,18 @@ CocoaConventions.o: DeclNodes.inc.h
CocoaConventions.o: DiagnosticCommonKinds.inc.h
CocoaConventions.po: DeclNodes.inc.h
CocoaConventions.po: DiagnosticCommonKinds.inc.h
+Consumed.o: AttrList.inc.h
+Consumed.o: Attrs.inc.h
+Consumed.o: CommentCommandList.inc.h
+Consumed.o: DeclNodes.inc.h
+Consumed.o: DiagnosticCommonKinds.inc.h
+Consumed.o: StmtNodes.inc.h
+Consumed.po: AttrList.inc.h
+Consumed.po: Attrs.inc.h
+Consumed.po: CommentCommandList.inc.h
+Consumed.po: DeclNodes.inc.h
+Consumed.po: DiagnosticCommonKinds.inc.h
+Consumed.po: StmtNodes.inc.h
Dominators.o: DeclNodes.inc.h
Dominators.o: DiagnosticCommonKinds.inc.h
Dominators.o: StmtNodes.inc.h
diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend
index 5ce1899a364a..91f16dcf6e63 100644
--- a/lib/clang/libclangarcmigrate/Makefile.depend
+++ b/lib/clang/libclangarcmigrate/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -15,18 +14,14 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ARCMT.o: AttrList.inc.h
ARCMT.o: AttrParsedAttrList.inc.h
-ARCMT.o: Attrs.inc.h
ARCMT.o: CommentCommandList.inc.h
ARCMT.o: DeclNodes.inc.h
ARCMT.o: DiagnosticCommonKinds.inc.h
ARCMT.o: DiagnosticGroups.inc.h
ARCMT.o: DiagnosticSemaKinds.inc.h
ARCMT.o: StmtNodes.inc.h
-ARCMT.po: AttrList.inc.h
ARCMT.po: AttrParsedAttrList.inc.h
-ARCMT.po: Attrs.inc.h
ARCMT.po: CommentCommandList.inc.h
ARCMT.po: DeclNodes.inc.h
ARCMT.po: DiagnosticCommonKinds.inc.h
@@ -37,10 +32,14 @@ ARCMTActions.o: DiagnosticCommonKinds.inc.h
ARCMTActions.po: DiagnosticCommonKinds.inc.h
FileRemapper.o: DiagnosticCommonKinds.inc.h
FileRemapper.po: DiagnosticCommonKinds.inc.h
+ObjCMT.o: AttrList.inc.h
+ObjCMT.o: Attrs.inc.h
ObjCMT.o: CommentCommandList.inc.h
ObjCMT.o: DeclNodes.inc.h
ObjCMT.o: DiagnosticCommonKinds.inc.h
ObjCMT.o: StmtNodes.inc.h
+ObjCMT.po: AttrList.inc.h
+ObjCMT.po: Attrs.inc.h
ObjCMT.po: CommentCommandList.inc.h
ObjCMT.po: DeclNodes.inc.h
ObjCMT.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend
index 44813d64bf45..eccc381966dd 100644
--- a/lib/clang/libclangast/Makefile.depend
+++ b/lib/clang/libclangast/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -77,6 +76,14 @@ ASTImporter.po: DeclNodes.inc.h
ASTImporter.po: DiagnosticASTKinds.inc.h
ASTImporter.po: DiagnosticCommonKinds.inc.h
ASTImporter.po: StmtNodes.inc.h
+ASTTypeTraits.o: CommentCommandList.inc.h
+ASTTypeTraits.o: DeclNodes.inc.h
+ASTTypeTraits.o: DiagnosticCommonKinds.inc.h
+ASTTypeTraits.o: StmtNodes.inc.h
+ASTTypeTraits.po: CommentCommandList.inc.h
+ASTTypeTraits.po: DeclNodes.inc.h
+ASTTypeTraits.po: DiagnosticCommonKinds.inc.h
+ASTTypeTraits.po: StmtNodes.inc.h
AttrImpl.o: AttrImpl.inc.h
AttrImpl.o: AttrList.inc.h
AttrImpl.o: Attrs.inc.h
@@ -251,18 +258,6 @@ DeclarationName.po: CommentCommandList.inc.h
DeclarationName.po: DeclNodes.inc.h
DeclarationName.po: DiagnosticCommonKinds.inc.h
DeclarationName.po: StmtNodes.inc.h
-DumpXML.o: AttrList.inc.h
-DumpXML.o: Attrs.inc.h
-DumpXML.o: CommentCommandList.inc.h
-DumpXML.o: DeclNodes.inc.h
-DumpXML.o: DiagnosticCommonKinds.inc.h
-DumpXML.o: StmtNodes.inc.h
-DumpXML.po: AttrList.inc.h
-DumpXML.po: Attrs.inc.h
-DumpXML.po: CommentCommandList.inc.h
-DumpXML.po: DeclNodes.inc.h
-DumpXML.po: DiagnosticCommonKinds.inc.h
-DumpXML.po: StmtNodes.inc.h
Expr.o: AttrList.inc.h
Expr.o: Attrs.inc.h
Expr.o: CommentCommandList.inc.h
@@ -339,22 +334,26 @@ ItaniumMangle.po: CommentCommandList.inc.h
ItaniumMangle.po: DeclNodes.inc.h
ItaniumMangle.po: DiagnosticCommonKinds.inc.h
ItaniumMangle.po: StmtNodes.inc.h
-LambdaMangleContext.o: CommentCommandList.inc.h
-LambdaMangleContext.o: DeclNodes.inc.h
-LambdaMangleContext.o: DiagnosticCommonKinds.inc.h
-LambdaMangleContext.o: StmtNodes.inc.h
-LambdaMangleContext.po: CommentCommandList.inc.h
-LambdaMangleContext.po: DeclNodes.inc.h
-LambdaMangleContext.po: DiagnosticCommonKinds.inc.h
-LambdaMangleContext.po: StmtNodes.inc.h
+Mangle.o: AttrList.inc.h
+Mangle.o: Attrs.inc.h
Mangle.o: CommentCommandList.inc.h
Mangle.o: DeclNodes.inc.h
Mangle.o: DiagnosticCommonKinds.inc.h
Mangle.o: StmtNodes.inc.h
+Mangle.po: AttrList.inc.h
+Mangle.po: Attrs.inc.h
Mangle.po: CommentCommandList.inc.h
Mangle.po: DeclNodes.inc.h
Mangle.po: DiagnosticCommonKinds.inc.h
Mangle.po: StmtNodes.inc.h
+MangleNumberingContext.o: CommentCommandList.inc.h
+MangleNumberingContext.o: DeclNodes.inc.h
+MangleNumberingContext.o: DiagnosticCommonKinds.inc.h
+MangleNumberingContext.o: StmtNodes.inc.h
+MangleNumberingContext.po: CommentCommandList.inc.h
+MangleNumberingContext.po: DeclNodes.inc.h
+MangleNumberingContext.po: DiagnosticCommonKinds.inc.h
+MangleNumberingContext.po: StmtNodes.inc.h
MicrosoftCXXABI.o: AttrList.inc.h
MicrosoftCXXABI.o: Attrs.inc.h
MicrosoftCXXABI.o: CommentCommandList.inc.h
diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend
index 30ba0f01f0d8..6d3d657869a5 100644
--- a/lib/clang/libclangbasic/Makefile.depend
+++ b/lib/clang/libclangbasic/Makefile.depend
@@ -3,11 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
- lib/clang/include \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend
index 68834643e118..611aebbd68d8 100644
--- a/lib/clang/libclangcodegen/Makefile.depend
+++ b/lib/clang/libclangcodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
usr.bin/clang/tblgen.host \
@@ -377,6 +376,7 @@ CGStmt.o: Attrs.inc.h
CGStmt.o: CommentCommandList.inc.h
CGStmt.o: DeclNodes.inc.h
CGStmt.o: DiagnosticCommonKinds.inc.h
+CGStmt.o: DiagnosticSemaKinds.inc.h
CGStmt.o: Intrinsics.inc.h
CGStmt.o: StmtNodes.inc.h
CGStmt.po: AttrList.inc.h
@@ -384,6 +384,7 @@ CGStmt.po: Attrs.inc.h
CGStmt.po: CommentCommandList.inc.h
CGStmt.po: DeclNodes.inc.h
CGStmt.po: DiagnosticCommonKinds.inc.h
+CGStmt.po: DiagnosticSemaKinds.inc.h
CGStmt.po: Intrinsics.inc.h
CGStmt.po: StmtNodes.inc.h
CGVTT.o: AttrList.inc.h
@@ -410,6 +411,18 @@ CGVTables.po: CommentCommandList.inc.h
CGVTables.po: DeclNodes.inc.h
CGVTables.po: DiagnosticCommonKinds.inc.h
CGVTables.po: StmtNodes.inc.h
+CodeGenABITypes.o: AttrList.inc.h
+CodeGenABITypes.o: Attrs.inc.h
+CodeGenABITypes.o: CommentCommandList.inc.h
+CodeGenABITypes.o: DeclNodes.inc.h
+CodeGenABITypes.o: DiagnosticCommonKinds.inc.h
+CodeGenABITypes.o: StmtNodes.inc.h
+CodeGenABITypes.po: AttrList.inc.h
+CodeGenABITypes.po: Attrs.inc.h
+CodeGenABITypes.po: CommentCommandList.inc.h
+CodeGenABITypes.po: DeclNodes.inc.h
+CodeGenABITypes.po: DiagnosticCommonKinds.inc.h
+CodeGenABITypes.po: StmtNodes.inc.h
CodeGenAction.o: CommentCommandList.inc.h
CodeGenAction.o: DeclNodes.inc.h
CodeGenAction.o: DiagnosticCommonKinds.inc.h
@@ -439,6 +452,7 @@ CodeGenModule.o: Attrs.inc.h
CodeGenModule.o: CommentCommandList.inc.h
CodeGenModule.o: DeclNodes.inc.h
CodeGenModule.o: DiagnosticCommonKinds.inc.h
+CodeGenModule.o: DiagnosticSemaKinds.inc.h
CodeGenModule.o: Intrinsics.inc.h
CodeGenModule.o: StmtNodes.inc.h
CodeGenModule.po: AttrList.inc.h
@@ -446,6 +460,7 @@ CodeGenModule.po: Attrs.inc.h
CodeGenModule.po: CommentCommandList.inc.h
CodeGenModule.po: DeclNodes.inc.h
CodeGenModule.po: DiagnosticCommonKinds.inc.h
+CodeGenModule.po: DiagnosticSemaKinds.inc.h
CodeGenModule.po: Intrinsics.inc.h
CodeGenModule.po: StmtNodes.inc.h
CodeGenTBAA.o: AttrList.inc.h
@@ -498,6 +513,18 @@ MicrosoftCXXABI.po: CommentCommandList.inc.h
MicrosoftCXXABI.po: DeclNodes.inc.h
MicrosoftCXXABI.po: DiagnosticCommonKinds.inc.h
MicrosoftCXXABI.po: StmtNodes.inc.h
+MicrosoftVBTables.o: AttrList.inc.h
+MicrosoftVBTables.o: Attrs.inc.h
+MicrosoftVBTables.o: CommentCommandList.inc.h
+MicrosoftVBTables.o: DeclNodes.inc.h
+MicrosoftVBTables.o: DiagnosticCommonKinds.inc.h
+MicrosoftVBTables.o: StmtNodes.inc.h
+MicrosoftVBTables.po: AttrList.inc.h
+MicrosoftVBTables.po: Attrs.inc.h
+MicrosoftVBTables.po: CommentCommandList.inc.h
+MicrosoftVBTables.po: DeclNodes.inc.h
+MicrosoftVBTables.po: DiagnosticCommonKinds.inc.h
+MicrosoftVBTables.po: StmtNodes.inc.h
ModuleBuilder.o: AttrList.inc.h
ModuleBuilder.o: Attrs.inc.h
ModuleBuilder.o: CommentCommandList.inc.h
diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend
index 1859c3ba4e8c..6c6cde521e99 100644
--- a/lib/clang/libclangdriver/Makefile.depend
+++ b/lib/clang/libclangdriver/Makefile.depend
@@ -3,22 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ArgList.o: DiagnosticCommonKinds.inc.h
-ArgList.o: DiagnosticDriverKinds.inc.h
-ArgList.po: DiagnosticCommonKinds.inc.h
-ArgList.po: DiagnosticDriverKinds.inc.h
CC1AsOptions.o: CC1AsOptions.inc.h
CC1AsOptions.po: CC1AsOptions.inc.h
Compilation.o: DiagnosticCommonKinds.inc.h
@@ -35,8 +31,12 @@ Driver.po: DiagnosticDriverKinds.inc.h
Driver.po: Options.inc.h
DriverOptions.o: Options.inc.h
DriverOptions.po: Options.inc.h
-OptTable.o: Options.inc.h
-OptTable.po: Options.inc.h
+SanitizerArgs.o: DiagnosticCommonKinds.inc.h
+SanitizerArgs.o: DiagnosticDriverKinds.inc.h
+SanitizerArgs.o: Options.inc.h
+SanitizerArgs.po: DiagnosticCommonKinds.inc.h
+SanitizerArgs.po: DiagnosticDriverKinds.inc.h
+SanitizerArgs.po: Options.inc.h
ToolChain.o: DiagnosticCommonKinds.inc.h
ToolChain.o: DiagnosticDriverKinds.inc.h
ToolChain.o: Options.inc.h
@@ -51,9 +51,11 @@ ToolChains.po: DiagnosticDriverKinds.inc.h
ToolChains.po: Options.inc.h
Tools.o: DiagnosticCommonKinds.inc.h
Tools.o: DiagnosticDriverKinds.inc.h
+Tools.o: DiagnosticSemaKinds.inc.h
Tools.o: Options.inc.h
Tools.po: DiagnosticCommonKinds.inc.h
Tools.po: DiagnosticDriverKinds.inc.h
+Tools.po: DiagnosticSemaKinds.inc.h
Tools.po: Options.inc.h
WindowsToolChain.o: DiagnosticCommonKinds.inc.h
WindowsToolChain.o: DiagnosticDriverKinds.inc.h
diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend
index 2781622df92d..05b479b95959 100644
--- a/lib/clang/libclangedit/Makefile.depend
+++ b/lib/clang/libclangedit/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend
index 7191baf2c803..870ea103360b 100644
--- a/lib/clang/libclangfrontend/Makefile.depend
+++ b/lib/clang/libclangfrontend/Makefile.depend
@@ -3,12 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
@@ -23,17 +23,11 @@ ASTConsumers.po: CommentCommandList.inc.h
ASTConsumers.po: DeclNodes.inc.h
ASTConsumers.po: DiagnosticCommonKinds.inc.h
ASTConsumers.po: StmtNodes.inc.h
-ASTMerge.o: AttrList.inc.h
-ASTMerge.o: AttrParsedAttrList.inc.h
-ASTMerge.o: Attrs.inc.h
ASTMerge.o: CommentCommandList.inc.h
ASTMerge.o: DeclNodes.inc.h
ASTMerge.o: DiagnosticASTKinds.inc.h
ASTMerge.o: DiagnosticCommonKinds.inc.h
ASTMerge.o: StmtNodes.inc.h
-ASTMerge.po: AttrList.inc.h
-ASTMerge.po: AttrParsedAttrList.inc.h
-ASTMerge.po: Attrs.inc.h
ASTMerge.po: CommentCommandList.inc.h
ASTMerge.po: DeclNodes.inc.h
ASTMerge.po: DiagnosticASTKinds.inc.h
@@ -59,16 +53,12 @@ CacheTokens.o: DiagnosticCommonKinds.inc.h
CacheTokens.po: DiagnosticCommonKinds.inc.h
ChainedDiagnosticConsumer.o: DiagnosticCommonKinds.inc.h
ChainedDiagnosticConsumer.po: DiagnosticCommonKinds.inc.h
-ChainedIncludesSource.o: AttrList.inc.h
ChainedIncludesSource.o: AttrParsedAttrList.inc.h
-ChainedIncludesSource.o: Attrs.inc.h
ChainedIncludesSource.o: CommentCommandList.inc.h
ChainedIncludesSource.o: DeclNodes.inc.h
ChainedIncludesSource.o: DiagnosticCommonKinds.inc.h
ChainedIncludesSource.o: StmtNodes.inc.h
-ChainedIncludesSource.po: AttrList.inc.h
ChainedIncludesSource.po: AttrParsedAttrList.inc.h
-ChainedIncludesSource.po: Attrs.inc.h
ChainedIncludesSource.po: CommentCommandList.inc.h
ChainedIncludesSource.po: DeclNodes.inc.h
ChainedIncludesSource.po: DiagnosticCommonKinds.inc.h
@@ -89,14 +79,18 @@ CompilerInstance.po: DeclNodes.inc.h
CompilerInstance.po: DiagnosticCommonKinds.inc.h
CompilerInstance.po: DiagnosticFrontendKinds.inc.h
CompilerInstance.po: StmtNodes.inc.h
+CompilerInvocation.o: AttrParsedAttrList.inc.h
CompilerInvocation.o: DeclNodes.inc.h
CompilerInvocation.o: DiagnosticCommonKinds.inc.h
CompilerInvocation.o: DiagnosticDriverKinds.inc.h
CompilerInvocation.o: Options.inc.h
+CompilerInvocation.o: StmtNodes.inc.h
+CompilerInvocation.po: AttrParsedAttrList.inc.h
CompilerInvocation.po: DeclNodes.inc.h
CompilerInvocation.po: DiagnosticCommonKinds.inc.h
CompilerInvocation.po: DiagnosticDriverKinds.inc.h
CompilerInvocation.po: Options.inc.h
+CompilerInvocation.po: StmtNodes.inc.h
CreateInvocationFromCommandLine.o: DiagnosticCommonKinds.inc.h
CreateInvocationFromCommandLine.o: DiagnosticFrontendKinds.inc.h
CreateInvocationFromCommandLine.o: Options.inc.h
@@ -115,17 +109,13 @@ DependencyGraph.po: DiagnosticCommonKinds.inc.h
DependencyGraph.po: DiagnosticFrontendKinds.inc.h
DiagnosticRenderer.o: DiagnosticCommonKinds.inc.h
DiagnosticRenderer.po: DiagnosticCommonKinds.inc.h
-FrontendAction.o: AttrList.inc.h
FrontendAction.o: AttrParsedAttrList.inc.h
-FrontendAction.o: Attrs.inc.h
FrontendAction.o: CommentCommandList.inc.h
FrontendAction.o: DeclNodes.inc.h
FrontendAction.o: DiagnosticCommonKinds.inc.h
FrontendAction.o: DiagnosticFrontendKinds.inc.h
FrontendAction.o: StmtNodes.inc.h
-FrontendAction.po: AttrList.inc.h
FrontendAction.po: AttrParsedAttrList.inc.h
-FrontendAction.po: Attrs.inc.h
FrontendAction.po: CommentCommandList.inc.h
FrontendAction.po: DeclNodes.inc.h
FrontendAction.po: DiagnosticCommonKinds.inc.h
@@ -153,12 +143,16 @@ HeaderIncludeGen.po: DiagnosticCommonKinds.inc.h
HeaderIncludeGen.po: DiagnosticFrontendKinds.inc.h
InitHeaderSearch.o: DiagnosticCommonKinds.inc.h
InitHeaderSearch.po: DiagnosticCommonKinds.inc.h
+InitPreprocessor.o: AttrParsedAttrList.inc.h
InitPreprocessor.o: DeclNodes.inc.h
InitPreprocessor.o: DiagnosticCommonKinds.inc.h
InitPreprocessor.o: DiagnosticFrontendKinds.inc.h
+InitPreprocessor.o: StmtNodes.inc.h
+InitPreprocessor.po: AttrParsedAttrList.inc.h
InitPreprocessor.po: DeclNodes.inc.h
InitPreprocessor.po: DiagnosticCommonKinds.inc.h
InitPreprocessor.po: DiagnosticFrontendKinds.inc.h
+InitPreprocessor.po: StmtNodes.inc.h
LayoutOverrideSource.o: DeclNodes.inc.h
LayoutOverrideSource.o: DiagnosticCommonKinds.inc.h
LayoutOverrideSource.po: DeclNodes.inc.h
diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend
index e69aaa538230..b3f9b2b610af 100644
--- a/lib/clang/libclangfrontendtool/Makefile.depend
+++ b/lib/clang/libclangfrontendtool/Makefile.depend
@@ -3,12 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend
index 7c8859dc6824..362b138d509d 100644
--- a/lib/clang/libclanglex/Makefile.depend
+++ b/lib/clang/libclanglex/Makefile.depend
@@ -3,11 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
- lib/clang/include \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend
index 0b7d67a6c038..263adfc50223 100644
--- a/lib/clang/libclangparse/Makefile.depend
+++ b/lib/clang/libclangparse/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -45,19 +44,21 @@ ParseCXXInlineMethods.po: DeclNodes.inc.h
ParseCXXInlineMethods.po: DiagnosticCommonKinds.inc.h
ParseCXXInlineMethods.po: DiagnosticParseKinds.inc.h
ParseCXXInlineMethods.po: StmtNodes.inc.h
-ParseDecl.o: AttrExprArgs.inc.h
+ParseDecl.o: AttrIdentifierArg.inc.h
ParseDecl.o: AttrLateParsed.inc.h
ParseDecl.o: AttrList.inc.h
ParseDecl.o: AttrParsedAttrList.inc.h
+ParseDecl.o: AttrTypeArg.inc.h
ParseDecl.o: Attrs.inc.h
ParseDecl.o: DeclNodes.inc.h
ParseDecl.o: DiagnosticCommonKinds.inc.h
ParseDecl.o: DiagnosticParseKinds.inc.h
ParseDecl.o: StmtNodes.inc.h
-ParseDecl.po: AttrExprArgs.inc.h
+ParseDecl.po: AttrIdentifierArg.inc.h
ParseDecl.po: AttrLateParsed.inc.h
ParseDecl.po: AttrList.inc.h
ParseDecl.po: AttrParsedAttrList.inc.h
+ParseDecl.po: AttrTypeArg.inc.h
ParseDecl.po: Attrs.inc.h
ParseDecl.po: DeclNodes.inc.h
ParseDecl.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangrewritecore/Makefile.depend b/lib/clang/libclangrewritecore/Makefile.depend
index a15fa635d8b4..a211b19844a9 100644
--- a/lib/clang/libclangrewritecore/Makefile.depend
+++ b/lib/clang/libclangrewritecore/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangrewritefrontend/Makefile.depend b/lib/clang/libclangrewritefrontend/Makefile.depend
index fd47556d5116..8fbe823dfb30 100644
--- a/lib/clang/libclangrewritefrontend/Makefile.depend
+++ b/lib/clang/libclangrewritefrontend/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend
index f06a41dba0bc..8e45ce4d048b 100644
--- a/lib/clang/libclangsema/Makefile.depend
+++ b/lib/clang/libclangsema/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -31,6 +30,7 @@ AnalysisBasedWarnings.po: DeclNodes.inc.h
AnalysisBasedWarnings.po: DiagnosticCommonKinds.inc.h
AnalysisBasedWarnings.po: DiagnosticSemaKinds.inc.h
AnalysisBasedWarnings.po: StmtNodes.inc.h
+AttributeList.o: AttrParsedAttrImpl.inc.h
AttributeList.o: AttrParsedAttrKinds.inc.h
AttributeList.o: AttrParsedAttrList.inc.h
AttributeList.o: AttrSpellingListIndex.inc.h
@@ -38,6 +38,7 @@ AttributeList.o: CommentCommandList.inc.h
AttributeList.o: DeclNodes.inc.h
AttributeList.o: DiagnosticCommonKinds.inc.h
AttributeList.o: StmtNodes.inc.h
+AttributeList.po: AttrParsedAttrImpl.inc.h
AttributeList.po: AttrParsedAttrKinds.inc.h
AttributeList.po: AttrParsedAttrList.inc.h
AttributeList.po: AttrSpellingListIndex.inc.h
@@ -683,4 +684,12 @@ TargetAttributesSema.po: DeclNodes.inc.h
TargetAttributesSema.po: DiagnosticCommonKinds.inc.h
TargetAttributesSema.po: DiagnosticSemaKinds.inc.h
TargetAttributesSema.po: StmtNodes.inc.h
+TypeLocBuilder.o: CommentCommandList.inc.h
+TypeLocBuilder.o: DeclNodes.inc.h
+TypeLocBuilder.o: DiagnosticCommonKinds.inc.h
+TypeLocBuilder.o: StmtNodes.inc.h
+TypeLocBuilder.po: CommentCommandList.inc.h
+TypeLocBuilder.po: DeclNodes.inc.h
+TypeLocBuilder.po: DiagnosticCommonKinds.inc.h
+TypeLocBuilder.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend
index 2269b1e1f3c1..7d04136aa606 100644
--- a/lib/clang/libclangserialization/Makefile.depend
+++ b/lib/clang/libclangserialization/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -57,10 +56,12 @@ ASTReaderDecl.po: DeclNodes.inc.h
ASTReaderDecl.po: DiagnosticCommonKinds.inc.h
ASTReaderDecl.po: DiagnosticSemaKinds.inc.h
ASTReaderDecl.po: StmtNodes.inc.h
+ASTReaderStmt.o: AttrParsedAttrList.inc.h
ASTReaderStmt.o: CommentCommandList.inc.h
ASTReaderStmt.o: DeclNodes.inc.h
ASTReaderStmt.o: DiagnosticCommonKinds.inc.h
ASTReaderStmt.o: StmtNodes.inc.h
+ASTReaderStmt.po: AttrParsedAttrList.inc.h
ASTReaderStmt.po: CommentCommandList.inc.h
ASTReaderStmt.po: DeclNodes.inc.h
ASTReaderStmt.po: DiagnosticCommonKinds.inc.h
@@ -81,10 +82,12 @@ ASTWriter.po: CommentCommandList.inc.h
ASTWriter.po: DeclNodes.inc.h
ASTWriter.po: DiagnosticCommonKinds.inc.h
ASTWriter.po: StmtNodes.inc.h
+ASTWriterDecl.o: AttrParsedAttrList.inc.h
ASTWriterDecl.o: CommentCommandList.inc.h
ASTWriterDecl.o: DeclNodes.inc.h
ASTWriterDecl.o: DiagnosticCommonKinds.inc.h
ASTWriterDecl.o: StmtNodes.inc.h
+ASTWriterDecl.po: AttrParsedAttrList.inc.h
ASTWriterDecl.po: CommentCommandList.inc.h
ASTWriterDecl.po: DeclNodes.inc.h
ASTWriterDecl.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
index c9fe45fc6f1e..68d1e50d7e55 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -311,6 +310,16 @@ IdempotentOperationChecker.po: CommentCommandList.inc.h
IdempotentOperationChecker.po: DeclNodes.inc.h
IdempotentOperationChecker.po: DiagnosticCommonKinds.inc.h
IdempotentOperationChecker.po: StmtNodes.inc.h
+IdenticalExprChecker.o: Checkers.inc.h
+IdenticalExprChecker.o: CommentCommandList.inc.h
+IdenticalExprChecker.o: DeclNodes.inc.h
+IdenticalExprChecker.o: DiagnosticCommonKinds.inc.h
+IdenticalExprChecker.o: StmtNodes.inc.h
+IdenticalExprChecker.po: Checkers.inc.h
+IdenticalExprChecker.po: CommentCommandList.inc.h
+IdenticalExprChecker.po: DeclNodes.inc.h
+IdenticalExprChecker.po: DiagnosticCommonKinds.inc.h
+IdenticalExprChecker.po: StmtNodes.inc.h
IvarInvalidationChecker.o: AttrList.inc.h
IvarInvalidationChecker.o: Attrs.inc.h
IvarInvalidationChecker.o: Checkers.inc.h
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend
index ced08b278d8e..41d7e388c307 100644
--- a/lib/clang/libclangstaticanalyzercore/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercore/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -283,10 +282,4 @@ SymbolManager.po: CommentCommandList.inc.h
SymbolManager.po: DeclNodes.inc.h
SymbolManager.po: DiagnosticCommonKinds.inc.h
SymbolManager.po: StmtNodes.inc.h
-TextPathDiagnostics.o: DeclNodes.inc.h
-TextPathDiagnostics.o: DiagnosticCommonKinds.inc.h
-TextPathDiagnostics.o: StmtNodes.inc.h
-TextPathDiagnostics.po: DeclNodes.inc.h
-TextPathDiagnostics.po: DiagnosticCommonKinds.inc.h
-TextPathDiagnostics.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
index 910b0c2f2ee8..7a70a3738b1e 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend
index 9aa32a96a0b6..ab902c251a4e 100644
--- a/lib/clang/libllvmanalysis/Makefile.depend
+++ b/lib/clang/libllvmanalysis/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend
index 2b046d8a2331..3b15beeaae80 100644
--- a/lib/clang/libllvmarmasmparser/Makefile.depend
+++ b/lib/clang/libllvmarmasmparser/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend
index 42795f18d8b2..5a85191fb047 100644
--- a/lib/clang/libllvmarmcodegen/Makefile.depend
+++ b/lib/clang/libllvmarmcodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend
index 725a374fa20c..a3c276069236 100644
--- a/lib/clang/libllvmarmdesc/Makefile.depend
+++ b/lib/clang/libllvmarmdesc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -47,6 +46,12 @@ ARMMCTargetDesc.o: ARMGenSubtargetInfo.inc.h
ARMMCTargetDesc.po: ARMGenInstrInfo.inc.h
ARMMCTargetDesc.po: ARMGenRegisterInfo.inc.h
ARMMCTargetDesc.po: ARMGenSubtargetInfo.inc.h
+ARMMachORelocationInfo.o: ARMGenInstrInfo.inc.h
+ARMMachORelocationInfo.o: ARMGenRegisterInfo.inc.h
+ARMMachORelocationInfo.o: ARMGenSubtargetInfo.inc.h
+ARMMachORelocationInfo.po: ARMGenInstrInfo.inc.h
+ARMMachORelocationInfo.po: ARMGenRegisterInfo.inc.h
+ARMMachORelocationInfo.po: ARMGenSubtargetInfo.inc.h
ARMMachObjectWriter.o: ARMGenInstrInfo.inc.h
ARMMachObjectWriter.o: ARMGenRegisterInfo.inc.h
ARMMachObjectWriter.o: ARMGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend
index 72192cb421ce..38ea1cb0d490 100644
--- a/lib/clang/libllvmarmdisassembler/Makefile.depend
+++ b/lib/clang/libllvmarmdisassembler/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend
index 7a0fbe1e3419..794d0ae4d58b 100644
--- a/lib/clang/libllvmarminfo/Makefile.depend
+++ b/lib/clang/libllvmarminfo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarminstprinter/Makefile.depend
index dfe2199b31ca..87d7ea956eed 100644
--- a/lib/clang/libllvmarminstprinter/Makefile.depend
+++ b/lib/clang/libllvmarminstprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmasmparser/Makefile.depend b/lib/clang/libllvmasmparser/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmasmparser/Makefile.depend
+++ b/lib/clang/libllvmasmparser/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend
index de12791bb810..33dfbf9a5eb0 100644
--- a/lib/clang/libllvmasmprinter/Makefile.depend
+++ b/lib/clang/libllvmasmprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend
index 0ca04aace01a..edbadfd147fa 100644
--- a/lib/clang/libllvmbitreader/Makefile.depend
+++ b/lib/clang/libllvmbitreader/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmbitwriter/Makefile.depend b/lib/clang/libllvmbitwriter/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmbitwriter/Makefile.depend
+++ b/lib/clang/libllvmbitwriter/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend
index a5078c5e831c..0dda0fddea1b 100644
--- a/lib/clang/libllvmcodegen/Makefile.depend
+++ b/lib/clang/libllvmcodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend
index 94d82b9ac309..0b232ec27459 100644
--- a/lib/clang/libllvmcore/Makefile.depend
+++ b/lib/clang/libllvmcore/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmdebuginfo/Makefile.depend b/lib/clang/libllvmdebuginfo/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmdebuginfo/Makefile.depend
+++ b/lib/clang/libllvmdebuginfo/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmexecutionengine/Makefile.depend b/lib/clang/libllvmexecutionengine/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmexecutionengine/Makefile.depend
+++ b/lib/clang/libllvmexecutionengine/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend
index ce67684d75d8..2910d05e8dea 100644
--- a/lib/clang/libllvminstcombine/Makefile.depend
+++ b/lib/clang/libllvminstcombine/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend
index e64cf0b52a2d..8e825e09c7e2 100644
--- a/lib/clang/libllvminstrumentation/Makefile.depend
+++ b/lib/clang/libllvminstrumentation/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -19,6 +18,10 @@ AddressSanitizer.o: Intrinsics.inc.h
AddressSanitizer.po: Intrinsics.inc.h
BoundsChecking.o: Intrinsics.inc.h
BoundsChecking.po: Intrinsics.inc.h
+DataFlowSanitizer.o: Intrinsics.inc.h
+DataFlowSanitizer.po: Intrinsics.inc.h
+DebugIR.o: Intrinsics.inc.h
+DebugIR.po: Intrinsics.inc.h
MemorySanitizer.o: Intrinsics.inc.h
MemorySanitizer.po: Intrinsics.inc.h
ThreadSanitizer.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvminterpreter/Makefile.depend b/lib/clang/libllvminterpreter/Makefile.depend
index 1c2bfebe806c..6f6ff7784e74 100644
--- a/lib/clang/libllvminterpreter/Makefile.depend
+++ b/lib/clang/libllvminterpreter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend
index 2a8fb8532579..916056a7beec 100644
--- a/lib/clang/libllvmipa/Makefile.depend
+++ b/lib/clang/libllvmipa/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend
index 07566681bfe3..151c976f9979 100644
--- a/lib/clang/libllvmipo/Makefile.depend
+++ b/lib/clang/libllvmipo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmirreader/Makefile.depend b/lib/clang/libllvmirreader/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmirreader/Makefile.depend
+++ b/lib/clang/libllvmirreader/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmjit/Makefile.depend b/lib/clang/libllvmjit/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmjit/Makefile.depend
+++ b/lib/clang/libllvmjit/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmlinker/Makefile.depend b/lib/clang/libllvmlinker/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmlinker/Makefile.depend
+++ b/lib/clang/libllvmlinker/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmc/Makefile.depend b/lib/clang/libllvmmc/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmmc/Makefile.depend
+++ b/lib/clang/libllvmmc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmcdisassembler/Makefile.depend b/lib/clang/libllvmmcdisassembler/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmmcdisassembler/Makefile.depend
+++ b/lib/clang/libllvmmcdisassembler/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmcjit/Makefile.depend b/lib/clang/libllvmmcjit/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmmcjit/Makefile.depend
+++ b/lib/clang/libllvmmcjit/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmcparser/Makefile.depend b/lib/clang/libllvmmcparser/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmmcparser/Makefile.depend
+++ b/lib/clang/libllvmmcparser/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmipsasmparser/Makefile.depend b/lib/clang/libllvmmipsasmparser/Makefile.depend
index ef82df0bcb84..bbb5c8a3e639 100644
--- a/lib/clang/libllvmmipsasmparser/Makefile.depend
+++ b/lib/clang/libllvmmipsasmparser/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend
index 25d3766bd9af..dd0e8917c122 100644
--- a/lib/clang/libllvmmipscodegen/Makefile.depend
+++ b/lib/clang/libllvmmipscodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -21,6 +20,12 @@ Mips16FrameLowering.o: MipsGenSubtargetInfo.inc.h
Mips16FrameLowering.po: MipsGenInstrInfo.inc.h
Mips16FrameLowering.po: MipsGenRegisterInfo.inc.h
Mips16FrameLowering.po: MipsGenSubtargetInfo.inc.h
+Mips16HardFloat.o: MipsGenInstrInfo.inc.h
+Mips16HardFloat.o: MipsGenRegisterInfo.inc.h
+Mips16HardFloat.o: MipsGenSubtargetInfo.inc.h
+Mips16HardFloat.po: MipsGenInstrInfo.inc.h
+Mips16HardFloat.po: MipsGenRegisterInfo.inc.h
+Mips16HardFloat.po: MipsGenSubtargetInfo.inc.h
Mips16ISelDAGToDAG.o: Intrinsics.inc.h
Mips16ISelDAGToDAG.o: MipsGenDAGISel.inc.h
Mips16ISelDAGToDAG.o: MipsGenInstrInfo.inc.h
diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend
index 96c1046c07fc..c0c495914f42 100644
--- a/lib/clang/libllvmmipsdesc/Makefile.depend
+++ b/lib/clang/libllvmmipsdesc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -21,20 +20,12 @@ MipsAsmBackend.o: MipsGenSubtargetInfo.inc.h
MipsAsmBackend.po: MipsGenInstrInfo.inc.h
MipsAsmBackend.po: MipsGenRegisterInfo.inc.h
MipsAsmBackend.po: MipsGenSubtargetInfo.inc.h
-MipsDirectObjLower.o: MipsGenInstrInfo.inc.h
-MipsDirectObjLower.o: MipsGenRegisterInfo.inc.h
-MipsDirectObjLower.o: MipsGenSubtargetInfo.inc.h
-MipsDirectObjLower.po: MipsGenInstrInfo.inc.h
-MipsDirectObjLower.po: MipsGenRegisterInfo.inc.h
-MipsDirectObjLower.po: MipsGenSubtargetInfo.inc.h
MipsELFObjectWriter.o: MipsGenInstrInfo.inc.h
MipsELFObjectWriter.o: MipsGenRegisterInfo.inc.h
MipsELFObjectWriter.o: MipsGenSubtargetInfo.inc.h
MipsELFObjectWriter.po: MipsGenInstrInfo.inc.h
MipsELFObjectWriter.po: MipsGenRegisterInfo.inc.h
MipsELFObjectWriter.po: MipsGenSubtargetInfo.inc.h
-MipsELFStreamer.o: MipsGenSubtargetInfo.inc.h
-MipsELFStreamer.po: MipsGenSubtargetInfo.inc.h
MipsMCCodeEmitter.o: MipsGenInstrInfo.inc.h
MipsMCCodeEmitter.o: MipsGenMCCodeEmitter.inc.h
MipsMCCodeEmitter.o: MipsGenRegisterInfo.inc.h
diff --git a/lib/clang/libllvmmipsdisassembler/Makefile.depend b/lib/clang/libllvmmipsdisassembler/Makefile.depend
index 062877f6c133..878dd8593cf6 100644
--- a/lib/clang/libllvmmipsdisassembler/Makefile.depend
+++ b/lib/clang/libllvmmipsdisassembler/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend
index 1c74f8ffb6b6..452184f8ae4d 100644
--- a/lib/clang/libllvmmipsinfo/Makefile.depend
+++ b/lib/clang/libllvmmipsinfo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsinstprinter/Makefile.depend
index 2ac9a3876a1f..99744bab583c 100644
--- a/lib/clang/libllvmmipsinstprinter/Makefile.depend
+++ b/lib/clang/libllvmmipsinstprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmobjcarcopts/Makefile.depend b/lib/clang/libllvmobjcarcopts/Makefile.depend
index faea27b7f43f..4ebd17e012a6 100644
--- a/lib/clang/libllvmobjcarcopts/Makefile.depend
+++ b/lib/clang/libllvmobjcarcopts/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmobject/Makefile.depend b/lib/clang/libllvmobject/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmobject/Makefile.depend
+++ b/lib/clang/libllvmobject/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend
index 3ef28585d282..2808f9ae4a4b 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile.depend
+++ b/lib/clang/libllvmpowerpccodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -27,9 +26,11 @@ PPCBranchSelector.o: PPCGenSubtargetInfo.inc.h
PPCBranchSelector.po: PPCGenInstrInfo.inc.h
PPCBranchSelector.po: PPCGenRegisterInfo.inc.h
PPCBranchSelector.po: PPCGenSubtargetInfo.inc.h
+PPCCTRLoops.o: Intrinsics.inc.h
PPCCTRLoops.o: PPCGenInstrInfo.inc.h
PPCCTRLoops.o: PPCGenRegisterInfo.inc.h
PPCCTRLoops.o: PPCGenSubtargetInfo.inc.h
+PPCCTRLoops.po: Intrinsics.inc.h
PPCCTRLoops.po: PPCGenInstrInfo.inc.h
PPCCTRLoops.po: PPCGenRegisterInfo.inc.h
PPCCTRLoops.po: PPCGenSubtargetInfo.inc.h
@@ -41,6 +42,18 @@ PPCCodeEmitter.po: PPCGenCodeEmitter.inc.h
PPCCodeEmitter.po: PPCGenInstrInfo.inc.h
PPCCodeEmitter.po: PPCGenRegisterInfo.inc.h
PPCCodeEmitter.po: PPCGenSubtargetInfo.inc.h
+PPCFastISel.o: Intrinsics.inc.h
+PPCFastISel.o: PPCGenCallingConv.inc.h
+PPCFastISel.o: PPCGenFastISel.inc.h
+PPCFastISel.o: PPCGenInstrInfo.inc.h
+PPCFastISel.o: PPCGenRegisterInfo.inc.h
+PPCFastISel.o: PPCGenSubtargetInfo.inc.h
+PPCFastISel.po: Intrinsics.inc.h
+PPCFastISel.po: PPCGenCallingConv.inc.h
+PPCFastISel.po: PPCGenFastISel.inc.h
+PPCFastISel.po: PPCGenInstrInfo.inc.h
+PPCFastISel.po: PPCGenRegisterInfo.inc.h
+PPCFastISel.po: PPCGenSubtargetInfo.inc.h
PPCFrameLowering.o: PPCGenInstrInfo.inc.h
PPCFrameLowering.o: PPCGenRegisterInfo.inc.h
PPCFrameLowering.o: PPCGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend
index ddc053c119af..d6220e7321a8 100644
--- a/lib/clang/libllvmpowerpcdesc/Makefile.depend
+++ b/lib/clang/libllvmpowerpcdesc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -41,4 +40,10 @@ PPCMCTargetDesc.o: PPCGenSubtargetInfo.inc.h
PPCMCTargetDesc.po: PPCGenInstrInfo.inc.h
PPCMCTargetDesc.po: PPCGenRegisterInfo.inc.h
PPCMCTargetDesc.po: PPCGenSubtargetInfo.inc.h
+PPCMachObjectWriter.o: PPCGenInstrInfo.inc.h
+PPCMachObjectWriter.o: PPCGenRegisterInfo.inc.h
+PPCMachObjectWriter.o: PPCGenSubtargetInfo.inc.h
+PPCMachObjectWriter.po: PPCGenInstrInfo.inc.h
+PPCMachObjectWriter.po: PPCGenRegisterInfo.inc.h
+PPCMachObjectWriter.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend
index e952d74e5ede..022060a5f096 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinfo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
index 057e08f6b214..676a53c94bdc 100644
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmruntimedyld/Makefile.depend b/lib/clang/libllvmruntimedyld/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmruntimedyld/Makefile.depend
+++ b/lib/clang/libllvmruntimedyld/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmscalaropts/Makefile.depend b/lib/clang/libllvmscalaropts/Makefile.depend
index 921024027b00..1c880cd3d3fd 100644
--- a/lib/clang/libllvmscalaropts/Makefile.depend
+++ b/lib/clang/libllvmscalaropts/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -33,6 +32,8 @@ LICM.o: Intrinsics.inc.h
LICM.po: Intrinsics.inc.h
LoopIdiomRecognize.o: Intrinsics.inc.h
LoopIdiomRecognize.po: Intrinsics.inc.h
+LoopRerollPass.o: Intrinsics.inc.h
+LoopRerollPass.po: Intrinsics.inc.h
LoopRotation.o: Intrinsics.inc.h
LoopRotation.po: Intrinsics.inc.h
LoopStrengthReduce.o: Intrinsics.inc.h
@@ -45,6 +46,8 @@ LowerAtomic.o: Intrinsics.inc.h
LowerAtomic.po: Intrinsics.inc.h
MemCpyOptimizer.o: Intrinsics.inc.h
MemCpyOptimizer.po: Intrinsics.inc.h
+PartiallyInlineLibCalls.o: Intrinsics.inc.h
+PartiallyInlineLibCalls.po: Intrinsics.inc.h
Reassociate.o: Intrinsics.inc.h
Reassociate.po: Intrinsics.inc.h
SCCP.o: Intrinsics.inc.h
@@ -57,6 +60,8 @@ SimplifyCFGPass.o: Intrinsics.inc.h
SimplifyCFGPass.po: Intrinsics.inc.h
Sink.o: Intrinsics.inc.h
Sink.po: Intrinsics.inc.h
+StructurizeCFG.o: Intrinsics.inc.h
+StructurizeCFG.po: Intrinsics.inc.h
TailRecursionElimination.o: Intrinsics.inc.h
TailRecursionElimination.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend
index 95ce77ee7c9b..737ede18613e 100644
--- a/lib/clang/libllvmselectiondag/Makefile.depend
+++ b/lib/clang/libllvmselectiondag/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmsupport/Makefile.depend b/lib/clang/libllvmsupport/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmsupport/Makefile.depend
+++ b/lib/clang/libllvmsupport/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmtablegen/Makefile.depend b/lib/clang/libllvmtablegen/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmtablegen/Makefile.depend
+++ b/lib/clang/libllvmtablegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmtarget/Makefile.depend b/lib/clang/libllvmtarget/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmtarget/Makefile.depend
+++ b/lib/clang/libllvmtarget/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend
index 5ed0fbadb4c0..2aad904d8c6a 100644
--- a/lib/clang/libllvmtransformutils/Makefile.depend
+++ b/lib/clang/libllvmtransformutils/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -23,6 +22,8 @@ CloneFunction.o: Intrinsics.inc.h
CloneFunction.po: Intrinsics.inc.h
CodeExtractor.o: Intrinsics.inc.h
CodeExtractor.po: Intrinsics.inc.h
+GlobalStatus.o: Intrinsics.inc.h
+GlobalStatus.po: Intrinsics.inc.h
InlineFunction.o: Intrinsics.inc.h
InlineFunction.po: Intrinsics.inc.h
IntegerDivision.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend
index 40d35601976f..171d928360a5 100644
--- a/lib/clang/libllvmvectorize/Makefile.depend
+++ b/lib/clang/libllvmvectorize/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -21,6 +20,4 @@ LoopVectorize.o: Intrinsics.inc.h
LoopVectorize.po: Intrinsics.inc.h
SLPVectorizer.o: Intrinsics.inc.h
SLPVectorizer.po: Intrinsics.inc.h
-VecUtils.o: Intrinsics.inc.h
-VecUtils.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmx86asmparser/Makefile.depend b/lib/clang/libllvmx86asmparser/Makefile.depend
index b4ef923f230b..200e80ddc0c4 100644
--- a/lib/clang/libllvmx86asmparser/Makefile.depend
+++ b/lib/clang/libllvmx86asmparser/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend
index 1eb524d37c33..530394855029 100644
--- a/lib/clang/libllvmx86codegen/Makefile.depend
+++ b/lib/clang/libllvmx86codegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend
index 9e3ab7303e68..503475705ddc 100644
--- a/lib/clang/libllvmx86desc/Makefile.depend
+++ b/lib/clang/libllvmx86desc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -27,6 +26,12 @@ X86ELFObjectWriter.o: X86GenSubtargetInfo.inc.h
X86ELFObjectWriter.po: X86GenInstrInfo.inc.h
X86ELFObjectWriter.po: X86GenRegisterInfo.inc.h
X86ELFObjectWriter.po: X86GenSubtargetInfo.inc.h
+X86ELFRelocationInfo.o: X86GenInstrInfo.inc.h
+X86ELFRelocationInfo.o: X86GenRegisterInfo.inc.h
+X86ELFRelocationInfo.o: X86GenSubtargetInfo.inc.h
+X86ELFRelocationInfo.po: X86GenInstrInfo.inc.h
+X86ELFRelocationInfo.po: X86GenRegisterInfo.inc.h
+X86ELFRelocationInfo.po: X86GenSubtargetInfo.inc.h
X86MCCodeEmitter.o: X86GenInstrInfo.inc.h
X86MCCodeEmitter.o: X86GenRegisterInfo.inc.h
X86MCCodeEmitter.o: X86GenSubtargetInfo.inc.h
@@ -39,6 +44,12 @@ X86MCTargetDesc.o: X86GenSubtargetInfo.inc.h
X86MCTargetDesc.po: X86GenInstrInfo.inc.h
X86MCTargetDesc.po: X86GenRegisterInfo.inc.h
X86MCTargetDesc.po: X86GenSubtargetInfo.inc.h
+X86MachORelocationInfo.o: X86GenInstrInfo.inc.h
+X86MachORelocationInfo.o: X86GenRegisterInfo.inc.h
+X86MachORelocationInfo.o: X86GenSubtargetInfo.inc.h
+X86MachORelocationInfo.po: X86GenInstrInfo.inc.h
+X86MachORelocationInfo.po: X86GenRegisterInfo.inc.h
+X86MachORelocationInfo.po: X86GenSubtargetInfo.inc.h
X86MachObjectWriter.o: X86GenInstrInfo.inc.h
X86MachObjectWriter.o: X86GenRegisterInfo.inc.h
X86MachObjectWriter.o: X86GenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend
index 0e569caab18a..fa7a65b0d137 100644
--- a/lib/clang/libllvmx86disassembler/Makefile.depend
+++ b/lib/clang/libllvmx86disassembler/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend
index 212ccc1cdf92..1ea75cbc9180 100644
--- a/lib/clang/libllvmx86info/Makefile.depend
+++ b/lib/clang/libllvmx86info/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86instprinter/Makefile.depend
index 062c7822b7da..86a651a27d43 100644
--- a/lib/clang/libllvmx86instprinter/Makefile.depend
+++ b/lib/clang/libllvmx86instprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86utils/Makefile.depend b/lib/clang/libllvmx86utils/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmx86utils/Makefile.depend
+++ b/lib/clang/libllvmx86utils/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/libalias/libalias/Makefile.depend b/lib/libalias/libalias/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libalias/libalias/Makefile.depend
+++ b/lib/libalias/libalias/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libalias/modules/cuseeme/Makefile.depend b/lib/libalias/modules/cuseeme/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/cuseeme/Makefile.depend
+++ b/lib/libalias/modules/cuseeme/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/dummy/Makefile.depend
+++ b/lib/libalias/modules/dummy/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/ftp/Makefile.depend
+++ b/lib/libalias/modules/ftp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/irc/Makefile.depend
+++ b/lib/libalias/modules/irc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/nbt/Makefile.depend
+++ b/lib/libalias/modules/nbt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/pptp/Makefile.depend
+++ b/lib/libalias/modules/pptp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/skinny/Makefile.depend
+++ b/lib/libalias/modules/skinny/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/smedia/Makefile.depend
+++ b/lib/libalias/modules/smedia/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libarchive/Makefile.depend b/lib/libarchive/Makefile.depend
index aec02f3165be..f87de01ae5f6 100644
--- a/lib/libarchive/Makefile.depend
+++ b/lib/libarchive/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -14,6 +15,7 @@ DIRDEPS = \
lib/liblzma \
lib/libz \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libauditd/Makefile.depend b/lib/libauditd/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libauditd/Makefile.depend
+++ b/lib/libauditd/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbegemot/Makefile.depend b/lib/libbegemot/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libbegemot/Makefile.depend
+++ b/lib/libbegemot/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libblocksruntime/Makefile.depend b/lib/libblocksruntime/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libblocksruntime/Makefile.depend
+++ b/lib/libblocksruntime/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbluetooth/Makefile.depend b/lib/libbluetooth/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libbluetooth/Makefile.depend
+++ b/lib/libbluetooth/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbsm/Makefile.depend b/lib/libbsm/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libbsm/Makefile.depend
+++ b/lib/libbsm/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbsnmp/libbsnmp/Makefile.depend b/lib/libbsnmp/libbsnmp/Makefile.depend
index 761a02420758..4de5cd32a6b8 100644
--- a/lib/libbsnmp/libbsnmp/Makefile.depend
+++ b/lib/libbsnmp/libbsnmp/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/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbz2/Makefile.depend b/lib/libbz2/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libbz2/Makefile.depend
+++ b/lib/libbz2/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend
index bc14f56bdfff..e391c404ef63 100644
--- a/lib/libc++/Makefile.depend
+++ b/lib/libc++/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/lib/libcalendar/Makefile.depend b/lib/libcalendar/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/lib/libcalendar/Makefile.depend
+++ b/lib/libcalendar/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcam/Makefile.depend b/lib/libcam/Makefile.depend
index a1157119ad51..f976a9c926dd 100644
--- a/lib/libcam/Makefile.depend
+++ b/lib/libcam/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcapsicum/Makefile.depend b/lib/libcapsicum/Makefile.depend
index 67b4ef08e1f9..ab84fcc1c757 100644
--- a/lib/libcapsicum/Makefile.depend
+++ b/lib/libcapsicum/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnv \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcom_err/Makefile.depend b/lib/libcom_err/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libcom_err/Makefile.depend
+++ b/lib/libcom_err/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcrypt/Makefile.depend b/lib/libcrypt/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libcrypt/Makefile.depend
+++ b/lib/libcrypt/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcxxrt/Makefile.depend b/lib/libcxxrt/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libcxxrt/Makefile.depend
+++ b/lib/libcxxrt/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdevinfo/Makefile.depend b/lib/libdevinfo/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libdevinfo/Makefile.depend
+++ b/lib/libdevinfo/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdevstat/Makefile.depend b/lib/libdevstat/Makefile.depend
index b7d414c85aeb..46488c998a57 100644
--- a/lib/libdevstat/Makefile.depend
+++ b/lib/libdevstat/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend
index 1b2ce3e41ae6..07e629e24137 100644
--- a/lib/libdwarf/Makefile.depend
+++ b/lib/libdwarf/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index af92ff9ef9e3..1d7ae9448400 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libelf/Makefile.depend b/lib/libelf/Makefile.depend
index 7c6b7073c2ee..b2c79ae13999 100644
--- a/lib/libelf/Makefile.depend
+++ b/lib/libelf/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libexecinfo/Makefile.depend b/lib/libexecinfo/Makefile.depend
index 659d7cca1ad8..f8f5a363f748 100644
--- a/lib/libexecinfo/Makefile.depend
+++ b/lib/libexecinfo/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libexpat/Makefile.depend b/lib/libexpat/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libexpat/Makefile.depend
+++ b/lib/libexpat/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libfetch/Makefile.depend b/lib/libfetch/Makefile.depend
index 02237e854efd..3fcefec42ea7 100644
--- a/lib/libfetch/Makefile.depend
+++ b/lib/libfetch/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgeom/Makefile.depend b/lib/libgeom/Makefile.depend
index a66d580db4dc..acc7f3579c8e 100644
--- a/lib/libgeom/Makefile.depend
+++ b/lib/libgeom/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libsbuf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgpib/Makefile.depend b/lib/libgpib/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/lib/libgpib/Makefile.depend
+++ b/lib/libgpib/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgssapi/Makefile.depend b/lib/libgssapi/Makefile.depend
index 841cdfd90dab..4a1f10886ac4 100644
--- a/lib/libgssapi/Makefile.depend
+++ b/lib/libgssapi/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/BIG5/Makefile.depend b/lib/libiconv_modules/BIG5/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/BIG5/Makefile.depend
+++ b/lib/libiconv_modules/BIG5/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/DECHanyu/Makefile.depend b/lib/libiconv_modules/DECHanyu/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/DECHanyu/Makefile.depend
+++ b/lib/libiconv_modules/DECHanyu/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/EUC/Makefile.depend b/lib/libiconv_modules/EUC/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/EUC/Makefile.depend
+++ b/lib/libiconv_modules/EUC/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/EUCTW/Makefile.depend b/lib/libiconv_modules/EUCTW/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/EUCTW/Makefile.depend
+++ b/lib/libiconv_modules/EUCTW/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/GBK2K/Makefile.depend b/lib/libiconv_modules/GBK2K/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/GBK2K/Makefile.depend
+++ b/lib/libiconv_modules/GBK2K/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/HZ/Makefile.depend b/lib/libiconv_modules/HZ/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/HZ/Makefile.depend
+++ b/lib/libiconv_modules/HZ/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/ISO2022/Makefile.depend b/lib/libiconv_modules/ISO2022/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/ISO2022/Makefile.depend
+++ b/lib/libiconv_modules/ISO2022/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/JOHAB/Makefile.depend b/lib/libiconv_modules/JOHAB/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/JOHAB/Makefile.depend
+++ b/lib/libiconv_modules/JOHAB/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/MSKanji/Makefile.depend b/lib/libiconv_modules/MSKanji/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/MSKanji/Makefile.depend
+++ b/lib/libiconv_modules/MSKanji/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UES/Makefile.depend b/lib/libiconv_modules/UES/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UES/Makefile.depend
+++ b/lib/libiconv_modules/UES/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF1632/Makefile.depend b/lib/libiconv_modules/UTF1632/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UTF1632/Makefile.depend
+++ b/lib/libiconv_modules/UTF1632/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF7/Makefile.depend b/lib/libiconv_modules/UTF7/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UTF7/Makefile.depend
+++ b/lib/libiconv_modules/UTF7/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF8/Makefile.depend b/lib/libiconv_modules/UTF8/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UTF8/Makefile.depend
+++ b/lib/libiconv_modules/UTF8/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/VIQR/Makefile.depend b/lib/libiconv_modules/VIQR/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/VIQR/Makefile.depend
+++ b/lib/libiconv_modules/VIQR/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/ZW/Makefile.depend b/lib/libiconv_modules/ZW/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/ZW/Makefile.depend
+++ b/lib/libiconv_modules/ZW/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/iconv_none/Makefile.depend b/lib/libiconv_modules/iconv_none/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/iconv_none/Makefile.depend
+++ b/lib/libiconv_modules/iconv_none/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/iconv_std/Makefile.depend b/lib/libiconv_modules/iconv_std/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/iconv_std/Makefile.depend
+++ b/lib/libiconv_modules/iconv_std/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_646/Makefile.depend b/lib/libiconv_modules/mapper_646/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_646/Makefile.depend
+++ b/lib/libiconv_modules/mapper_646/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_none/Makefile.depend b/lib/libiconv_modules/mapper_none/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_none/Makefile.depend
+++ b/lib/libiconv_modules/mapper_none/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_parallel/Makefile.depend b/lib/libiconv_modules/mapper_parallel/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_parallel/Makefile.depend
+++ b/lib/libiconv_modules/mapper_parallel/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_serial/Makefile.depend b/lib/libiconv_modules/mapper_serial/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_serial/Makefile.depend
+++ b/lib/libiconv_modules/mapper_serial/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_std/Makefile.depend b/lib/libiconv_modules/mapper_std/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_std/Makefile.depend
+++ b/lib/libiconv_modules/mapper_std/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_zone/Makefile.depend b/lib/libiconv_modules/mapper_zone/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_zone/Makefile.depend
+++ b/lib/libiconv_modules/mapper_zone/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libipsec/Makefile.depend b/lib/libipsec/Makefile.depend
index 89518b5ff290..f48095aeb79d 100644
--- a/lib/libipsec/Makefile.depend
+++ b/lib/libipsec/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libjail/Makefile.depend b/lib/libjail/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libjail/Makefile.depend
+++ b/lib/libjail/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libkiconv/Makefile.depend b/lib/libkiconv/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libkiconv/Makefile.depend
+++ b/lib/libkiconv/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libkvm/Makefile.depend b/lib/libkvm/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libkvm/Makefile.depend
+++ b/lib/libkvm/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libldns/Makefile.depend b/lib/libldns/Makefile.depend
index 4ea74e5d0c67..3bf324e728f6 100644
--- a/lib/libldns/Makefile.depend
+++ b/lib/libldns/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 = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmagic/Makefile.depend b/lib/libmagic/Makefile.depend
index 8d258dfd965e..934940fb76de 100644
--- a/lib/libmagic/Makefile.depend
+++ b/lib/libmagic/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmd/Makefile.depend b/lib/libmd/Makefile.depend
index 9561917e0293..17ea6ebfae17 100644
--- a/lib/libmd/Makefile.depend
+++ b/lib/libmd/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmemstat/Makefile.depend b/lib/libmemstat/Makefile.depend
index b7d414c85aeb..46488c998a57 100644
--- a/lib/libmemstat/Makefile.depend
+++ b/lib/libmemstat/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index 92baf08bda74..e092bec52b91 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmp/Makefile.depend b/lib/libmp/Makefile.depend
index 761a02420758..4de5cd32a6b8 100644
--- a/lib/libmp/Makefile.depend
+++ b/lib/libmp/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/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libnetgraph/Makefile.depend b/lib/libnetgraph/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libnetgraph/Makefile.depend
+++ b/lib/libnetgraph/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libngatm/Makefile.depend b/lib/libngatm/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libngatm/Makefile.depend
+++ b/lib/libngatm/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libnv/Makefile.depend b/lib/libnv/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libnv/Makefile.depend
+++ b/lib/libnv/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libopie/Makefile.depend b/lib/libopie/Makefile.depend
index c1f494f87eff..9c2e45312c9f 100644
--- a/lib/libopie/Makefile.depend
+++ b/lib/libopie/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/libpam/Makefile.depend b/lib/libpam/libpam/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libpam/libpam/Makefile.depend
+++ b/lib/libpam/libpam/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_chroot/Makefile.depend b/lib/libpam/modules/pam_chroot/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_chroot/Makefile.depend
+++ b/lib/libpam/modules/pam_chroot/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_deny/Makefile.depend b/lib/libpam/modules/pam_deny/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_deny/Makefile.depend
+++ b/lib/libpam/modules/pam_deny/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_echo/Makefile.depend b/lib/libpam/modules/pam_echo/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_echo/Makefile.depend
+++ b/lib/libpam/modules/pam_echo/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_exec/Makefile.depend b/lib/libpam/modules/pam_exec/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_exec/Makefile.depend
+++ b/lib/libpam/modules/pam_exec/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile.depend b/lib/libpam/modules/pam_ftpusers/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile.depend
+++ b/lib/libpam/modules/pam_ftpusers/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_group/Makefile.depend b/lib/libpam/modules/pam_group/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_group/Makefile.depend
+++ b/lib/libpam/modules/pam_group/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_guest/Makefile.depend b/lib/libpam/modules/pam_guest/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_guest/Makefile.depend
+++ b/lib/libpam/modules/pam_guest/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_krb5/Makefile.depend b/lib/libpam/modules/pam_krb5/Makefile.depend
index 43e39273fcd1..f6e886edbc48 100644
--- a/lib/libpam/modules/pam_krb5/Makefile.depend
+++ b/lib/libpam/modules/pam_krb5/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -17,6 +18,7 @@ DIRDEPS = \
lib/libcrypt \
lib/libpam/libpam \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_ksu/Makefile.depend b/lib/libpam/modules/pam_ksu/Makefile.depend
index 43e39273fcd1..f6e886edbc48 100644
--- a/lib/libpam/modules/pam_ksu/Makefile.depend
+++ b/lib/libpam/modules/pam_ksu/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -17,6 +18,7 @@ DIRDEPS = \
lib/libcrypt \
lib/libpam/libpam \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_lastlog/Makefile.depend b/lib/libpam/modules/pam_lastlog/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile.depend
+++ b/lib/libpam/modules/pam_lastlog/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_login_access/Makefile.depend b/lib/libpam/modules/pam_login_access/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_login_access/Makefile.depend
+++ b/lib/libpam/modules/pam_login_access/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_nologin/Makefile.depend b/lib/libpam/modules/pam_nologin/Makefile.depend
index 3d8c2f306ad0..0e5a16774bbd 100644
--- a/lib/libpam/modules/pam_nologin/Makefile.depend
+++ b/lib/libpam/modules/pam_nologin/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_opie/Makefile.depend b/lib/libpam/modules/pam_opie/Makefile.depend
index 91d27924dfb5..1e75b4a902b0 100644
--- a/lib/libpam/modules/pam_opie/Makefile.depend
+++ b/lib/libpam/modules/pam_opie/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libopie \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile.depend b/lib/libpam/modules/pam_opieaccess/Makefile.depend
index 94ab2e8f6fbf..7316349cd5b6 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile.depend
+++ b/lib/libpam/modules/pam_opieaccess/Makefile.depend
@@ -8,10 +8,10 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libopie \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile.depend b/lib/libpam/modules/pam_passwdqc/Makefile.depend
index 89eac3ede0d5..7cce822158bc 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile.depend
+++ b/lib/libpam/modules/pam_passwdqc/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_permit/Makefile.depend b/lib/libpam/modules/pam_permit/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_permit/Makefile.depend
+++ b/lib/libpam/modules/pam_permit/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_radius/Makefile.depend b/lib/libpam/modules/pam_radius/Makefile.depend
index 6a72e9b8e25d..8daba2c77397 100644
--- a/lib/libpam/modules/pam_radius/Makefile.depend
+++ b/lib/libpam/modules/pam_radius/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libradius \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_rhosts/Makefile.depend b/lib/libpam/modules/pam_rhosts/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile.depend
+++ b/lib/libpam/modules/pam_rhosts/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_rootok/Makefile.depend b/lib/libpam/modules/pam_rootok/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_rootok/Makefile.depend
+++ b/lib/libpam/modules/pam_rootok/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_securetty/Makefile.depend b/lib/libpam/modules/pam_securetty/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_securetty/Makefile.depend
+++ b/lib/libpam/modules/pam_securetty/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_self/Makefile.depend b/lib/libpam/modules/pam_self/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_self/Makefile.depend
+++ b/lib/libpam/modules/pam_self/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_ssh/Makefile.depend b/lib/libpam/modules/pam_ssh/Makefile.depend
index 425795df2d57..e46aac47883c 100644
--- a/lib/libpam/modules/pam_ssh/Makefile.depend
+++ b/lib/libpam/modules/pam_ssh/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libutil \
secure/lib/libcrypto \
secure/lib/libssh \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_tacplus/Makefile.depend b/lib/libpam/modules/pam_tacplus/Makefile.depend
index bc4b7343419e..c3edc9b21fdc 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile.depend
+++ b/lib/libpam/modules/pam_tacplus/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libtacplus \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_unix/Makefile.depend b/lib/libpam/modules/pam_unix/Makefile.depend
index 13a84801d0c2..47a9e7e0623c 100644
--- a/lib/libpam/modules/pam_unix/Makefile.depend
+++ b/lib/libpam/modules/pam_unix/Makefile.depend
@@ -10,12 +10,12 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libpam/libpam \
lib/libutil \
lib/libypclnt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend
index 2b635d7fa37e..c3f153ba3ae8 100644
--- a/lib/libpcap/Makefile.depend
+++ b/lib/libpcap/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpmc/Makefile.depend b/lib/libpmc/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libpmc/Makefile.depend
+++ b/lib/libpmc/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend
index 363d9a0730b3..46c4714e5ad6 100644
--- a/lib/libproc/Makefile.depend
+++ b/lib/libproc/Makefile.depend
@@ -9,11 +9,11 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libprocstat/Makefile.depend b/lib/libprocstat/Makefile.depend
index 7e162f7cd899..bf92deb89550 100644
--- a/lib/libprocstat/Makefile.depend
+++ b/lib/libprocstat/Makefile.depend
@@ -9,12 +9,12 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libkvm \
lib/libprocstat/zfs \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libprocstat/zfs/Makefile.depend b/lib/libprocstat/zfs/Makefile.depend
index b142a6736e9e..2b448e39c8b1 100644
--- a/lib/libprocstat/zfs/Makefile.depend
+++ b/lib/libprocstat/zfs/Makefile.depend
@@ -5,6 +5,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
include \
include/xlocale \
+ lib/clang/include \
lib/libkvm \
lib/msun \
diff --git a/lib/libradius/Makefile.depend b/lib/libradius/Makefile.depend
index 2c3cff5e1329..6047b890a604 100644
--- a/lib/libradius/Makefile.depend
+++ b/lib/libradius/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 = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend
index 4651ca83b919..89fa5dfd28c1 100644
--- a/lib/librpcsec_gss/Makefile.depend
+++ b/lib/librpcsec_gss/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/rpc \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgssapi \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librpcsvc/Makefile.depend b/lib/librpcsvc/Makefile.depend
index 7b1e7f4f7015..0c8f02a303d1 100644
--- a/lib/librpcsvc/Makefile.depend
+++ b/lib/librpcsvc/Makefile.depend
@@ -11,8 +11,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/lib/librt/Makefile.depend
+++ b/lib/librt/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend
index 6b94eaeeb5af..8a7801e2e170 100644
--- a/lib/librtld_db/Makefile.depend
+++ b/lib/librtld_db/Makefile.depend
@@ -9,11 +9,11 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libproc \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsbuf/Makefile.depend b/lib/libsbuf/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libsbuf/Makefile.depend
+++ b/lib/libsbuf/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsdp/Makefile.depend b/lib/libsdp/Makefile.depend
index beb640354e0e..7a7a3e35ab8d 100644
--- a/lib/libsdp/Makefile.depend
+++ b/lib/libsdp/Makefile.depend
@@ -11,8 +11,8 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsmb/Makefile.depend b/lib/libsmb/Makefile.depend
index b1a67cd37ad9..b370707fb403 100644
--- a/lib/libsmb/Makefile.depend
+++ b/lib/libsmb/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkiconv \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libstand/Makefile.depend b/lib/libstand/Makefile.depend
index 34236cbeda95..647f6f8b2c3f 100644
--- a/lib/libstand/Makefile.depend
+++ b/lib/libstand/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
include \
include/arpa \
include/xlocale \
+ lib/clang/include \
lib/libbz2 \
diff --git a/lib/libstdbuf/Makefile.depend b/lib/libstdbuf/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libstdbuf/Makefile.depend
+++ b/lib/libstdbuf/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libstdthreads/Makefile.depend b/lib/libstdthreads/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/lib/libstdthreads/Makefile.depend
+++ b/lib/libstdthreads/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libtacplus/Makefile.depend b/lib/libtacplus/Makefile.depend
index c1f494f87eff..9c2e45312c9f 100644
--- a/lib/libtacplus/Makefile.depend
+++ b/lib/libtacplus/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libthread_db/Makefile.depend b/lib/libthread_db/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libthread_db/Makefile.depend
+++ b/lib/libthread_db/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libufs/Makefile.depend b/lib/libufs/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libufs/Makefile.depend
+++ b/lib/libufs/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libugidfw/Makefile.depend b/lib/libugidfw/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libugidfw/Makefile.depend
+++ b/lib/libugidfw/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libulog/Makefile.depend b/lib/libulog/Makefile.depend
index f3adefe05801..0d8c29b0674e 100644
--- a/lib/libulog/Makefile.depend
+++ b/lib/libulog/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index 2cfec353103a..44c5fdc3413a 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -13,6 +14,7 @@ DIRDEPS = \
lib/libthr \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libusb/Makefile.depend b/lib/libusb/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/lib/libusb/Makefile.depend
+++ b/lib/libusb/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libusbhid/Makefile.depend b/lib/libusbhid/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libusbhid/Makefile.depend
+++ b/lib/libusbhid/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libutil/Makefile.depend b/lib/libutil/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libutil/Makefile.depend
+++ b/lib/libutil/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libvgl/Makefile.depend b/lib/libvgl/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libvgl/Makefile.depend
+++ b/lib/libvgl/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libvmmapi/Makefile.depend b/lib/libvmmapi/Makefile.depend
index 40b445f04779..074ac81cfb42 100644
--- a/lib/libvmmapi/Makefile.depend
+++ b/lib/libvmmapi/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libwrap/Makefile.depend b/lib/libwrap/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libwrap/Makefile.depend
+++ b/lib/libwrap/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libypclnt/Makefile.depend b/lib/libypclnt/Makefile.depend
index 619ca757937c..7d7c7444e9b2 100644
--- a/lib/libypclnt/Makefile.depend
+++ b/lib/libypclnt/Makefile.depend
@@ -11,8 +11,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libz/Makefile.depend
+++ b/lib/libz/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/msun/Makefile.depend
+++ b/lib/msun/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index 936372895325..c3295ff8e981 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend
index e942aba98876..d56ffbbe742d 100644
--- a/lib/ncurses/formw/Makefile.depend
+++ b/lib/ncurses/formw/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend
index 3ca328f016d0..5c8368f7d874 100644
--- a/lib/ncurses/menu/Makefile.depend
+++ b/lib/ncurses/menu/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend
index 981ac37cd263..49f188286e37 100644
--- a/lib/ncurses/menuw/Makefile.depend
+++ b/lib/ncurses/menuw/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index 6274ac87202f..871dd718ac1f 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncursesw/Makefile.depend
index b26f3c2fe5c7..445c456bc4f7 100644
--- a/lib/ncurses/ncursesw/Makefile.depend
+++ b/lib/ncurses/ncursesw/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index e5c91fb693ef..2359930f70f6 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend
index c5a301e94c81..2ec647289e61 100644
--- a/lib/ncurses/panelw/Makefile.depend
+++ b/lib/ncurses/panelw/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/libexec/atf/atf-check/Makefile.depend b/libexec/atf/atf-check/Makefile.depend
index aa1a20886895..72e04cf1a78d 100644
--- a/libexec/atf/atf-check/Makefile.depend
+++ b/libexec/atf/atf-check/Makefile.depend
@@ -3,16 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/atf/libatf-c \
lib/atf/libatf-c++ \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/msun \
diff --git a/libexec/atrun/Makefile.depend b/libexec/atrun/Makefile.depend
index 3d8c2f306ad0..0d2c9f9e78d5 100644
--- a/libexec/atrun/Makefile.depend
+++ b/libexec/atrun/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 5269280d143c..b68b4bb5daf9 100644
--- a/libexec/bootpd/bootpgw/Makefile.depend
+++ b/libexec/bootpd/bootpgw/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 5269280d143c..b68b4bb5daf9 100644
--- a/libexec/bootpd/tools/bootpef/Makefile.depend
+++ b/libexec/bootpd/tools/bootpef/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 5269280d143c..b68b4bb5daf9 100644
--- a/libexec/bootpd/tools/bootptest/Makefile.depend
+++ b/libexec/bootpd/tools/bootptest/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/libexec/comsat/Makefile.depend
+++ b/libexec/comsat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e3af08532eec..d9ecce6a52af 100644
--- a/libexec/fingerd/Makefile.depend
+++ b/libexec/fingerd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 a648938b6ff4..01d6209a27de 100644
--- a/libexec/ftpd/Makefile.depend
+++ b/libexec/ftpd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/libexec/getty/Makefile.depend
+++ b/libexec/getty/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend
index d4bbfb2aa92a..9dfec4858713 100644
--- a/libexec/mail.local/Makefile.depend
+++ b/libexec/mail.local/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 5930524f9ce7..c1655db8b437 100644
--- a/libexec/mknetid/Makefile.depend
+++ b/libexec/mknetid/Makefile.depend
@@ -11,7 +11,6 @@ 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 a2060055a242..83a8148003a0 100644
--- a/libexec/pppoed/Makefile.depend
+++ b/libexec/pppoed/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/libexec/rbootd/Makefile.depend
+++ b/libexec/rbootd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/libexec/revnetgroup/Makefile.depend
+++ b/libexec/revnetgroup/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e3af08532eec..d9ecce6a52af 100644
--- a/libexec/rlogind/Makefile.depend
+++ b/libexec/rlogind/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 27a6a4a115b8..3eb4558310fb 100644
--- a/libexec/rpc.rquotad/Makefile.depend
+++ b/libexec/rpc.rquotad/Makefile.depend
@@ -12,7 +12,6 @@ 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 e7870b4b49c3..0453f999473f 100644
--- a/libexec/rpc.rstatd/Makefile.depend
+++ b/libexec/rpc.rstatd/Makefile.depend
@@ -11,7 +11,6 @@ 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 8d990c379a15..40fe95df0535 100644
--- a/libexec/rpc.rusersd/Makefile.depend
+++ b/libexec/rpc.rusersd/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
lib/libutil \
diff --git a/libexec/rpc.rwalld/Makefile.depend b/libexec/rpc.rwalld/Makefile.depend
index d9693fd64752..bcf0e390016a 100644
--- a/libexec/rpc.rwalld/Makefile.depend
+++ b/libexec/rpc.rwalld/Makefile.depend
@@ -12,7 +12,6 @@ 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 3b0eba6af4e1..e44fad36fdf9 100644
--- a/libexec/rpc.sprayd/Makefile.depend
+++ b/libexec/rpc.sprayd/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/libexec/rshd/Makefile.depend b/libexec/rshd/Makefile.depend
index e513c61c3548..a6d700e4d586 100644
--- a/libexec/rshd/Makefile.depend
+++ b/libexec/rshd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 47096166cc73..af04b518f38b 100644
--- a/libexec/smrsh/Makefile.depend
+++ b/libexec/smrsh/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 11fa4d730adc..7cc74610b497 100644
--- a/libexec/talkd/Makefile.depend
+++ b/libexec/talkd/Makefile.depend
@@ -11,7 +11,6 @@ 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 8452af99c632..e66cc0b2d565 100644
--- a/libexec/tcpd/Makefile.depend
+++ b/libexec/tcpd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libwrap \
diff --git a/libexec/telnetd/Makefile.depend b/libexec/telnetd/Makefile.depend
index b4f3ca5b72ce..e2ee38e3ec48 100644
--- a/libexec/telnetd/Makefile.depend
+++ b/libexec/telnetd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/libexec/tftp-proxy/Makefile.depend b/libexec/tftp-proxy/Makefile.depend
index 5269280d143c..b68b4bb5daf9 100644
--- a/libexec/tftp-proxy/Makefile.depend
+++ b/libexec/tftp-proxy/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 a02eba6f2277..2e79396a44b9 100644
--- a/libexec/tftpd/Makefile.depend
+++ b/libexec/tftpd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 dfe8b1b46789..545efc7ef401 100644
--- a/libexec/ulog-helper/Makefile.depend
+++ b/libexec/ulog-helper/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 9641db9a4176..70e571fc5df5 100644
--- a/libexec/ypxfr/Makefile.depend
+++ b/libexec/ypxfr/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/librpcsvc \
diff --git a/sbin/adjkerntz/Makefile.depend b/sbin/adjkerntz/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/adjkerntz/Makefile.depend
+++ b/sbin/adjkerntz/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/sbin/atm/atmconfig/Makefile.depend b/sbin/atm/atmconfig/Makefile.depend
index 99d3028dc5a3..d0b9730ddd5b 100644
--- a/sbin/atm/atmconfig/Makefile.depend
+++ b/sbin/atm/atmconfig/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/sbin/badsect/Makefile.depend b/sbin/badsect/Makefile.depend
index 7fb8fce4559a..66da85cb1de1 100644
--- a/sbin/badsect/Makefile.depend
+++ b/sbin/badsect/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bac69c034a3b..df6361797d5d 100644
--- a/sbin/bsdlabel/Makefile.depend
+++ b/sbin/bsdlabel/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 c79bce5f2287..981ec38d17a8 100644
--- a/sbin/camcontrol/Makefile.depend
+++ b/sbin/camcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bac69c034a3b..df6361797d5d 100644
--- a/sbin/ccdconfig/Makefile.depend
+++ b/sbin/ccdconfig/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/clri/Makefile.depend
+++ b/sbin/clri/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/comcontrol/Makefile.depend
+++ b/sbin/comcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/conscontrol/Makefile.depend
+++ b/sbin/conscontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 b7d414c85aeb..384b6754a9ab 100644
--- a/sbin/ddb/Makefile.depend
+++ b/sbin/ddb/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/sbin/devd/Makefile.depend b/sbin/devd/Makefile.depend
index fdd8a7ca9a2d..adc7292db895 100644
--- a/sbin/devd/Makefile.depend
+++ b/sbin/devd/Makefile.depend
@@ -3,12 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/libutil \
lib/msun \
diff --git a/sbin/devfs/Makefile.depend b/sbin/devfs/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/devfs/Makefile.depend
+++ b/sbin/devfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e3af08532eec..d9ecce6a52af 100644
--- a/sbin/dhclient/Makefile.depend
+++ b/sbin/dhclient/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 b7d414c85aeb..384b6754a9ab 100644
--- a/sbin/dmesg/Makefile.depend
+++ b/sbin/dmesg/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/sbin/dump/Makefile.depend b/sbin/dump/Makefile.depend
index b3c03a71825a..4a9f7867ec6d 100644
--- a/sbin/dump/Makefile.depend
+++ b/sbin/dump/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 7fb8fce4559a..66da85cb1de1 100644
--- a/sbin/dumpfs/Makefile.depend
+++ b/sbin/dumpfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/dumpon/Makefile.depend
+++ b/sbin/dumpon/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/etherswitchcfg/Makefile.depend
+++ b/sbin/etherswitchcfg/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bac69c034a3b..df6361797d5d 100644
--- a/sbin/fdisk/Makefile.depend
+++ b/sbin/fdisk/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 7fb8fce4559a..66da85cb1de1 100644
--- a/sbin/ffsinfo/Makefile.depend
+++ b/sbin/ffsinfo/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/fsck/Makefile.depend
+++ b/sbin/fsck/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 7fb8fce4559a..66da85cb1de1 100644
--- a/sbin/fsck_ffs/Makefile.depend
+++ b/sbin/fsck_ffs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/fsck_msdosfs/Makefile.depend
+++ b/sbin/fsck_msdosfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 749626347205..6bb45ddb04cd 100644
--- a/sbin/fsdb/Makefile.depend
+++ b/sbin/fsdb/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/sbin/fsirand/Makefile.depend
+++ b/sbin/fsirand/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/gbde/Makefile.depend b/sbin/gbde/Makefile.depend
index b9c27745e156..f30afe7cb903 100644
--- a/sbin/gbde/Makefile.depend
+++ b/sbin/gbde/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/cache/Makefile.depend
+++ b/sbin/geom/class/cache/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/concat/Makefile.depend
+++ b/sbin/geom/class/concat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgeom \
sbin/geom/core \
diff --git a/sbin/geom/class/eli/Makefile.depend b/sbin/geom/class/eli/Makefile.depend
index fd13a8bc1924..2c7c316eefa7 100644
--- a/sbin/geom/class/eli/Makefile.depend
+++ b/sbin/geom/class/eli/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/sbin/geom/class/journal/Makefile.depend b/sbin/geom/class/journal/Makefile.depend
index 83f19b190dd7..058f0d7f87e5 100644
--- a/sbin/geom/class/journal/Makefile.depend
+++ b/sbin/geom/class/journal/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/label/Makefile.depend
+++ b/sbin/geom/class/label/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6ba212c71e01..4fa82023ea16 100644
--- a/sbin/geom/class/mirror/Makefile.depend
+++ b/sbin/geom/class/mirror/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/mountver/Makefile.depend
+++ b/sbin/geom/class/mountver/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/multipath/Makefile.depend
+++ b/sbin/geom/class/multipath/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/nop/Makefile.depend
+++ b/sbin/geom/class/nop/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 a6d50feedd98..ef3b57ef9b99 100644
--- a/sbin/geom/class/part/Makefile.depend
+++ b/sbin/geom/class/part/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6ba212c71e01..4fa82023ea16 100644
--- a/sbin/geom/class/raid/Makefile.depend
+++ b/sbin/geom/class/raid/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6ba212c71e01..4fa82023ea16 100644
--- a/sbin/geom/class/raid3/Makefile.depend
+++ b/sbin/geom/class/raid3/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/sched/Makefile.depend
+++ b/sbin/geom/class/sched/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/shsec/Makefile.depend
+++ b/sbin/geom/class/shsec/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/stripe/Makefile.depend
+++ b/sbin/geom/class/stripe/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 bc686f5b7642..b1d6d2cfbef4 100644
--- a/sbin/geom/class/virstor/Makefile.depend
+++ b/sbin/geom/class/virstor/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 f9880dbe6075..e20388c0bb72 100644
--- a/sbin/geom/core/Makefile.depend
+++ b/sbin/geom/core/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 ae9479365944..c2834f3d54b9 100644
--- a/sbin/ggate/ggatec/Makefile.depend
+++ b/sbin/ggate/ggatec/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 85448cf03bff..375f95b6da8c 100644
--- a/sbin/ggate/ggated/Makefile.depend
+++ b/sbin/ggate/ggated/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 2ad23bc89f48..4aa987016f02 100644
--- a/sbin/ggate/ggatel/Makefile.depend
+++ b/sbin/ggate/ggatel/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/sbin/growfs/Makefile.depend
+++ b/sbin/growfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/gvinum/Makefile.depend b/sbin/gvinum/Makefile.depend
index ab889550d0b6..e67cb4a72ca3 100644
--- a/sbin/gvinum/Makefile.depend
+++ b/sbin/gvinum/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdevstat \
lib/libedit \
diff --git a/sbin/hastctl/Makefile.depend b/sbin/hastctl/Makefile.depend
index f12a2e4065a7..55bb66cd4f36 100644
--- a/sbin/hastctl/Makefile.depend
+++ b/sbin/hastctl/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/sbin/hastd/Makefile.depend b/sbin/hastd/Makefile.depend
index 70e64c824f82..8fc25faadb51 100644
--- a/sbin/hastd/Makefile.depend
+++ b/sbin/hastd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/sbin/ifconfig/Makefile.depend b/sbin/ifconfig/Makefile.depend
index 63a1548cafe5..300eacf77ac5 100644
--- a/sbin/ifconfig/Makefile.depend
+++ b/sbin/ifconfig/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libjail \
diff --git a/sbin/ipf/ipf/Makefile.depend b/sbin/ipf/ipf/Makefile.depend
index 2532b4df7c6b..f781eb1d1370 100644
--- a/sbin/ipf/ipf/Makefile.depend
+++ b/sbin/ipf/ipf/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 ae05e22e3b02..c09695388eae 100644
--- a/sbin/ipf/ipfs/Makefile.depend
+++ b/sbin/ipf/ipfs/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 4023f007f83d..e2073f8e3ad0 100644
--- a/sbin/ipf/ipfstat/Makefile.depend
+++ b/sbin/ipf/ipfstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 2acc1cb14510..0ba17cd30337 100644
--- a/sbin/ipf/ipftest/Makefile.depend
+++ b/sbin/ipf/ipftest/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 38d4caa8bbdb..7f71b7a2971f 100644
--- a/sbin/ipf/ipmon/Makefile.depend
+++ b/sbin/ipf/ipmon/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 221f0bceb10a..6ba8eba5c3c4 100644
--- a/sbin/ipf/ipnat/Makefile.depend
+++ b/sbin/ipf/ipnat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 e039ce09709e..05af37b93c5e 100644
--- a/sbin/ipf/ippool/Makefile.depend
+++ b/sbin/ipf/ippool/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 eed6565d0e1f..7499c73c3480 100644
--- a/sbin/ipf/ipresend/Makefile.depend
+++ b/sbin/ipf/ipresend/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 59ad864f74e5..a4fcbf0bce75 100644
--- a/sbin/ipfw/Makefile.depend
+++ b/sbin/ipfw/Makefile.depend
@@ -11,7 +11,6 @@ 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 f58230065ebe..bf26a6c27532 100644
--- a/sbin/iscontrol/Makefile.depend
+++ b/sbin/iscontrol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/kldconfig/Makefile.depend
+++ b/sbin/kldconfig/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/kldload/Makefile.depend
+++ b/sbin/kldload/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e9a1dda6ca51..2d9ec507cd13 100644
--- a/sbin/kldstat/Makefile.depend
+++ b/sbin/kldstat/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 e9a1dda6ca51..2d9ec507cd13 100644
--- a/sbin/kldunload/Makefile.depend
+++ b/sbin/kldunload/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/ldconfig/Makefile.depend
+++ b/sbin/ldconfig/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 f3adefe05801..50e2e74bea35 100644
--- a/sbin/md5/Makefile.depend
+++ b/sbin/md5/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 0b555dc8a5ea..d6b21c79a951 100644
--- a/sbin/mdconfig/Makefile.depend
+++ b/sbin/mdconfig/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/mdmfs/Makefile.depend
+++ b/sbin/mdmfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/mknod/Makefile.depend
+++ b/sbin/mknod/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/mksnap_ffs/Makefile.depend
+++ b/sbin/mksnap_ffs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/sbin/mount/Makefile.depend
+++ b/sbin/mount/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/mount_cd9660/Makefile.depend b/sbin/mount_cd9660/Makefile.depend
index b1a67cd37ad9..69a5342e7030 100644
--- a/sbin/mount_cd9660/Makefile.depend
+++ b/sbin/mount_cd9660/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/mount_fusefs/Makefile.depend
+++ b/sbin/mount_fusefs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 22fad8deab8a..6f58bd155962 100644
--- a/sbin/mount_msdosfs/Makefile.depend
+++ b/sbin/mount_msdosfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 1c61866765c9..2a44c25ffe8e 100644
--- a/sbin/mount_nfs/Makefile.depend
+++ b/sbin/mount_nfs/Makefile.depend
@@ -12,7 +12,6 @@ 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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/mount_nullfs/Makefile.depend
+++ b/sbin/mount_nullfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 b7e649d8d7d6..24c6b245d3af 100644
--- a/sbin/mount_udf/Makefile.depend
+++ b/sbin/mount_udf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/mount_unionfs/Makefile.depend
+++ b/sbin/mount_unionfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 a15829ca96b8..0aa70dbca58f 100644
--- a/sbin/natd/Makefile.depend
+++ b/sbin/natd/Makefile.depend
@@ -11,7 +11,6 @@ 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 d6d2939dca6d..f94cc5edbe53 100644
--- a/sbin/newfs/Makefile.depend
+++ b/sbin/newfs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/newfs_msdos/Makefile.depend
+++ b/sbin/newfs_msdos/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 e9a1dda6ca51..2d9ec507cd13 100644
--- a/sbin/nfsiod/Makefile.depend
+++ b/sbin/nfsiod/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 5269280d143c..b68b4bb5daf9 100644
--- a/sbin/nos-tun/Makefile.depend
+++ b/sbin/nos-tun/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/nvmecontrol/Makefile.depend
+++ b/sbin/nvmecontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 c4ddd860abce..3114c66c6910 100644
--- a/sbin/pfctl/Makefile.depend
+++ b/sbin/pfctl/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 b42437a19d44..fb2e1ea9ff35 100644
--- a/sbin/pflogd/Makefile.depend
+++ b/sbin/pflogd/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 dbc78f8a0384..aa5c26eba086 100644
--- a/sbin/ping/Makefile.depend
+++ b/sbin/ping/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcapsicum \
lib/libcompiler_rt \
lib/libipsec \
diff --git a/sbin/ping6/Makefile.depend b/sbin/ping6/Makefile.depend
index 57b18a823075..c657f0f52556 100644
--- a/sbin/ping6/Makefile.depend
+++ b/sbin/ping6/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/sbin/quotacheck/Makefile.depend
+++ b/sbin/quotacheck/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/rcorder/Makefile.depend b/sbin/rcorder/Makefile.depend
index c642cb1106ce..ed049c94b327 100644
--- a/sbin/rcorder/Makefile.depend
+++ b/sbin/rcorder/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/reboot/Makefile.depend b/sbin/reboot/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/reboot/Makefile.depend
+++ b/sbin/reboot/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/recoverdisk/Makefile.depend
+++ b/sbin/recoverdisk/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 b3c03a71825a..4a9f7867ec6d 100644
--- a/sbin/restore/Makefile.depend
+++ b/sbin/restore/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 b8fd55457479..32760141ab1a 100644
--- a/sbin/route/Makefile.depend
+++ b/sbin/route/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 28d49cc89966..beb04be9c6be 100644
--- a/sbin/routed/rtquery/Makefile.depend
+++ b/sbin/routed/rtquery/Makefile.depend
@@ -11,7 +11,6 @@ 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 5269280d143c..b68b4bb5daf9 100644
--- a/sbin/rtsol/Makefile.depend
+++ b/sbin/rtsol/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 8d258dfd965e..4f4a210e3f59 100644
--- a/sbin/savecore/Makefile.depend
+++ b/sbin/savecore/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
diff --git a/sbin/setkey/Makefile.depend b/sbin/setkey/Makefile.depend
index 736ae9228802..2c5eceab3944 100644
--- a/sbin/setkey/Makefile.depend
+++ b/sbin/setkey/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/shutdown/Makefile.depend
+++ b/sbin/shutdown/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/spppcontrol/Makefile.depend
+++ b/sbin/spppcontrol/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 40b445f04779..78b235bef5b2 100644
--- a/sbin/swapon/Makefile.depend
+++ b/sbin/swapon/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
diff --git a/sbin/sysctl/Makefile.depend b/sbin/sysctl/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/sbin/sysctl/Makefile.depend
+++ b/sbin/sysctl/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 7fb8fce4559a..66da85cb1de1 100644
--- a/sbin/tunefs/Makefile.depend
+++ b/sbin/tunefs/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
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 5930524f9ce7..c1655db8b437 100644
--- a/sbin/umount/Makefile.depend
+++ b/sbin/umount/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/secure/lib/libcrypto/Makefile.depend b/secure/lib/libcrypto/Makefile.depend
index c29f848fe460..7ef0e6328eb6 100644
--- a/secure/lib/libcrypto/Makefile.depend
+++ b/secure/lib/libcrypto/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 = \
lib/libc \
lib/libcompiler_rt \
lib/msun \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend b/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend
+++ b/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libaep/Makefile.depend b/secure/lib/libcrypto/engines/libaep/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libaep/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libaep/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libatalla/Makefile.depend b/secure/lib/libcrypto/engines/libatalla/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libatalla/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libatalla/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libchil/Makefile.depend b/secure/lib/libcrypto/engines/libchil/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libchil/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libchil/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libcswift/Makefile.depend b/secure/lib/libcrypto/engines/libcswift/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libcswift/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libcswift/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libgost/Makefile.depend b/secure/lib/libcrypto/engines/libgost/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libgost/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libgost/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libnuron/Makefile.depend b/secure/lib/libcrypto/engines/libnuron/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libnuron/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libnuron/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libsureware/Makefile.depend b/secure/lib/libcrypto/engines/libsureware/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libsureware/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libsureware/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libcrypto/engines/libubsec/Makefile.depend b/secure/lib/libcrypto/engines/libubsec/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/lib/libcrypto/engines/libubsec/Makefile.depend
+++ b/secure/lib/libcrypto/engines/libubsec/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend
index 7d3729c1febd..474e282fceaf 100644
--- a/secure/lib/libssh/Makefile.depend
+++ b/secure/lib/libssh/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -24,6 +25,7 @@ DIRDEPS = \
lib/libz \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/secure/lib/libssl/Makefile.depend b/secure/lib/libssl/Makefile.depend
index 2c3cff5e1329..6047b890a604 100644
--- a/secure/lib/libssl/Makefile.depend
+++ b/secure/lib/libssl/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 = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/secure/libexec/sftp-server/Makefile.depend b/secure/libexec/sftp-server/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/libexec/sftp-server/Makefile.depend
+++ b/secure/libexec/sftp-server/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/libexec/ssh-keysign/Makefile.depend b/secure/libexec/ssh-keysign/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/libexec/ssh-keysign/Makefile.depend
+++ b/secure/libexec/ssh-keysign/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile.depend b/secure/libexec/ssh-pkcs11-helper/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile.depend
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/bdes/Makefile.depend b/secure/usr.bin/bdes/Makefile.depend
index 761a02420758..ebcc77915608 100644
--- a/secure/usr.bin/bdes/Makefile.depend
+++ b/secure/usr.bin/bdes/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/secure/usr.bin/openssl/Makefile.depend b/secure/usr.bin/openssl/Makefile.depend
index 88ac4865f8fc..cdca1d280c31 100644
--- a/secure/usr.bin/openssl/Makefile.depend
+++ b/secure/usr.bin/openssl/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/scp/Makefile.depend b/secure/usr.bin/scp/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/usr.bin/scp/Makefile.depend
+++ b/secure/usr.bin/scp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/sftp/Makefile.depend b/secure/usr.bin/sftp/Makefile.depend
index 1f554f057163..2a5eb5d4204e 100644
--- a/secure/usr.bin/sftp/Makefile.depend
+++ b/secure/usr.bin/sftp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/ssh-add/Makefile.depend b/secure/usr.bin/ssh-add/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/usr.bin/ssh-add/Makefile.depend
+++ b/secure/usr.bin/ssh-add/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/ssh-agent/Makefile.depend b/secure/usr.bin/ssh-agent/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/usr.bin/ssh-agent/Makefile.depend
+++ b/secure/usr.bin/ssh-agent/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/ssh-keygen/Makefile.depend b/secure/usr.bin/ssh-keygen/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/usr.bin/ssh-keygen/Makefile.depend
+++ b/secure/usr.bin/ssh-keygen/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/ssh-keyscan/Makefile.depend b/secure/usr.bin/ssh-keyscan/Makefile.depend
index 9ec443c113b4..277d93412b94 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile.depend
+++ b/secure/usr.bin/ssh-keyscan/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/secure/usr.bin/ssh/Makefile.depend b/secure/usr.bin/ssh/Makefile.depend
index 7ea112bc7394..c8445146b345 100644
--- a/secure/usr.bin/ssh/Makefile.depend
+++ b/secure/usr.bin/ssh/Makefile.depend
@@ -3,10 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/gssapi \
+ include/rpc \
include/xlocale \
kerberos5/lib/libasn1 \
kerberos5/lib/libheimbase \
diff --git a/secure/usr.sbin/sshd/Makefile.depend b/secure/usr.sbin/sshd/Makefile.depend
index 140ceeccbfbb..f6a63fe8e9d5 100644
--- a/secure/usr.sbin/sshd/Makefile.depend
+++ b/secure/usr.sbin/sshd/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
diff --git a/share/syscons/scrnmaps/Makefile.depend b/share/syscons/scrnmaps/Makefile.depend
index e9a1dda6ca51..2d9ec507cd13 100644
--- a/share/syscons/scrnmaps/Makefile.depend
+++ b/share/syscons/scrnmaps/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
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 a1157119ad51..dc9c62a00fa1 100644
--- a/usr.bin/apply/Makefile.depend
+++ b/usr.bin/apply/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
diff --git a/usr.bin/ar/Makefile.depend b/usr.bin/ar/Makefile.depend
index fb5f3e35a21b..c8ce9caa1d3c 100644
--- a/usr.bin/ar/Makefile.depend
+++ b/usr.bin/ar/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/usr.bin/asa/Makefile.depend b/usr.bin/asa/Makefile.depend
index e9a1dda6ca51..2d9ec507cd13 100644
--- a/usr.bin/asa/Makefile.depend
+++ b/usr.bin/asa/Makefile.depend
@@ -8,7 +8,6 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/at/Makefile.depend b/usr.bin/at/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/at/Makefile.depend
+++ b/usr.bin/at/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/atf/atf-sh/Makefile.depend b/usr.bin/atf/atf-sh/Makefile.depend
index aa1a20886895..72e04cf1a78d 100644
--- a/usr.bin/atf/atf-sh/Makefile.depend
+++ b/usr.bin/atf/atf-sh/Makefile.depend
@@ -3,16 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/atf/libatf-c \
lib/atf/libatf-c++ \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
+ lib/libcxxrt \
lib/msun \
diff --git a/usr.bin/atm/sscop/Makefile.depend b/usr.bin/atm/sscop/Makefile.depend
index 1d7d03c9ac9c..08035b199dc3 100644
--- a/usr.bin/atm/sscop/Makefile.depend
+++ b/usr.bin/atm/sscop/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbegemot \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnetgraph \
lib/libngatm \
diff --git a/usr.bin/awk/Makefile.depend b/usr.bin/awk/Makefile.depend
index 5b1f96fd4a82..bcdaffeb83e8 100644
--- a/usr.bin/awk/Makefile.depend
+++ b/usr.bin/awk/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/banner/Makefile.depend b/usr.bin/banner/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/banner/Makefile.depend
+++ b/usr.bin/banner/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/basename/Makefile.depend b/usr.bin/basename/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/basename/Makefile.depend
+++ b/usr.bin/basename/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bc/Makefile.depend b/usr.bin/bc/Makefile.depend
index 3cc8704c86d6..e13898c4c621 100644
--- a/usr.bin/bc/Makefile.depend
+++ b/usr.bin/bc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libedit \
lib/ncurses/ncurses \
diff --git a/usr.bin/biff/Makefile.depend b/usr.bin/biff/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/biff/Makefile.depend
+++ b/usr.bin/biff/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bluetooth/bthost/Makefile.depend b/usr.bin/bluetooth/bthost/Makefile.depend
index 334348050096..9e752f475e12 100644
--- a/usr.bin/bluetooth/bthost/Makefile.depend
+++ b/usr.bin/bluetooth/bthost/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bluetooth/btsockstat/Makefile.depend b/usr.bin/bluetooth/btsockstat/Makefile.depend
index c8112080776a..7272828c7373 100644
--- a/usr.bin/bluetooth/btsockstat/Makefile.depend
+++ b/usr.bin/bluetooth/btsockstat/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
diff --git a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
index 8402227f3aa8..70283d4fe738 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
+++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsdp \
diff --git a/usr.bin/brandelf/Makefile.depend b/usr.bin/brandelf/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/brandelf/Makefile.depend
+++ b/usr.bin/brandelf/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bsdiff/bsdiff/Makefile.depend b/usr.bin/bsdiff/bsdiff/Makefile.depend
index e13f9731efe8..95b1d2b4c706 100644
--- a/usr.bin/bsdiff/bsdiff/Makefile.depend
+++ b/usr.bin/bsdiff/bsdiff/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bsdiff/bspatch/Makefile.depend b/usr.bin/bsdiff/bspatch/Makefile.depend
index e13f9731efe8..95b1d2b4c706 100644
--- a/usr.bin/bsdiff/bspatch/Makefile.depend
+++ b/usr.bin/bsdiff/bspatch/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/bzip2/Makefile.depend b/usr.bin/bzip2/Makefile.depend
index 7616a5eeee2c..3b800419adc2 100644
--- a/usr.bin/bzip2/Makefile.depend
+++ b/usr.bin/bzip2/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbz2 \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/bzip2recover/Makefile.depend b/usr.bin/bzip2recover/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/bzip2recover/Makefile.depend
+++ b/usr.bin/bzip2recover/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/c89/Makefile.depend b/usr.bin/c89/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/c89/Makefile.depend
+++ b/usr.bin/c89/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/c99/Makefile.depend b/usr.bin/c99/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/c99/Makefile.depend
+++ b/usr.bin/c99/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/calendar/Makefile.depend b/usr.bin/calendar/Makefile.depend
index 26b0cb7f5dde..da4f56b373df 100644
--- a/usr.bin/calendar/Makefile.depend
+++ b/usr.bin/calendar/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/msun \
diff --git a/usr.bin/cap_mkdb/Makefile.depend b/usr.bin/cap_mkdb/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/cap_mkdb/Makefile.depend
+++ b/usr.bin/cap_mkdb/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/catman/Makefile.depend b/usr.bin/catman/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/catman/Makefile.depend
+++ b/usr.bin/catman/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/chat/Makefile.depend b/usr.bin/chat/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/chat/Makefile.depend
+++ b/usr.bin/chat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/checknr/Makefile.depend b/usr.bin/checknr/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/checknr/Makefile.depend
+++ b/usr.bin/checknr/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/chkey/Makefile.depend b/usr.bin/chkey/Makefile.depend
index c04a0a5edede..93ea89a54add 100644
--- a/usr.bin/chkey/Makefile.depend
+++ b/usr.bin/chkey/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/rpc \
diff --git a/usr.bin/chpass/Makefile.depend b/usr.bin/chpass/Makefile.depend
index eff6559d030b..e31b02bc51f2 100644
--- a/usr.bin/chpass/Makefile.depend
+++ b/usr.bin/chpass/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libutil \
diff --git a/usr.bin/cksum/Makefile.depend b/usr.bin/cksum/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/cksum/Makefile.depend
+++ b/usr.bin/cksum/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend
index 1a3fce45f4e3..70ecfefb3674 100644
--- a/usr.bin/clang/clang-tblgen/Makefile.depend
+++ b/usr.bin/clang/clang-tblgen/Makefile.depend
@@ -3,17 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/clang/libllvmsupport \
lib/clang/libllvmtablegen \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/msun \
+ lib/ncurses/ncurses \
.include <dirdeps.mk>
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index 947a3e94601d..f7414039dde3 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -3,8 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
@@ -81,9 +80,12 @@ DIRDEPS = \
lib/clang/libllvmx86instprinter \
lib/clang/libllvmx86utils \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/msun \
+ lib/ncurses/ncurses \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/tblgen/Makefile.depend
index 1a3fce45f4e3..70ecfefb3674 100644
--- a/usr.bin/clang/tblgen/Makefile.depend
+++ b/usr.bin/clang/tblgen/Makefile.depend
@@ -3,17 +3,17 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/clang/libllvmsupport \
lib/clang/libllvmtablegen \
lib/libc \
+ lib/libc++ \
lib/libcompiler_rt \
lib/msun \
+ lib/ncurses/ncurses \
.include <dirdeps.mk>
diff --git a/usr.bin/cmp/Makefile.depend b/usr.bin/cmp/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/cmp/Makefile.depend
+++ b/usr.bin/cmp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/col/Makefile.depend b/usr.bin/col/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/col/Makefile.depend
+++ b/usr.bin/col/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/colcrt/Makefile.depend b/usr.bin/colcrt/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/colcrt/Makefile.depend
+++ b/usr.bin/colcrt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/colldef/Makefile.depend b/usr.bin/colldef/Makefile.depend
index 8249cb41cd02..032dbbf85786 100644
--- a/usr.bin/colldef/Makefile.depend
+++ b/usr.bin/colldef/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
usr.bin/lex/lib \
diff --git a/usr.bin/colrm/Makefile.depend b/usr.bin/colrm/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/colrm/Makefile.depend
+++ b/usr.bin/colrm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/column/Makefile.depend b/usr.bin/column/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/column/Makefile.depend
+++ b/usr.bin/column/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/comm/Makefile.depend b/usr.bin/comm/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/comm/Makefile.depend
+++ b/usr.bin/comm/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/compile_et/Makefile.depend b/usr.bin/compile_et/Makefile.depend
index b442c85b1bfa..f90d17cbfba8 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
kerberos5/lib/libvers \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
diff --git a/usr.bin/compress/Makefile.depend b/usr.bin/compress/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/compress/Makefile.depend
+++ b/usr.bin/compress/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/cpio/Makefile.depend b/usr.bin/cpio/Makefile.depend
index 91c0c581ff74..7f1d5315141e 100644
--- a/usr.bin/cpio/Makefile.depend
+++ b/usr.bin/cpio/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
diff --git a/usr.bin/cpuset/Makefile.depend b/usr.bin/cpuset/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/cpuset/Makefile.depend
+++ b/usr.bin/cpuset/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/csplit/Makefile.depend b/usr.bin/csplit/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/csplit/Makefile.depend
+++ b/usr.bin/csplit/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/csup/Makefile.depend b/usr.bin/csup/Makefile.depend
index 4ee17dedb94b..061f7d070a83 100644
--- a/usr.bin/csup/Makefile.depend
+++ b/usr.bin/csup/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
lib/libthr \
diff --git a/usr.bin/ctags/Makefile.depend b/usr.bin/ctags/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/ctags/Makefile.depend
+++ b/usr.bin/ctags/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/ctlstat/Makefile.depend b/usr.bin/ctlstat/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/ctlstat/Makefile.depend
+++ b/usr.bin/ctlstat/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/usr.bin/cut/Makefile.depend b/usr.bin/cut/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/usr.bin/cut/Makefile.depend
+++ b/usr.bin/cut/Makefile.depend
@@ -9,7