diff --git a/lib/libcasper/Makefile.depend b/lib/libcasper/libcasper/Makefile.depend similarity index 89% rename from lib/libcasper/Makefile.depend rename to lib/libcasper/libcasper/Makefile.depend index 529a2cf21c6..4f7989bd2e6 100644 --- a/lib/libcasper/Makefile.depend +++ b/lib/libcasper/libcasper/Makefile.depend @@ -8,10 +8,8 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libcapsicum \ lib/libcompiler_rt \ lib/libnv \ - lib/libpjdlog \ .include diff --git a/lib/libcasper/services/cap_dns/Makefile.depend b/lib/libcasper/services/cap_dns/Makefile.depend new file mode 100644 index 00000000000..fcd81696889 --- /dev/null +++ b/lib/libcasper/services/cap_dns/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + 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 diff --git a/lib/libcasper/services/cap_grp/Makefile.depend b/lib/libcasper/services/cap_grp/Makefile.depend new file mode 100644 index 00000000000..fcd81696889 --- /dev/null +++ b/lib/libcasper/services/cap_grp/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + 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 diff --git a/lib/libcasper/services/cap_pwd/Makefile.depend b/lib/libcasper/services/cap_pwd/Makefile.depend new file mode 100644 index 00000000000..fcd81696889 --- /dev/null +++ b/lib/libcasper/services/cap_pwd/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + 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 diff --git a/lib/libcasper/services/cap_random/Makefile.depend b/lib/libcasper/services/cap_random/Makefile.depend new file mode 100644 index 00000000000..fcd81696889 --- /dev/null +++ b/lib/libcasper/services/cap_random/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + 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 diff --git a/lib/libcasper/services/cap_sysctl/Makefile.depend b/lib/libcasper/services/cap_sysctl/Makefile.depend new file mode 100644 index 00000000000..fcd81696889 --- /dev/null +++ b/lib/libcasper/services/cap_sysctl/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + gnu/lib/csu \ + gnu/lib/libgcc \ + 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 diff --git a/sbin/ping/Makefile.depend b/sbin/ping/Makefile.depend index 52225631112..575acedacc0 100644 --- a/sbin/ping/Makefile.depend +++ b/sbin/ping/Makefile.depend @@ -10,7 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcasper/libcasper \ - lib/libcasper/services \ + lib/libcasper/services/cap_dns \ lib/libcompiler_rt \ lib/libipsec \ lib/libnv \ diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend index 2ef018f8fd2..5c6581b8f2d 100644 --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/targets/pseudo/userland/gnu/Makefile.depend @@ -27,7 +27,6 @@ DIRDEPS = \ gnu/usr.bin/binutils/libbinutils \ gnu/usr.bin/binutils/libiberty \ gnu/usr.bin/binutils/libopcodes \ - gnu/usr.bin/binutils/objcopy \ gnu/usr.bin/binutils/objdump \ gnu/usr.bin/binutils/ranlib \ gnu/usr.bin/dialog \ @@ -112,6 +111,10 @@ DIRDEPS = \ gnu/usr.bin/texinfo/makeinfo \ gnu/usr.bin/texinfo/texindex \ +.if ${MK_ELFCOPY_AS_OBJCOPY} == "no" +DIRDEPS+= gnu/usr.bin/binutils/objcopy +.endif + .if ${MK_GPL_DTC} != "no" DIRDEPS+= gnu/usr.bin/dtc .endif diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend index bfd444f96a6..1ef12f0bf06 100644 --- a/targets/pseudo/userland/lib/Makefile.depend +++ b/targets/pseudo/userland/lib/Makefile.depend @@ -188,7 +188,7 @@ DIRDEPS+= lib/libnandfs .if ${MK_CASPER} != "no" DIRDEPS+= \ - lib/libcasper \ + lib/libcasper/libcasper \ lib/libcasper/services/cap_dns \ lib/libcasper/services/cap_grp \ lib/libcasper/services/cap_pwd \ diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend index 4faacfd9bdc..71c82136392 100644 --- a/usr.bin/kdump/Makefile.depend +++ b/usr.bin/kdump/Makefile.depend @@ -9,7 +9,9 @@ DIRDEPS = \ 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 \ diff --git a/usr.sbin/tcpdump/tcpdump/Makefile.depend b/usr.sbin/tcpdump/tcpdump/Makefile.depend index 52b19946972..cce87b47f74 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile.depend +++ b/usr.sbin/tcpdump/tcpdump/Makefile.depend @@ -10,7 +10,8 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libcapsicum \ + lib/libcasper/libcasper \ + lib/libcasper/services/cap_dns \ lib/libcompiler_rt \ lib/libnv \ lib/libpcap \