From owner-svn-src-all@FreeBSD.ORG  Fri Sep 10 17:44:12 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CE7F1065674;
	Fri, 10 Sep 2010 17:44:12 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C4BE8FC24;
	Fri, 10 Sep 2010 17:44:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8AHiCwv071744;
	Fri, 10 Sep 2010 17:44:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8AHiCGD071742;
	Fri, 10 Sep 2010 17:44:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201009101744.o8AHiCGD071742@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 10 Sep 2010 17:44:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212428 - head/share/mk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 10 Sep 2010 17:44:12 -0000

Author: rpaulo
Date: Fri Sep 10 17:44:11 2010
New Revision: 212428
URL: http://svn.freebsd.org/changeset/base/212428

Log:
  Fix bugs introduced in the previous rev:
  * add a phatom target for the DTRACEOBJS
  * when invoking DTrace, don't add DTRACEOBJS to the command line.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/mk/bsd.dtrace.mk

Modified: head/share/mk/bsd.dtrace.mk
==============================================================================
--- head/share/mk/bsd.dtrace.mk	Fri Sep 10 17:26:41 2010	(r212427)
+++ head/share/mk/bsd.dtrace.mk	Fri Sep 10 17:44:11 2010	(r212428)
@@ -37,19 +37,23 @@ CFLAGS+=-DWITH_DTRACE
 DTRACEHEADERS=${DTRACEOBJS:S/o$/h/}
 DTRACESRCS=${DTRACEOBJS:S/o$/d/}
 CLEANFILES+=${DTRACEOBJS} ${DTRACEHEADERS}
+
+DPADD+=${LIBELF}
+LDADD+=-lelf
+
 .if defined(PROG)
-_DTRACELINKING:=${OBJS}
+_DTRACELINKING=${OBJS}
 OBJS+=${DTRACEOBJS}
 .else
-_DTRACELINKING:=${SOBJS}
+_DTRACELINKING=${SOBJS}
 SOBJS+=${DTRACEOBJS}
 .endif
-DPADD+=${LIBELF}
-LDADD+=-lelf
+
+${DTRACEOBJS}:
 
 beforedepend:
 	${DTRACE} -C -h -s ${DTRACESRCS}
 beforelinking:
-	${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING}
+	${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING:S/${DTRACEOBJS}//}
 
 .endif