From owner-svn-src-all@FreeBSD.ORG  Tue May 19 22:24:20 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BF9E2132;
 Tue, 19 May 2015 22:24:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AEC781EA7;
 Tue, 19 May 2015 22:24:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4JMOKR9025317;
 Tue, 19 May 2015 22:24:20 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4JMOKIg025314;
 Tue, 19 May 2015 22:24:20 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201505192224.t4JMOKIg025314@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 19 May 2015 22:24:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283133 - in head/cddl: lib/libdtrace usr.sbin/dtrace
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 May 2015 22:24:20 -0000

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>