svn commit: r283133 - in head/cddl: lib/libdtrace usr.sbin/dtrace

[Baptiste Daroussin]

Author: bapt
Date: Tue May 19 22:24:19 2015
New Revision: 283133
URL: https://svnweb.freebsd.org/changeset/base/283133

Log:
  Correctly link libdtrace and convert to LIBADD
  Make dtrace only link to libdtrace

Modified:
  head/cddl/lib/libdtrace/Makefile
  head/cddl/usr.sbin/dtrace/Makefile

Modified: head/cddl/lib/libdtrace/Makefile
==============================================================================
--- head/cddl/lib/libdtrace/Makefile	Tue May 19 22:23:15 2015	(r283132)
+++ head/cddl/lib/libdtrace/Makefile	Tue May 19 22:24:19 2015	(r283133)
@@ -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:

Modified: head/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/Makefile	Tue May 19 22:23:15 2015	(r283132)
+++ head/cddl/usr.sbin/dtrace/Makefile	Tue May 19 22:24:19 2015	(r283133)
@@ -20,9 +20,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 #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>