diff options
| -rw-r--r-- | cddl/usr.bin/ctfconvert/Makefile.depend | 2 | ||||
| -rw-r--r-- | cddl/usr.bin/ctfdump/Makefile.depend | 2 | ||||
| -rw-r--r-- | cddl/usr.bin/ctfmerge/Makefile.depend | 3 | ||||
| -rw-r--r-- | cddl/usr.sbin/dtrace/Makefile.depend | 3 | ||||
| -rw-r--r-- | targets/pseudo/userland/cddl/Makefile.depend | 11 |
5 files changed, 4 insertions, 17 deletions
diff --git a/cddl/usr.bin/ctfconvert/Makefile.depend b/cddl/usr.bin/ctfconvert/Makefile.depend index 5331c43..9dafcb6 100644 --- a/cddl/usr.bin/ctfconvert/Makefile.depend +++ b/cddl/usr.bin/ctfconvert/Makefile.depend @@ -2,14 +2,12 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - cddl/lib/libctf \ gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libdwarf \ lib/libelf \ diff --git a/cddl/usr.bin/ctfdump/Makefile.depend b/cddl/usr.bin/ctfdump/Makefile.depend index fcfe6ac..ff9d795 100644 --- a/cddl/usr.bin/ctfdump/Makefile.depend +++ b/cddl/usr.bin/ctfdump/Makefile.depend @@ -8,10 +8,8 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libelf \ - lib/libthr \ lib/libz \ diff --git a/cddl/usr.bin/ctfmerge/Makefile.depend b/cddl/usr.bin/ctfmerge/Makefile.depend index 5331c43..e94f8d4 100644 --- a/cddl/usr.bin/ctfmerge/Makefile.depend +++ b/cddl/usr.bin/ctfmerge/Makefile.depend @@ -2,16 +2,13 @@ # Autogenerated - do NOT edit! DIRDEPS = \ - cddl/lib/libctf \ gnu/lib/csu \ gnu/lib/libgcc \ include \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ - lib/libdwarf \ lib/libelf \ lib/libthr \ lib/libz \ diff --git a/cddl/usr.sbin/dtrace/Makefile.depend b/cddl/usr.sbin/dtrace/Makefile.depend index 9971af1..8197069 100644 --- a/cddl/usr.sbin/dtrace/Makefile.depend +++ b/cddl/usr.sbin/dtrace/Makefile.depend @@ -10,7 +10,6 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libcxxrt \ lib/libelf \ @@ -18,9 +17,7 @@ DIRDEPS = \ lib/librtld_db \ lib/libthr \ lib/libutil \ - lib/liby \ lib/libz \ - usr.bin/lex/lib \ .include <dirdeps.mk> diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend index 00524e9..f1224a2 100644 --- a/targets/pseudo/userland/cddl/Makefile.depend +++ b/targets/pseudo/userland/cddl/Makefile.depend @@ -9,19 +9,17 @@ DIRDEPS = \ cddl/lib/drti \ cddl/lib/libavl \ + cddl/lib/libctf \ + cddl/lib/libdtrace \ cddl/lib/libnvpair \ cddl/lib/libumem \ cddl/lib/libuutil \ - - -DIRDEPS.CTF = \ - cddl/lib/libctf \ cddl/usr.bin/ctfconvert \ cddl/usr.bin/ctfdump \ cddl/usr.bin/ctfmerge \ - cddl/lib/libdtrace \ cddl/usr.sbin/dtrace \ cddl/usr.sbin/dtruss \ + cddl/usr.sbin/lockstat \ DIRDEPS.ZFS = \ @@ -33,12 +31,11 @@ DIRDEPS.ZFS = \ cddl/usr.bin/zinject \ cddl/usr.bin/zstreamdump \ cddl/usr.bin/ztest \ - cddl/usr.sbin/lockstat \ cddl/usr.sbin/zdb \ cddl/usr.sbin/zhack \ -.for O in CTF ZFS +.for O in ZFS .if ${MK_$O} == "yes" DIRDEPS+= ${DIRDEPS.$O} .endif |
