[src/trunk]: src/external/cddl/osnet/usr.sbin/dtrace Use LDADD/DPADD instead ...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/98fd61dad683
branches:  trunk
changeset: 960701:98fd61dad683
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sat Mar 27 02:58:39 2021 +0000

description:
Use LDADD/DPADD instead of PROGDPLIBS - we are linking against installed
libraries.

Use compat/exec.mk - dtrace isn't compat32 friendly (yet?).

diffstat:

 external/cddl/osnet/usr.sbin/dtrace/Makefile |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (26 lines):

diff -r 90e700ead82d -r 98fd61dad683 external/cddl/osnet/usr.sbin/dtrace/Makefile
--- a/external/cddl/osnet/usr.sbin/dtrace/Makefile      Sat Mar 27 02:46:45 2021 +0000
+++ b/external/cddl/osnet/usr.sbin/dtrace/Makefile      Sat Mar 27 02:58:39 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2020/04/04 13:15:48 christos Exp $
+#      $NetBSD: Makefile,v 1.15 2021/03/27 02:58:39 simonb Exp $
 
 # $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -39,13 +39,9 @@
 COPTS.dtrace.c += -Wno-format
 
 LDFLAGS+=      -pthread
+LDADD+=                   -lctf     -ldtrace     -lelf     -lproc     -ly     -ll     -lz
+DPADD+=                ${LIBCTF} ${LIBDTRACE} ${LIBELF} ${LIBPROC} ${LIBY} ${LIBL} ${LIBZ}
 
-PROGDPLIBS+=   ctf ${.CURDIR}/../../lib/libctf
-PROGDPLIBS+=   dtrace ${.CURDIR}/../../lib/libdtrace
-PROGDPLIBS+=   elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
-PROGDPLIBS+=   proc ${NETBSDSRCDIR}/external/bsd/libproc/lib
-PROGDPLIBS+=   y ${NETBSDSRCDIR}/lib/liby
-PROGDPLIBS+=   l ${NETBSDSRCDIR}/external/bsd/flex/lib
-PROGDPLIBS+=   z ${NETBSDSRCDIR}/lib/libz
+.include "../../compat/exec.mk"
 
 .include <bsd.prog.mk>