Index: bin/ls/Makefile.depend =================================================================== --- bin/ls/Makefile.depend +++ bin/ls/Makefile.depend @@ -2,14 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/libutil \ - lib/ncurses/ncursesw \ .include Index: cddl/lib/libavl/Makefile.depend =================================================================== --- cddl/lib/libavl/Makefile.depend +++ cddl/lib/libavl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ lib/${CSU_DIR} \ lib/libc \ Index: cddl/lib/libctf/Makefile.depend =================================================================== --- cddl/lib/libctf/Makefile.depend +++ cddl/lib/libctf/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: cddl/lib/libnvpair/Makefile.depend =================================================================== --- cddl/lib/libnvpair/Makefile.depend +++ cddl/lib/libnvpair/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: cddl/lib/libumem/Makefile.depend =================================================================== --- cddl/lib/libumem/Makefile.depend +++ cddl/lib/libumem/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ lib/${CSU_DIR} \ lib/libc \ Index: cddl/lib/libuutil/Makefile.depend =================================================================== --- cddl/lib/libuutil/Makefile.depend +++ cddl/lib/libuutil/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: cddl/lib/libzfs/Makefile.depend =================================================================== --- cddl/lib/libzfs/Makefile.depend +++ cddl/lib/libzfs/Makefile.depend @@ -7,7 +7,6 @@ cddl/lib/libumem \ cddl/lib/libuutil \ cddl/lib/libzfs_core \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: cddl/lib/libzfs_core/Makefile.depend =================================================================== --- cddl/lib/libzfs_core/Makefile.depend +++ cddl/lib/libzfs_core/Makefile.depend @@ -3,7 +3,6 @@ DIRDEPS = \ cddl/lib/libnvpair \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: gnu/lib/libdialog/Makefile.depend =================================================================== --- gnu/lib/libdialog/Makefile.depend +++ gnu/lib/libdialog/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: gnu/lib/libgomp/Makefile.depend =================================================================== --- gnu/lib/libgomp/Makefile.depend +++ gnu/lib/libgomp/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: gnu/lib/libregex/Makefile.depend =================================================================== --- gnu/lib/libregex/Makefile.depend +++ gnu/lib/libregex/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: gnu/lib/libssp/Makefile.depend =================================================================== --- gnu/lib/libssp/Makefile.depend +++ gnu/lib/libssp/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: gnu/lib/libstdc++/Makefile.depend =================================================================== --- gnu/lib/libstdc++/Makefile.depend +++ gnu/lib/libstdc++/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: gnu/lib/libsupc++/Makefile.depend =================================================================== --- gnu/lib/libsupc++/Makefile.depend +++ gnu/lib/libsupc++/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ gnu/lib/libstdc++ \ include \ include/xlocale \ Index: kerberos5/lib/libasn1/Makefile.depend =================================================================== --- kerberos5/lib/libasn1/Makefile.depend +++ kerberos5/lib/libasn1/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libgssapi_krb5/Makefile.depend =================================================================== --- kerberos5/lib/libgssapi_krb5/Makefile.depend +++ kerberos5/lib/libgssapi_krb5/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libhdb/Makefile.depend =================================================================== --- kerberos5/lib/libhdb/Makefile.depend +++ kerberos5/lib/libhdb/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libheimbase/Makefile.depend =================================================================== --- kerberos5/lib/libheimbase/Makefile.depend +++ kerberos5/lib/libheimbase/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: kerberos5/lib/libheimipcc/Makefile.depend =================================================================== --- kerberos5/lib/libheimipcc/Makefile.depend +++ kerberos5/lib/libheimipcc/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libheimntlm/Makefile.depend =================================================================== --- kerberos5/lib/libheimntlm/Makefile.depend +++ kerberos5/lib/libheimntlm/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libhx509/Makefile.depend =================================================================== --- kerberos5/lib/libhx509/Makefile.depend +++ kerberos5/lib/libhx509/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libkadm5clnt/Makefile.depend =================================================================== --- kerberos5/lib/libkadm5clnt/Makefile.depend +++ kerberos5/lib/libkadm5clnt/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libkafs5/Makefile.depend =================================================================== --- kerberos5/lib/libkafs5/Makefile.depend +++ kerberos5/lib/libkafs5/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libkdc/Makefile.depend =================================================================== --- kerberos5/lib/libkdc/Makefile.depend +++ kerberos5/lib/libkdc/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -16,7 +15,6 @@ kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ - lib/libcom_err \ lib/libcompiler_rt \ lib/libutil \ secure/lib/libcrypto \ Index: kerberos5/lib/libkrb5/Makefile.depend =================================================================== --- kerberos5/lib/libkrb5/Makefile.depend +++ kerberos5/lib/libkrb5/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libroken/Makefile.depend =================================================================== --- kerberos5/lib/libroken/Makefile.depend +++ kerberos5/lib/libroken/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: kerberos5/lib/libwind/Makefile.depend =================================================================== --- kerberos5/lib/libwind/Makefile.depend +++ kerberos5/lib/libwind/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/atf/libatf-c/Makefile.depend =================================================================== --- lib/atf/libatf-c/Makefile.depend +++ lib/atf/libatf-c/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/lib80211/Makefile.depend =================================================================== --- lib/lib80211/Makefile.depend +++ lib/lib80211/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libalias/libalias/Makefile.depend =================================================================== --- lib/libalias/libalias/Makefile.depend +++ lib/libalias/libalias/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libarchive/Makefile.depend =================================================================== --- lib/libarchive/Makefile.depend +++ lib/libarchive/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -12,7 +11,7 @@ lib/libexpat \ lib/liblzma \ lib/libz \ - secure/lib/libcrypto \ + lib/libzstd \ .include Index: lib/libbe/Makefile.depend =================================================================== --- /dev/null +++ lib/libbe/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libnvpair \ + cddl/lib/libzfs \ + cddl/lib/libzfs_core \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libbegemot/Makefile.depend =================================================================== --- lib/libbegemot/Makefile.depend +++ lib/libbegemot/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libblacklist/Makefile.depend =================================================================== --- lib/libblacklist/Makefile.depend +++ lib/libblacklist/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libblocksruntime/Makefile.depend =================================================================== --- lib/libblocksruntime/Makefile.depend +++ lib/libblocksruntime/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libbluetooth/Makefile.depend =================================================================== --- lib/libbluetooth/Makefile.depend +++ lib/libbluetooth/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libbsdstat/Makefile.depend =================================================================== --- lib/libbsdstat/Makefile.depend +++ lib/libbsdstat/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libbsm/Makefile.depend =================================================================== --- lib/libbsm/Makefile.depend +++ lib/libbsm/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libbsnmp/libbsnmp/Makefile =================================================================== --- lib/libbsnmp/libbsnmp/Makefile +++ lib/libbsnmp/libbsnmp/Makefile @@ -24,12 +24,17 @@ INCS= asn1.h snmp.h snmpagent.h snmpclient.h MAN= asn1.3 bsnmpagent.3 bsnmpclient.3 bsnmplib.3 +.if ${MK_DIRDEPS_BUILD} == "yes" +GENSNMPTREE?= ${HOST_OBJTOP}/usr.sbin/bsnmpd/gensnmptree/gensnmptree +.endif +GENSNMPTREE?= gensnmptree + snmptc.h : tc.def (\ echo "/* autogenerated from tc.def */";\ echo "#ifndef snmptc_h_1529923773";\ echo "#define snmptc_h_1529923773";\ - gensnmptree -E -f <${.ALLSRC};\ + ${GENSNMPTREE} -E -f <${.ALLSRC};\ echo "#endif" ; \ ) >${.TARGET} Index: lib/libbsnmp/libbsnmp/Makefile.depend =================================================================== --- lib/libbsnmp/libbsnmp/Makefile.depend +++ lib/libbsnmp/libbsnmp/Makefile.depend @@ -2,14 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - secure/lib/libcrypto \ + usr.sbin/bsnmpd/gensnmptree.host \ .include Index: lib/libbz2/Makefile.depend =================================================================== --- lib/libbz2/Makefile.depend +++ lib/libbz2/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libc++/Makefile.depend =================================================================== --- lib/libc++/Makefile.depend +++ lib/libc++/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libc/Makefile.depend =================================================================== --- lib/libc/Makefile.depend +++ lib/libc/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/rpc \ include/rpcsvc \ Index: lib/libc/tests/tls_dso/Makefile.depend =================================================================== --- lib/libc/tests/tls_dso/Makefile.depend +++ lib/libc/tests/tls_dso/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ lib/${CSU_DIR} \ lib/libc \ Index: lib/libcalendar/Makefile.depend =================================================================== --- lib/libcalendar/Makefile.depend +++ lib/libcalendar/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ lib/${CSU_DIR} \ lib/libc \ Index: lib/libcam/Makefile.depend =================================================================== --- lib/libcam/Makefile.depend +++ lib/libcam/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcasper/libcasper/Makefile.depend =================================================================== --- lib/libcasper/libcasper/Makefile.depend +++ lib/libcasper/libcasper/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcasper/services/cap_dns/Makefile.depend =================================================================== --- lib/libcasper/services/cap_dns/Makefile.depend +++ lib/libcasper/services/cap_dns/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcasper/services/cap_fileargs/Makefile.depend =================================================================== --- /dev/null +++ lib/libcasper/services/cap_fileargs/Makefile.depend @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libcasper/services/cap_grp/Makefile.depend =================================================================== --- lib/libcasper/services/cap_grp/Makefile.depend +++ lib/libcasper/services/cap_grp/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcasper/services/cap_pwd/Makefile.depend =================================================================== --- lib/libcasper/services/cap_pwd/Makefile.depend +++ lib/libcasper/services/cap_pwd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcasper/services/cap_sysctl/Makefile.depend =================================================================== --- lib/libcasper/services/cap_sysctl/Makefile.depend +++ lib/libcasper/services/cap_sysctl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcasper/services/cap_syslog/Makefile.depend =================================================================== --- /dev/null +++ lib/libcasper/services/cap_syslog/Makefile.depend @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcasper/libcasper \ + lib/libcompiler_rt \ + lib/libnv \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libcom_err/Makefile.depend =================================================================== --- lib/libcom_err/Makefile.depend +++ lib/libcom_err/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcrypt/Makefile.depend =================================================================== --- lib/libcrypt/Makefile.depend +++ lib/libcrypt/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libcuse/Makefile.depend =================================================================== --- lib/libcuse/Makefile.depend +++ lib/libcuse/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libcxxrt/Makefile.depend =================================================================== --- lib/libcxxrt/Makefile.depend +++ lib/libcxxrt/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libdevctl/Makefile.depend =================================================================== --- lib/libdevctl/Makefile.depend +++ lib/libdevctl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libdevdctl/Makefile.depend =================================================================== --- lib/libdevdctl/Makefile.depend +++ lib/libdevdctl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libdevinfo/Makefile.depend =================================================================== --- lib/libdevinfo/Makefile.depend +++ lib/libdevinfo/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libdevstat/Makefile.depend =================================================================== --- lib/libdevstat/Makefile.depend +++ lib/libdevstat/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libdpv/Makefile.depend =================================================================== --- lib/libdpv/Makefile.depend +++ lib/libdpv/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ gnu/lib/libdialog \ include \ include/xlocale \ Index: lib/libdwarf/Makefile.depend =================================================================== --- lib/libdwarf/Makefile.depend +++ lib/libdwarf/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libedit/Makefile.depend =================================================================== --- /dev/null +++ lib/libedit/Makefile.depend @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/ncurses/ncursesw \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libedit/readline/Makefile.depend =================================================================== --- /dev/null +++ lib/libedit/readline/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libefivar/Makefile.depend =================================================================== --- lib/libefivar/Makefile.depend +++ lib/libefivar/Makefile.depend @@ -2,12 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libgeom \ .include Index: lib/libelf/Makefile.depend =================================================================== --- lib/libelf/Makefile.depend +++ lib/libelf/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libevent/Makefile.depend =================================================================== --- lib/libevent/Makefile.depend +++ lib/libevent/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libexecinfo/Makefile.depend =================================================================== --- lib/libexecinfo/Makefile.depend +++ lib/libexecinfo/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libexpat/Makefile.depend =================================================================== --- lib/libexpat/Makefile.depend +++ lib/libexpat/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libfetch/Makefile.depend =================================================================== --- lib/libfetch/Makefile.depend +++ lib/libfetch/Makefile.depend @@ -2,14 +2,11 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - secure/lib/libcrypto \ - secure/lib/libssl \ .include Index: lib/libfigpar/Makefile.depend =================================================================== --- lib/libfigpar/Makefile.depend +++ lib/libfigpar/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libgcc_eh/Makefile =================================================================== --- lib/libgcc_eh/Makefile +++ lib/libgcc_eh/Makefile @@ -10,4 +10,10 @@ .include "Makefile.inc" +.if ${.MAKE.LEVEL} > 0 +# avoid circular dependencies +GENDIRDEPS_FILTER+= Nlib/msun +CFLAGS+= -I${SRCTOP}/lib/msun/src +.endif + .include Index: lib/libgcc_s/Makefile.depend =================================================================== --- lib/libgcc_s/Makefile.depend +++ lib/libgcc_s/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libgeom/Makefile.depend =================================================================== --- lib/libgeom/Makefile.depend +++ lib/libgeom/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libgpio/Makefile.depend =================================================================== --- lib/libgpio/Makefile.depend +++ lib/libgpio/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libgssapi/Makefile.depend =================================================================== --- lib/libgssapi/Makefile.depend +++ lib/libgssapi/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/gssapi \ include/xlocale \ Index: lib/libipsec/Makefile.depend =================================================================== --- lib/libipsec/Makefile.depend +++ lib/libipsec/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libjail/Makefile.depend =================================================================== --- lib/libjail/Makefile.depend +++ lib/libjail/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libkvm/Makefile.depend =================================================================== --- lib/libkvm/Makefile.depend +++ lib/libkvm/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libldns/Makefile.depend =================================================================== --- lib/libldns/Makefile.depend +++ lib/libldns/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/liblzma/Makefile.depend =================================================================== --- lib/liblzma/Makefile.depend +++ lib/liblzma/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libmagic/Makefile =================================================================== --- lib/libmagic/Makefile +++ lib/libmagic/Makefile @@ -40,6 +40,7 @@ magic.mgc: mkmagic magic ${BTOOLSPATH:U.}/mkmagic magic +.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" CLEANFILES+= mkmagic DEPENDOBJS+= mkmagic build-tools: mkmagic @@ -47,6 +48,11 @@ ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ ${.ALLSRC:N*.h:O:u} ${LDADD} +.endif +.if ${MK_DIRDEPS_BUILD} == "yes" +BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR} +.endif + FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h CLEANFILES+= ${MAN} Index: lib/libmagic/Makefile.depend =================================================================== --- lib/libmagic/Makefile.depend +++ lib/libmagic/Makefile.depend @@ -2,12 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libmagic.host \ lib/libz \ Index: lib/libmagic/Makefile.depend.inc =================================================================== --- /dev/null +++ lib/libmagic/Makefile.depend.inc @@ -0,0 +1,6 @@ +# $FreeBSD$ +# This file is not autogenerated - take care! + +.if ${DEP_MACHINE:U${MACHINE}} != "host" +DIRDEPS+= ${DEP_RELDIR:U${RELDIR}}.host +.endif Index: lib/libmd/Makefile.depend =================================================================== --- lib/libmd/Makefile.depend +++ lib/libmd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libmemstat/Makefile.depend =================================================================== --- lib/libmemstat/Makefile.depend +++ lib/libmemstat/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libmilter/Makefile.depend =================================================================== --- lib/libmilter/Makefile.depend +++ lib/libmilter/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libmp/Makefile.depend =================================================================== --- lib/libmp/Makefile.depend +++ lib/libmp/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libmt/Makefile.depend =================================================================== --- lib/libmt/Makefile.depend +++ lib/libmt/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libnetgraph/Makefile.depend =================================================================== --- lib/libnetgraph/Makefile.depend +++ lib/libnetgraph/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libngatm/Makefile.depend =================================================================== --- lib/libngatm/Makefile.depend +++ lib/libngatm/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libnv/Makefile.depend =================================================================== --- lib/libnv/Makefile.depend +++ lib/libnv/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libomp/Makefile.depend =================================================================== --- /dev/null +++ lib/libomp/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libc++ \ + lib/libcompiler_rt \ + lib/libthr \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libopencsd/Makefile.depend =================================================================== --- /dev/null +++ lib/libopencsd/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libc++ \ + lib/libcompiler_rt \ + lib/libcxxrt \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libopie/Makefile.depend =================================================================== --- lib/libopie/Makefile.depend +++ lib/libopie/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libpam/libpam/Makefile.depend =================================================================== --- lib/libpam/libpam/Makefile.depend +++ lib/libpam/libpam/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libpam/modules/pam_unix/Makefile.depend =================================================================== --- lib/libpam/modules/pam_unix/Makefile.depend +++ lib/libpam/modules/pam_unix/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -12,7 +11,6 @@ lib/libcrypt \ lib/libpam/libpam \ lib/libutil \ - lib/libypclnt \ .include Index: lib/libpcap/Makefile.depend =================================================================== --- lib/libpcap/Makefile.depend +++ lib/libpcap/Makefile.depend @@ -2,13 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/ofed/include \ usr.bin/yacc.host \ Index: lib/libpmc/Makefile =================================================================== --- lib/libpmc/Makefile +++ lib/libpmc/Makefile @@ -17,12 +17,20 @@ EVENT_ARCH="powerpc" .endif +.if ${MK_DIRDEPS_BUILD} == "yes" +# avoid circular dependency +CFLAGS+= -I${RELDIR:H}/libpmcstat +GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat +JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents +.else JEVENTS= ${BTOOLSPATH:U.}/pmu-events/jevents + # This file is built in a subdirectory so never try to rebuild it here. ${JEVENTS}: .PHONY .if make(*clean*) SUBDIR+= pmu-events .endif +.endif libpmc_events.c: ${JEVENTS} ${JEVENTS} ${EVENT_ARCH} ${.CURDIR}/pmu-events/arch libpmc_events.c Index: lib/libpmc/Makefile.depend =================================================================== --- lib/libpmc/Makefile.depend +++ lib/libpmc/Makefile.depend @@ -2,12 +2,15 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libc++ \ lib/libcompiler_rt \ + lib/libelf \ + lib/libpmc/pmu-events.host \ + lib/msun \ .include Index: lib/libproc/Makefile.depend =================================================================== --- lib/libproc/Makefile.depend +++ lib/libproc/Makefile.depend @@ -2,14 +2,11 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - cddl/lib/libctf \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libcxxrt \ lib/libelf \ lib/libprocstat \ lib/librtld_db \ Index: lib/libprocstat/Makefile.depend =================================================================== --- lib/libprocstat/Makefile.depend +++ lib/libprocstat/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libradius/Makefile.depend =================================================================== --- lib/libradius/Makefile.depend +++ lib/libradius/Makefile.depend @@ -2,14 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - secure/lib/libcrypto \ .include Index: lib/librpcsvc/Makefile.depend =================================================================== --- lib/librpcsvc/Makefile.depend +++ lib/librpcsvc/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/rpc \ include/rpcsvc \ Index: lib/librss/Makefile.depend =================================================================== --- lib/librss/Makefile.depend +++ lib/librss/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/librtld_db/Makefile.depend =================================================================== --- lib/librtld_db/Makefile.depend +++ lib/librtld_db/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libsbuf/Makefile.depend =================================================================== --- lib/libsbuf/Makefile.depend +++ lib/libsbuf/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libsdp/Makefile.depend =================================================================== --- lib/libsdp/Makefile.depend +++ lib/libsdp/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libsecureboot/Makefile.depend =================================================================== --- lib/libsecureboot/Makefile.depend +++ lib/libsecureboot/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libsecureboot/Makefile.depend.amd64 =================================================================== --- /dev/null +++ lib/libsecureboot/Makefile.depend.amd64 @@ -0,0 +1,16 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libsqlite3/Makefile.depend =================================================================== --- lib/libsqlite3/Makefile.depend +++ lib/libsqlite3/Makefile.depend @@ -2,13 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/libthr \ + lib/msun \ .include Index: lib/libstdthreads/Makefile.depend =================================================================== --- lib/libstdthreads/Makefile.depend +++ lib/libstdthreads/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libsysdecode/Makefile.depend =================================================================== --- lib/libsysdecode/Makefile.depend +++ lib/libsysdecode/Makefile.depend @@ -2,7 +2,8 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ + cddl/lib/libnvpair \ + cddl/lib/libzfs_core \ gnu/lib/libdialog \ gnu/lib/libgomp \ gnu/lib/libregex \ @@ -48,10 +49,11 @@ lib/libcapsicum \ lib/libcasper/libcasper \ lib/libcasper/services/cap_dns \ + lib/libcasper/services/cap_fileargs \ lib/libcasper/services/cap_grp \ lib/libcasper/services/cap_pwd \ - lib/libcasper/services/cap_random \ lib/libcasper/services/cap_sysctl \ + lib/libcasper/services/cap_syslog \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcuse \ @@ -62,7 +64,7 @@ lib/libdpv \ lib/libdwarf \ lib/libedit \ - lib/libedit/edit/readline \ + lib/libedit/readline \ lib/libefivar \ lib/libelf \ lib/libelftc \ @@ -96,7 +98,9 @@ lib/librss \ lib/librtld_db \ lib/libsdp \ + lib/libsecureboot \ lib/libsqlite3 \ + lib/libstand \ lib/libstdthreads \ lib/libtacplus \ lib/libthread_db \ @@ -107,6 +111,7 @@ lib/libusb \ lib/libusbhid \ lib/libutil \ + lib/libveriexec \ lib/libvgl \ lib/libvmmapi \ lib/libwrap \ @@ -119,8 +124,8 @@ lib/ncurses/menuw \ lib/ncurses/ncursesw \ lib/ncurses/panelw \ + lib/ofed/include \ secure/lib/libcrypto \ - secure/lib/libssl \ usr.bin/lex \ usr.sbin/bsnmpd/modules \ usr.sbin/bsnmpd/modules/snmp_bridge \ Index: lib/libtacplus/Makefile.depend =================================================================== --- lib/libtacplus/Makefile.depend +++ lib/libtacplus/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libthr/Makefile.depend =================================================================== --- lib/libthr/Makefile.depend +++ lib/libthr/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ lib/${CSU_DIR} \ lib/libc \ Index: lib/libthread_db/Makefile.depend =================================================================== --- lib/libthread_db/Makefile.depend +++ lib/libthread_db/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libucl/Makefile.depend =================================================================== --- lib/libucl/Makefile.depend +++ lib/libucl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libufs/Makefile.depend =================================================================== --- lib/libufs/Makefile.depend +++ lib/libufs/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libugidfw/Makefile.depend =================================================================== --- lib/libugidfw/Makefile.depend +++ lib/libugidfw/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libulog/Makefile.depend =================================================================== --- lib/libulog/Makefile.depend +++ lib/libulog/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libusb/Makefile.depend =================================================================== --- lib/libusb/Makefile.depend +++ lib/libusb/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libusbhid/Makefile.depend =================================================================== --- lib/libusbhid/Makefile.depend +++ lib/libusbhid/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libutil/Makefile.depend =================================================================== --- lib/libutil/Makefile.depend +++ lib/libutil/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libveriexec/Makefile.depend =================================================================== --- /dev/null +++ lib/libveriexec/Makefile.depend @@ -0,0 +1,16 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/libvgl/Makefile.depend =================================================================== --- lib/libvgl/Makefile.depend +++ lib/libvgl/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libvmmapi/Makefile.depend =================================================================== --- lib/libvmmapi/Makefile.depend +++ lib/libvmmapi/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libwrap/Makefile.depend =================================================================== --- lib/libwrap/Makefile.depend +++ lib/libwrap/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: lib/libxo/Makefile.depend =================================================================== --- lib/libxo/Makefile.depend +++ lib/libxo/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libypclnt/Makefile.depend =================================================================== --- lib/libypclnt/Makefile.depend +++ lib/libypclnt/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/rpc \ include/rpcsvc \ Index: lib/libz/Makefile.depend =================================================================== --- lib/libz/Makefile.depend +++ lib/libz/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/libzstd/Makefile.depend =================================================================== --- lib/libzstd/Makefile.depend +++ lib/libzstd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/msun/Makefile.depend =================================================================== --- lib/msun/Makefile.depend +++ lib/msun/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/ncurses/formw/Makefile.depend =================================================================== --- lib/ncurses/formw/Makefile.depend +++ lib/ncurses/formw/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/ncurses/menuw/Makefile.depend =================================================================== --- lib/ncurses/menuw/Makefile.depend +++ lib/ncurses/menuw/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/ncurses/ncursesw/Makefile.depend =================================================================== --- lib/ncurses/ncursesw/Makefile.depend +++ lib/ncurses/ncursesw/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/ncurses/panelw/Makefile.depend =================================================================== --- lib/ncurses/panelw/Makefile.depend +++ lib/ncurses/panelw/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: lib/ofed/complib/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/complib/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + lib/msun \ + lib/ofed/include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/include/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/include/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libcxgb4/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libcxgb4/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + lib/ofed/include \ + lib/ofed/libibverbs \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libibcm/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libibcm/Makefile.depend @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/ofed/include \ + lib/ofed/libibverbs \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libibmad/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libibmad/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/ofed/include \ + lib/ofed/libibumad \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libibnetdisc/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libibnetdisc/Makefile.depend @@ -0,0 +1,24 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libc++ \ + lib/libcompiler_rt \ + lib/libcxxrt \ + lib/msun \ + lib/ofed/complib \ + lib/ofed/include \ + lib/ofed/libibmad \ + lib/ofed/libibumad \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libibverbs/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libibverbs/Makefile.depend @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/ofed/include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libmlx4/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libmlx4/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + lib/ofed/include \ + lib/ofed/libibverbs \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libmlx5/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libmlx5/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + lib/ofed/include \ + lib/ofed/libibverbs \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libopensm/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libopensm/Makefile.depend @@ -0,0 +1,19 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + lib/ofed/include \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/librdmacm/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/librdmacm/Makefile.depend @@ -0,0 +1,18 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/ofed/include \ + lib/ofed/libibverbs \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: lib/ofed/libvendor/Makefile.depend =================================================================== --- /dev/null +++ lib/ofed/libvendor/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/arpa \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libthr \ + lib/ofed/include \ + lib/ofed/libibumad \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: libexec/fingerd/Makefile.depend =================================================================== --- libexec/fingerd/Makefile.depend +++ libexec/fingerd/Makefile.depend @@ -2,12 +2,10 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ - lib/libblacklist \ lib/libc \ lib/libcompiler_rt \ lib/libthr \ Index: libexec/ftpd/Makefile.depend =================================================================== --- libexec/ftpd/Makefile.depend +++ libexec/ftpd/Makefile.depend @@ -2,18 +2,15 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ - lib/libblacklist \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ lib/libmd \ lib/libopie \ - lib/libpam/libpam \ lib/libthr \ lib/libutil \ lib/libxo \ Index: libexec/telnetd/Makefile.depend =================================================================== --- libexec/telnetd/Makefile.depend +++ libexec/telnetd/Makefile.depend @@ -2,17 +2,9 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libheimipcc \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ @@ -24,7 +16,6 @@ lib/libthr \ lib/libutil \ lib/ncurses/ncursesw \ - secure/lib/libcrypto \ .include Index: libexec/tftpd/Makefile.depend =================================================================== --- libexec/tftpd/Makefile.depend +++ libexec/tftpd/Makefile.depend @@ -2,14 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libwrap \ .include Index: sbin/bectl/Makefile.depend =================================================================== --- /dev/null +++ sbin/bectl/Makefile.depend @@ -0,0 +1,32 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libavl \ + cddl/lib/libnvpair \ + cddl/lib/libumem \ + cddl/lib/libuutil \ + cddl/lib/libzfs \ + cddl/lib/libzfs_core \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libbe \ + lib/libc \ + lib/libcompiler_rt \ + lib/libexpat \ + lib/libgeom \ + lib/libjail \ + lib/libmd \ + lib/libsbuf \ + lib/libthr \ + lib/libutil \ + lib/libz \ + lib/msun \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: sbin/devmatch/Makefile.depend =================================================================== --- /dev/null +++ sbin/devmatch/Makefile.depend @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libdevinfo \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: sbin/dhclient/Makefile.depend =================================================================== --- sbin/dhclient/Makefile.depend +++ sbin/dhclient/Makefile.depend @@ -2,13 +2,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libnv \ lib/libutil \ Index: sbin/dumpon/Makefile.depend =================================================================== --- sbin/dumpon/Makefile.depend +++ sbin/dumpon/Makefile.depend @@ -2,13 +2,15 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ + include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ + lib/libcasper/libcasper \ lib/libcompiler_rt \ - secure/lib/libcrypto \ + lib/libthr \ .include Index: sbin/geom/Makefile.depend =================================================================== --- /dev/null +++ sbin/geom/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libexpat \ + lib/libgeom \ + lib/libsbuf \ + lib/libutil \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: sbin/ifconfig/Makefile.depend =================================================================== --- sbin/ifconfig/Makefile.depend +++ sbin/ifconfig/Makefile.depend @@ -2,16 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ - lib/lib80211 \ lib/libc \ lib/libcompiler_rt \ lib/libexpat \ - lib/libjail \ lib/libsbuf \ lib/msun \ Index: sbin/ping/Makefile.depend =================================================================== --- sbin/ping/Makefile.depend +++ sbin/ping/Makefile.depend @@ -2,14 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libcasper/libcasper \ - lib/libcasper/services/cap_dns \ + lib/libcapsicum \ lib/libcompiler_rt \ lib/libipsec \ lib/libnv \ Index: sbin/ping6/Makefile.depend =================================================================== --- sbin/ping6/Makefile.depend +++ sbin/ping6/Makefile.depend @@ -2,15 +2,16 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ lib/libipsec \ lib/libmd \ + lib/libnv \ lib/msun \ Index: sbin/rtsol/Makefile.depend =================================================================== --- sbin/rtsol/Makefile.depend +++ sbin/rtsol/Makefile.depend @@ -2,13 +2,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libutil \ .include Index: sbin/savecore/Makefile.depend =================================================================== --- sbin/savecore/Makefile.depend +++ sbin/savecore/Makefile.depend @@ -2,12 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libnv \ lib/libutil \ lib/libxo \ lib/libz \ Index: secure/lib/libcrypto/Makefile.depend =================================================================== --- secure/lib/libcrypto/Makefile.depend +++ secure/lib/libcrypto/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ Index: secure/lib/libssh/Makefile.depend =================================================================== --- secure/lib/libssh/Makefile.depend +++ secure/lib/libssh/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/gssapi \ @@ -16,7 +15,6 @@ lib/libutil \ lib/libz \ secure/lib/libcrypto \ - secure/lib/libssl \ .include Index: secure/lib/libssl/Makefile.depend =================================================================== --- secure/lib/libssl/Makefile.depend +++ secure/lib/libssl/Makefile.depend @@ -2,13 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ secure/lib/libcrypto \ + secure/lib/libcrypto/openssl.amd64 \ .include Index: secure/usr.bin/ssh/Makefile.depend =================================================================== --- secure/usr.bin/ssh/Makefile.depend +++ secure/usr.bin/ssh/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/gssapi \ @@ -12,13 +11,14 @@ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libgssapi \ lib/libldns \ lib/libpam/libpam \ + lib/libthr \ lib/libutil \ lib/libz \ secure/lib/libcrypto \ secure/lib/libssh \ + secure/lib/libssl \ .include Index: secure/usr.sbin/sshd/Makefile.depend =================================================================== --- secure/usr.sbin/sshd/Makefile.depend +++ secure/usr.sbin/sshd/Makefile.depend @@ -2,35 +2,26 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/gssapi \ include/xlocale \ - kerberos5/lib/libasn1 \ kerberos5/lib/libgssapi_krb5 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libheimipcc \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ - lib/libblacklist \ - lib/libbsm \ lib/libc \ + lib/libcapsicum \ + lib/libcasper/libcasper \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libgssapi \ lib/libldns \ lib/libpam/libpam \ lib/libthr \ lib/libutil \ - lib/libwrap \ lib/libz \ secure/lib/libcrypto \ secure/lib/libssh \ + secure/lib/libssl \ .include Index: share/mk/dirdeps.mk =================================================================== --- share/mk/dirdeps.mk +++ share/mk/dirdeps.mk @@ -1,5 +1,5 @@ # $FreeBSD$ -# $Id: dirdeps.mk,v 1.96 2018/06/20 22:26:39 sjg Exp $ +# $Id: dirdeps.mk,v 1.100 2019/11/12 06:47:58 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -379,7 +379,8 @@ .endif # this is what we run below -DIRDEP_MAKE?= ${.MAKE} +DIRDEP_MAKE ?= ${.MAKE} +DIRDEP_DIR ?= ${.TARGET:R} # we suppress SUBDIR when visiting the leaves # we assume sys.mk will set MACHINE_ARCH @@ -389,10 +390,11 @@ @for m in ${.MAKE.MAKEFILE_PREFERENCE}; do \ test -s ${.TARGET:R}/$$m || continue; \ echo "${TRACER}Checking ${.TARGET:R} for ${.TARGET:E} ..."; \ + ${DIRDEP_USE_PRELUDE} \ MACHINE_ARCH= NO_SUBDIR=1 ${DIRDEP_USE_ENV} \ TARGET_SPEC=${.TARGET:E} \ MACHINE=${.TARGET:E} \ - ${DIRDEP_MAKE} -C ${.TARGET:R} || exit 1; \ + ${DIRDEP_MAKE} -C ${DIRDEP_DIR} || exit 1; \ break; \ done @@ -476,7 +478,7 @@ ${DIRDEPS_CACHE}: .META .NOMETA_CMP +@{ echo '# Autogenerated - do NOT edit!'; echo; \ echo 'BUILD_DIRDEPS=no'; echo; \ - echo '.include '; \ + echo '.include '; echo; \ } > ${.TARGET}.new +@MAKELEVEL=${.MAKE.LEVEL} DIRDEPS_CACHE=${DIRDEPS_CACHE} \ DIRDEPS="${DIRDEPS}" \ @@ -640,9 +642,15 @@ .if ${.MAKEFLAGS:M-V${_V_READ_DIRDEPS}} == "" .if !empty(_build_all_dirs) .if ${BUILD_DIRDEPS_CACHE} == "yes" -x!= { echo; echo '\# ${DEP_RELDIR}.${DEP_TARGET_SPEC}'; \ - echo 'dirdeps: ${_build_all_dirs:${M_oneperline}}'; echo; } >&3; echo -x!= { ${_build_all_dirs:@x@${target($x):?:echo '$x: _DIRDEP_USE';}@} echo; } >&3; echo +# guard against _build_all_dirs being too big for a single command line +# first get list of dirs that need _DIRDEP_USE +# then export that and _build_all_dirs +_new_dirdeps := ${_build_all_dirs:@x@${target($x):?:$x}@} +.export _new_dirdeps _build_all_dirs +x!= echo; { echo '\# ${DEP_RELDIR}.${DEP_TARGET_SPEC}'; \ + echo "dirdeps: \\"; \ + for x in $$_build_all_dirs; do echo " $$x \\"; done; echo; \ + for x in $$_new_dirdeps; do echo "$$x: _DIRDEP_USE"; done; echo; } >&3 .if !empty(DEP_EXPORT_VARS) # Discouraged, but there are always exceptions. # Handle it here rather than explain how. @@ -672,7 +680,10 @@ .info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$q} .endif .if ${BUILD_DIRDEPS_CACHE} == "yes" -x!= { echo; echo '${_this_dir}.$m: ${_build_dirs:M*.$q:${M_oneperline}}'; echo; } >&3; echo +_cache_deps := ${_build_dirs:M*.$q} +.export _cache_deps +x!= echo; { echo "${_this_dir}.$m: \\"; \ + for x in $$_cache_deps; do echo " $$x \\"; done; echo; } >&3 .else ${_this_dir}.$m: ${_build_dirs:M*.$q} .endif @@ -682,7 +693,10 @@ .info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endif .if ${BUILD_DIRDEPS_CACHE} == "yes" -x!= { echo; echo '${_this_dir}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m:${M_oneperline}}'; echo; } >&3; echo +_cache_deps := ${_build_dirs:M*.$m:N${_this_dir}.$m} +.export _cache_deps +x!= echo; { echo "${_this_dir}.$m: \\"; \ + for x in $$_cache_deps; do echo " $$x \\"; done; echo; } >&3 .else ${_this_dir}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endif Index: share/mk/gendirdeps.mk =================================================================== --- share/mk/gendirdeps.mk +++ share/mk/gendirdeps.mk @@ -1,5 +1,5 @@ # $FreeBSD$ -# $Id: gendirdeps.mk,v 1.39 2018/06/08 01:25:31 sjg Exp $ +# $Id: gendirdeps.mk,v 1.41 2019/11/21 23:50:40 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -80,7 +80,6 @@ .endif META_FILES := ${META_FILES:T:O:u} -.export META_FILES # pickup customizations .-include @@ -184,6 +183,11 @@ .elif ${_meta_files:[#]} > 500 .export _meta_files x != echo; for m in $$_meta_files; do echo $$m; done > meta.list +# _meta_files is consuming a lot of env space +# that can impact command line length, +# and we do not need it any more +.undef _meta_files +.unexport _meta_files .else _meta_files_arg:= ${_meta_files} .endif @@ -374,3 +378,6 @@ .endif ${_DEPENDFILE}: .PRECIOUS + +# don't waste time looking for ways to make .meta files +.SUFFIXES: Index: share/mk/local.dirdeps-options.mk =================================================================== --- /dev/null +++ share/mk/local.dirdeps-options.mk @@ -0,0 +1,29 @@ +# $FreeBSD$ + +# avoid duplication +DIRDEPS.AUDIT.yes= lib/libbsm +DIRDEPS.BLACKLIST_SUPPORT.yes+= lib/libblacklist +DIRDEPS.BSD_CRTBEGIN.no+= gnu/lib/csu +DIRDEPS.CASPER.yes+= lib/libcasper/libcasper +DIRDEPS.GSSAPI.yes+= lib/libgssapi +DIRDEPS.JAIL.yes+= lib/libjail +DIRDEPS.KERBEROS_SUPPORT.yes+= \ + kerberos5/lib/libasn1 \ + kerberos5/lib/libheimbase \ + kerberos5/lib/libheimipcc \ + kerberos5/lib/libhx509 \ + kerberos5/lib/libkrb5 \ + kerberos5/lib/libroken \ + kerberos5/lib/libwind \ + +DIRDEPS.NIS.yes+= \ + include/rpc \ + include/rpcsvc \ + lib/librpcsvc + +DIRDEPS.OPENSSL.yes+= secure/lib/libcrypto +DIRDEPS.OPENSSL.no+= lib/libmd +DIRDEPS.PAM_SUPPORT.yes+= lib/libpam/libpam +DIRDEPS.TCP_WRAPPERS.yes+= lib/libwrap + + Index: share/mk/local.dirdeps.mk =================================================================== --- share/mk/local.dirdeps.mk +++ share/mk/local.dirdeps.mk @@ -148,7 +148,6 @@ # Has C files. The C_DIRDEPS are shared with C++ files as well. C_DIRDEPS= \ - gnu/lib/csu \ include \ include/arpa \ include/protocols \ @@ -222,6 +221,11 @@ .endif .endif +# this one is too pervasive +.if ${MK_BSD_CRTBEGIN} == "no" && ${DEP_RELDIR} != "gnu/lib/csu" +DIRDEPS+= gnu/lib/csu +.endif + DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}} CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH} CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}} Index: share/mk/local.gendirdeps.mk =================================================================== --- share/mk/local.gendirdeps.mk +++ share/mk/local.gendirdeps.mk @@ -10,6 +10,7 @@ Ngnu/lib/libssp/libssp_nonshared \ Ncddl/usr.bin/ctf* \ Nlib/libc_nonshared \ + Ngnu/lib/csu \ Ngnu/lib/libgcc \ Nlib/libgcc_eh \ Nlib/libgcc_s \ Index: share/mk/local.meta.sys.mk =================================================================== --- share/mk/local.meta.sys.mk +++ share/mk/local.meta.sys.mk @@ -96,7 +96,7 @@ OBJTOP := ${HOST_OBJTOP} .endif -.if ${.MAKE.LEVEL} == 0 +.if ${.MAKE.LEVEL} == 0 || empty(PYTHON) PYTHON ?= /usr/local/bin/python .export PYTHON # this works best if share/mk is ready for it. @@ -133,7 +133,9 @@ STAGE_HOST_OBJTOP:= ${STAGE_ROOT}/${HOST_TARGET} # These are exported for hooking in out-of-tree builds. They will always # be overridden in sub-makes above when building in-tree. +.if ${.MAKE.LEVEL} > 0 .export STAGE_OBJTOP STAGE_TARGET_OBJTOP STAGE_HOST_OBJTOP +.endif # Use tools/install.sh which can avoid the need for xinstall for simple cases. INSTALL?= sh ${SRCTOP}/tools/install.sh Index: share/mk/meta.sys.mk =================================================================== --- share/mk/meta.sys.mk +++ share/mk/meta.sys.mk @@ -1,5 +1,5 @@ # $FreeBSD$ -# $Id: meta.sys.mk,v 1.32 2017/06/11 03:24:04 sjg Exp $ +# $Id: meta.sys.mk,v 1.34 2019/01/24 19:36:25 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -62,13 +62,15 @@ MACHINE = host .endif -.if ${.MAKE.LEVEL} == 0 +.if !defined(MACHINE0) # it can be handy to know which MACHINE kicked off the build # for example, if using Makefild.depend for multiple machines, # allowing only MACHINE0 to update can keep things simple. MACHINE0 := ${MACHINE} .export MACHINE0 +.endif +.if !defined(META2DEPS) .if defined(PYTHON) && exists(${PYTHON}) # we prefer the python version of this - it is much faster META2DEPS ?= ${.PARSEDIR}/meta2deps.py Index: stand/efi/libefi/Makefile.depend =================================================================== --- stand/efi/libefi/Makefile.depend +++ stand/efi/libefi/Makefile.depend @@ -2,8 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - include \ - include/xlocale \ + stand/libsa \ .include Index: stand/efi/loader/Makefile.depend =================================================================== --- stand/efi/loader/Makefile.depend +++ stand/efi/loader/Makefile.depend @@ -2,12 +2,9 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - include \ - include/xlocale \ stand/efi/libefi \ stand/ficl \ stand/libsa \ - stand/zfs \ .include Index: stand/i386/loader_4th/Makefile.depend =================================================================== --- /dev/null +++ stand/i386/loader_4th/Makefile.depend @@ -0,0 +1,17 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + stand/${MACHINE_CPUARCH}/btx/btx \ + stand/${MACHINE_CPUARCH}/btx/btxldr \ + stand/${MACHINE_CPUARCH}/btx/lib \ + stand/${MACHINE_CPUARCH}/libi386 \ + stand/ficl \ + stand/libsa \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: targets/Makefile =================================================================== --- targets/Makefile +++ targets/Makefile @@ -38,74 +38,6 @@ DIRDEPS_FILTER = Mtargets/* .endif -# in theory, this is what we want -target_dirs = targets targets/pseudo -# these tweak how we do it -target_prefix = pkg- build- -DIRDEPS := ${.TARGETS:Nall:${target_prefix:@p@S,^$p,,@:ts:}:@t@${target_dirs:@d@$d/$t@}@:@d@${exists(${SRCTOP}/$d):?$d:}@} - -all_machine_list = ${ALL_MACHINE_LIST} host common - -.if ${DIRDEPS:Mtargets/pseudo/*} != "" -# all bets are off -PKG_MACHINE_LIST = ${all_machine_list} -.endif - -.if make(check-commit) -# a special case -DIRDEPS = targets/pseudo/check-commit -.if defined(ALL_MACHINES) -CHECK_MACHINE_LIST = all -.undef ALL_MACHINES -.endif -SHIPDIR = no - -.else - -.if defined(ALL_MACHINES) -DIRDEPS := ${DIRDEPS:O:u:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}.$m):?$d.$m:}@}@} -.undef ALL_MACHINES -PKG_MACHINE_LIST ?= ${DIRDEPS:E:O:u} -.elif empty(REQUESTED_MACHINE) -# the above may be insufficient. -# some packages only support one machine which may not be ${MACHINE} -# some support multiple, in which case unless ALL_MACHINES is defined -# we only want ${MACHINE} -plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}):?$d:}@} -.if ${plain} != ${DIRDEPS} -qual := ${DIRDEPS:${plain:${M_ListToSkip}}:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}.$m):?$d.$m:}@}@} -DIRDEPS := ${plain} ${qual} -PKG_MACHINE_LIST ?= ${MACHINE} ${qual:E:O:u} -.endif -.else -# check that a .MAKE.DEPENDFILE exists -DIRDEPS := ${.MAKE.DEPENDFILE_PREFERENCE:T:@m@${DIRDEPS:@d@${exists(${SRCTOP}/$d/$m):?$d:}@}@:O:u} -.endif -.if !empty(PKG_MACHINE_LIST) -.if ${PKG_MACHINE_LIST:Mdepend} != "" -PKG_MACHINE_LIST = ${ALL_MACHINE_LIST} -.endif -PKG_MACHINE_LIST := ${PKG_MACHINE_LIST} -.endif -.endif - -# we don't use DIRDEPS_FILTER, since we only want it to -# apply to this initial list -.if !empty(REQUESTED_MACHINE) && !empty(DIRDEPS) -# this is a variant of the logic above, we want plain -# but need to filter the qualified DIRDEPS to REQUESTED_MACHINE -plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}):?$d:}@} -.if !empty(plain) && ${plain} != ${DIRDEPS} -qual := ${DIRDEPS:${plain:${M_ListToSkip}}:M*.${REQUESTED_MACHINE}} -.if empty(qual) -qual := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T}):?$d.${.MAKE.DEPENDFILE:E}:}@} -.endif -DIRDEPS := ${plain} ${qual} -.endif -.if empty(DIRDEPS) -.error ${REQUESTED_MACHINE} is not appropriate for ${.TARGETS} -.endif -.endif .if !empty(build_options) build_options := ${build_options:O:u} @@ -115,6 +47,9 @@ .export ${build_options} .endif +# this does the work +.include + .if !empty(DIRDEPS) # This is printed as we read the makefile # so provides a useful clue as to when we really started. Index: targets/Makefile.inc =================================================================== --- targets/Makefile.inc +++ targets/Makefile.inc @@ -20,11 +20,12 @@ .endif .endif +.MAIN: all + # The makefile in subdirs should set this to something useful # the default should do nothing. PKG_METHOD ?= none - -.MAIN: all +none: .if ${build-*:${M_L_TARGETS}} != "" # just build the bits, skip packaging Index: usr.bin/brandelf/Makefile.depend =================================================================== --- usr.bin/brandelf/Makefile.depend +++ usr.bin/brandelf/Makefile.depend @@ -2,12 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libnv \ .include Index: usr.bin/chkey/Makefile.depend =================================================================== --- usr.bin/chkey/Makefile.depend +++ usr.bin/chkey/Makefile.depend @@ -2,16 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ - include/rpc \ - include/rpcsvc \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libmp \ - lib/librpcsvc \ + lib/libthr \ secure/lib/libcrypto \ Index: usr.bin/chpass/Makefile.depend =================================================================== --- usr.bin/chpass/Makefile.depend +++ usr.bin/chpass/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,7 +9,6 @@ lib/libcompiler_rt \ lib/libcrypt \ lib/libutil \ - lib/libypclnt \ .include Index: usr.bin/factor/Makefile.depend =================================================================== --- usr.bin/factor/Makefile.depend +++ usr.bin/factor/Makefile.depend @@ -2,13 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - secure/lib/libcrypto \ + lib/libthr \ .include Index: usr.bin/grep/Makefile.depend =================================================================== --- usr.bin/grep/Makefile.depend +++ usr.bin/grep/Makefile.depend @@ -2,15 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libbz2 \ lib/libc \ lib/libcompiler_rt \ - lib/liblzma \ - lib/libthr \ lib/libz \ Index: usr.bin/gzip/Makefile.depend =================================================================== --- usr.bin/gzip/Makefile.depend +++ usr.bin/gzip/Makefile.depend @@ -2,11 +2,9 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ - lib/libbz2 \ lib/libc \ lib/libcompiler_rt \ lib/liblzma \ Index: usr.bin/head/Makefile.depend =================================================================== --- usr.bin/head/Makefile.depend +++ usr.bin/head/Makefile.depend @@ -2,12 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libnv \ .include Index: usr.bin/kdump/Makefile.depend =================================================================== --- usr.bin/kdump/Makefile.depend +++ usr.bin/kdump/Makefile.depend @@ -2,16 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcapsicum \ - lib/libcasper/libcasper \ - lib/libcasper/services/cap_grp \ - lib/libcasper/services/cap_pwd \ lib/libcompiler_rt \ lib/libnv \ lib/libsysdecode \ Index: usr.bin/lex/Makefile.depend =================================================================== --- usr.bin/lex/Makefile.depend +++ usr.bin/lex/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ Index: usr.bin/login/Makefile.depend =================================================================== --- usr.bin/login/Makefile.depend +++ usr.bin/login/Makefile.depend @@ -2,11 +2,9 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ - lib/libbsm \ lib/libc \ lib/libcompiler_rt \ lib/libpam/libpam \ Index: usr.bin/netstat/Makefile.depend =================================================================== --- usr.bin/netstat/Makefile.depend +++ usr.bin/netstat/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -12,7 +11,6 @@ lib/libelf \ lib/libkvm \ lib/libmemstat \ - lib/libnetgraph \ lib/libutil \ lib/libxo \ Index: usr.bin/nm/Makefile.depend =================================================================== --- usr.bin/nm/Makefile.depend +++ usr.bin/nm/Makefile.depend @@ -2,15 +2,16 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ lib/libdwarf \ lib/libelf \ lib/libelftc \ + lib/libnv \ .include Index: usr.bin/readelf/Makefile.depend =================================================================== --- usr.bin/readelf/Makefile.depend +++ usr.bin/readelf/Makefile.depend @@ -2,15 +2,16 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ lib/libdwarf \ lib/libelf \ lib/libelftc \ + lib/libnv \ .include Index: usr.bin/size/Makefile.depend =================================================================== --- usr.bin/size/Makefile.depend +++ usr.bin/size/Makefile.depend @@ -2,14 +2,15 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ lib/libelf \ lib/libelftc \ + lib/libnv \ .include Index: usr.bin/sort/Makefile.depend =================================================================== --- usr.bin/sort/Makefile.depend +++ usr.bin/sort/Makefile.depend @@ -2,13 +2,11 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libmd \ lib/msun \ Index: usr.bin/strings/Makefile.depend =================================================================== --- usr.bin/strings/Makefile.depend +++ usr.bin/strings/Makefile.depend @@ -2,14 +2,15 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ lib/libelf \ lib/libelftc \ + lib/libnv \ .include Index: usr.bin/su/Makefile.depend =================================================================== --- usr.bin/su/Makefile.depend +++ usr.bin/su/Makefile.depend @@ -2,11 +2,9 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ - lib/libbsm \ lib/libc \ lib/libcompiler_rt \ lib/libpam/libpam \ Index: usr.bin/tail/Makefile.depend =================================================================== --- usr.bin/tail/Makefile.depend +++ usr.bin/tail/Makefile.depend @@ -2,12 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libnv \ .include Index: usr.bin/telnet/Makefile.depend =================================================================== --- usr.bin/telnet/Makefile.depend +++ usr.bin/telnet/Makefile.depend @@ -2,29 +2,17 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libheimipcc \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ - lib/libipsec \ - lib/libmp \ - lib/libpam/libpam \ lib/libtelnet \ lib/libthr \ lib/ncurses/ncursesw \ - secure/lib/libcrypto \ .include Index: usr.bin/wc/Makefile.depend =================================================================== --- usr.bin/wc/Makefile.depend +++ usr.bin/wc/Makefile.depend @@ -2,12 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libnv \ lib/libutil \ lib/libxo \ Index: usr.sbin/amd/amd/Makefile.depend =================================================================== --- usr.sbin/amd/amd/Makefile.depend +++ usr.sbin/amd/amd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/rpc \ @@ -11,7 +10,6 @@ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libwrap \ usr.bin/yacc.host \ usr.sbin/amd/include \ usr.sbin/amd/libamu \ Index: usr.sbin/bhyve/Makefile.depend =================================================================== --- usr.sbin/bhyve/Makefile.depend +++ usr.sbin/bhyve/Makefile.depend @@ -2,20 +2,20 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcam \ lib/libcapsicum \ + lib/libcasper/libcasper \ lib/libcompiler_rt \ - lib/libmd \ + lib/libsbuf \ lib/libthr \ lib/libutil \ lib/libvmmapi \ lib/libz \ - secure/lib/libcrypto \ .include Index: usr.sbin/bsnmpd/bsnmpd/Makefile.depend =================================================================== --- usr.sbin/bsnmpd/bsnmpd/Makefile.depend +++ usr.sbin/bsnmpd/bsnmpd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -11,8 +10,9 @@ lib/libbsnmp/libbsnmp \ lib/libc \ lib/libcompiler_rt \ - lib/libwrap \ + lib/libthr \ secure/lib/libcrypto \ + usr.sbin/bsnmpd/gensnmptree.host \ .include Index: usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend =================================================================== --- usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend +++ usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend @@ -2,13 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libbsnmp/libbsnmp \ lib/libc \ lib/libcompiler_rt \ + usr.sbin/bsnmpd/gensnmptree.host \ usr.sbin/bsnmpd/modules \ usr.sbin/bsnmpd/modules/snmp_mibII \ Index: usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend =================================================================== --- usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend +++ usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -10,6 +9,7 @@ lib/libbsnmp/libbsnmp \ lib/libc \ lib/libcompiler_rt \ + usr.sbin/bsnmpd/gensnmptree.host \ .include Index: usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend =================================================================== --- usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend +++ usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,6 +9,7 @@ lib/libc \ lib/libcompiler_rt \ lib/libnetgraph \ + usr.sbin/bsnmpd/gensnmptree.host \ usr.sbin/bsnmpd/modules \ Index: usr.sbin/fstyp/Makefile.depend =================================================================== --- usr.sbin/fstyp/Makefile.depend +++ usr.sbin/fstyp/Makefile.depend @@ -3,22 +3,21 @@ DIRDEPS = \ cddl/lib/libavl \ - cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ - cddl/lib/libzfs \ - cddl/lib/libzfs_core \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ + lib/libcasper/libcasper \ lib/libcompiler_rt \ lib/libexpat \ lib/libgeom \ lib/libmd \ lib/libsbuf \ lib/libthr \ + lib/libufs \ lib/libutil \ lib/libz \ lib/msun \ Index: usr.sbin/gssd/Makefile.depend =================================================================== --- usr.sbin/gssd/Makefile.depend +++ usr.sbin/gssd/Makefile.depend @@ -2,18 +2,10 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/gssapi \ include/rpc \ include/xlocale \ - kerberos5/lib/libasn1 \ - kerberos5/lib/libheimbase \ - kerberos5/lib/libheimipcc \ - kerberos5/lib/libhx509 \ - kerberos5/lib/libkrb5 \ - kerberos5/lib/libroken \ - kerberos5/lib/libwind \ lib/${CSU_DIR} \ lib/libc \ lib/libcom_err \ Index: usr.sbin/inetd/Makefile.depend =================================================================== --- usr.sbin/inetd/Makefile.depend +++ usr.sbin/inetd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/rpc \ @@ -12,7 +11,6 @@ lib/libcompiler_rt \ lib/libipsec \ lib/libutil \ - lib/libwrap \ .include Index: usr.sbin/ngctl/Makefile.depend =================================================================== --- usr.sbin/ngctl/Makefile.depend +++ usr.sbin/ngctl/Makefile.depend @@ -2,13 +2,11 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libedit \ lib/libnetgraph \ lib/libthr \ lib/ncurses/ncursesw \ Index: usr.sbin/ntp/libntp/Makefile.depend =================================================================== --- usr.sbin/ntp/libntp/Makefile.depend +++ usr.sbin/ntp/libntp/Makefile.depend @@ -5,7 +5,7 @@ include \ include/arpa \ include/xlocale \ - lib/libedit/edit/readline \ + lib/libedit/readline \ lib/msun \ secure/lib/libcrypto \ Index: usr.sbin/ntp/libntpevent/Makefile.depend =================================================================== --- usr.sbin/ntp/libntpevent/Makefile.depend +++ usr.sbin/ntp/libntpevent/Makefile.depend @@ -6,7 +6,6 @@ include/arpa \ include/xlocale \ secure/lib/libcrypto \ - secure/lib/libssl \ .include Index: usr.sbin/ntp/ntp-keygen/Makefile.depend =================================================================== --- usr.sbin/ntp/ntp-keygen/Makefile.depend +++ usr.sbin/ntp/ntp-keygen/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -11,7 +10,6 @@ lib/libcompiler_rt \ lib/libthr \ lib/msun \ - secure/lib/libcrypto \ usr.sbin/ntp/libntp \ usr.sbin/ntp/libopts \ Index: usr.sbin/ntp/ntpd/Makefile.depend =================================================================== --- usr.sbin/ntp/ntpd/Makefile.depend +++ usr.sbin/ntp/ntpd/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -11,7 +10,6 @@ lib/libcompiler_rt \ lib/libthr \ lib/msun \ - secure/lib/libcrypto \ usr.sbin/ntp/libntp \ usr.sbin/ntp/libopts \ usr.sbin/ntp/libparse \ Index: usr.sbin/ntp/ntpdate/Makefile.depend =================================================================== --- usr.sbin/ntp/ntpdate/Makefile.depend +++ usr.sbin/ntp/ntpdate/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -11,7 +10,6 @@ lib/libcompiler_rt \ lib/libthr \ lib/msun \ - secure/lib/libcrypto \ usr.sbin/ntp/libntp \ Index: usr.sbin/ntp/ntpdc/Makefile.depend =================================================================== --- usr.sbin/ntp/ntpdc/Makefile.depend +++ usr.sbin/ntp/ntpdc/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -13,7 +12,6 @@ lib/libthr \ lib/msun \ lib/ncurses/ncursesw \ - secure/lib/libcrypto \ usr.sbin/ntp/libntp \ usr.sbin/ntp/libopts \ Index: usr.sbin/ntp/ntpq/Makefile.depend =================================================================== --- usr.sbin/ntp/ntpq/Makefile.depend +++ usr.sbin/ntp/ntpq/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -13,7 +12,6 @@ lib/libthr \ lib/msun \ lib/ncurses/ncursesw \ - secure/lib/libcrypto \ usr.sbin/ntp/libntp \ usr.sbin/ntp/libopts \ Index: usr.sbin/ntp/sntp/Makefile.depend =================================================================== --- usr.sbin/ntp/sntp/Makefile.depend +++ usr.sbin/ntp/sntp/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -11,7 +10,6 @@ lib/libcompiler_rt \ lib/libthr \ lib/msun \ - secure/lib/libcrypto \ usr.sbin/ntp/libntp \ usr.sbin/ntp/libntpevent \ usr.sbin/ntp/libopts \ Index: usr.sbin/rpcbind/Makefile.depend =================================================================== --- usr.sbin/rpcbind/Makefile.depend +++ usr.sbin/rpcbind/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/rpc \ @@ -11,8 +10,6 @@ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libutil \ - lib/libwrap \ .include Index: usr.sbin/rtsold/Makefile.depend =================================================================== --- usr.sbin/rtsold/Makefile.depend +++ usr.sbin/rtsold/Makefile.depend @@ -2,13 +2,14 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ + lib/libcapsicum \ lib/libcompiler_rt \ + lib/libutil \ .include Index: usr.sbin/rtsold/cap_llflags.c =================================================================== --- usr.sbin/rtsold/cap_llflags.c +++ usr.sbin/rtsold/cap_llflags.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include Index: usr.sbin/sendmail/Makefile.depend =================================================================== --- usr.sbin/sendmail/Makefile.depend +++ usr.sbin/sendmail/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/rpcsvc \ @@ -12,10 +11,8 @@ lib/libcompiler_rt \ lib/libsm \ lib/libsmutil \ + lib/libthr \ lib/libutil \ - lib/libwrap \ - secure/lib/libcrypto \ - secure/lib/libssl \ .include Index: usr.sbin/tcpdump/tcpdump/Makefile.depend =================================================================== --- usr.sbin/tcpdump/tcpdump/Makefile.depend +++ usr.sbin/tcpdump/tcpdump/Makefile.depend @@ -2,19 +2,18 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/rpc \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libcasper/libcasper \ - lib/libcasper/services/cap_dns \ lib/libcompiler_rt \ lib/libnv \ lib/libpcap \ - secure/lib/libcrypto \ + lib/libthr \ + lib/ofed/libibverbs \ + lib/ofed/libmlx5 \ usr.bin/lex/lib \ Index: usr.sbin/traceroute/Makefile.depend =================================================================== --- usr.sbin/traceroute/Makefile.depend +++ usr.sbin/traceroute/Makefile.depend @@ -2,15 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcapsicum \ - lib/libcasper/libcasper \ - lib/libcasper/services/cap_dns \ lib/libcompiler_rt \ lib/libipsec \ lib/libnv \ Index: usr.sbin/tzsetup/Makefile.depend =================================================================== --- usr.sbin/tzsetup/Makefile.depend +++ usr.sbin/tzsetup/Makefile.depend @@ -2,15 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libdialog \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - lib/ncurses/ncursesw \ .include Index: usr.sbin/ypserv/Makefile.depend =================================================================== --- usr.sbin/ypserv/Makefile.depend +++ usr.sbin/ypserv/Makefile.depend @@ -2,7 +2,6 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/rpc \ @@ -11,7 +10,6 @@ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - lib/libwrap \ .include