svn commit: r212428 - head/share/mk

[Rui Paulo]

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