Correctly link libdtrace and convert to LIBADD

Make dtrace only link to libdtrace
2015-05-19 22:24:19 +00:00 · 2015-05-19 22:24:19 +00:00 · fbae1f6006
commit fbae1f6006
parent b0b03f5209
2 changed files with 3 additions and 4 deletions
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@ -104,6 +104,8 @@ LFLAGS+=-l

 YFLAGS+=-d

+LIBADD=	ctf elf proc pthread rtld_db
+
 CLEANFILES=	dt_errtags.c dt_names.c

 dt_errtags.c:
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@ -20,9 +20,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 #CFLAGS+=	-DNEED_ERRLOC
 #YFLAGS+=	-d

-DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
-		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
-LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \
-		-lrtld_db
+LIBADD=	dtrace

 .include <bsd.prog.mk>