From owner-svn-src-head@FreeBSD.ORG  Tue Oct 21 04:30:00 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E78D5842;
 Tue, 21 Oct 2014 04:30:00 +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 D37CCBAC;
 Tue, 21 Oct 2014 04:30:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9L4U06L011622;
 Tue, 21 Oct 2014 04:30:00 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9L4U0eU011621;
 Tue, 21 Oct 2014 04:30:00 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201410210430.s9L4U0eU011621@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 21 Oct 2014 04:30:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273365 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2014 04:30:01 -0000

Author: markj
Date: Tue Oct 21 04:30:00 2014
New Revision: 273365
URL: https://svnweb.freebsd.org/changeset/base/273365

Log:
  Fix a few small bugs in the DTrace USDT rules:
  * anchor search strings appropriately,
  * use .ALLSRC to pass the full path to the D script to dtrace(1),
  * don't insert the auto-generated header into SRCS - it doesn't
    accomplish anything, and we end up having to remove it from OBJS anyway.
  
  Reviewed by:		rpaulo
  Differential Revision:	https://reviews.freebsd.org/D978
  MFC after:		3 weeks
  Sponsored by:		EMC / Isilon Storage Division

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

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Tue Oct 21 02:41:40 2014	(r273364)
+++ head/share/mk/bsd.dep.mk	Tue Oct 21 04:30:00 2014	(r273365)
@@ -132,20 +132,17 @@ CFLAGS+=	-I${.OBJDIR}
 DHDRS+=	${_D}.h
 ${_D}.h: ${_DSRC}
 	${DTRACE} -xnolibs -h -s ${.ALLSRC}
-SRCS:=	${SRCS:S/${_DSRC}/${_D}.h/}
+SRCS:=	${SRCS:S/^${_DSRC}$//}
 OBJS+=	${_D}.o
 CLEANFILES+= ${_D}.h ${_D}.o
-${_D}.o: ${_D}.h ${OBJS:S/${_D}.o//}
-	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
-		${OBJS:S/${_D}.o//}
+${_D}.o: ${_DSRC} ${OBJS:S/^${_D}.o$//}
+	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.ALLSRC}
 .if defined(LIB)
 CLEANFILES+= ${_D}.So ${_D}.po
-${_D}.So: ${_D}.h ${SOBJS:S/${_D}.So//}
-	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
-		${SOBJS:S/${_D}.So//}
-${_D}.po: ${_D}.h ${POBJS:S/${_D}.po//}
-	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
-		${POBJS:S/${_D}.po//}
+${_D}.So: ${_DSRC} ${SOBJS:S/^${_D}.So$//}
+	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.ALLSRC}
+${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//}
+	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.ALLSRC}
 .endif
 .endfor
 .endfor