svn commit: r294751 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Mon Jan 25 22:29:43 UTC 2016
Author: bdrewery
Date: Mon Jan 25 22:29:41 2016
New Revision: 294751
URL: https://svnweb.freebsd.org/changeset/base/294751
Log:
Remove unneeded beforebuild hacks for dtrace probes.
This still allows skipping 'make depend'. Headers in SRCS generate
properly.
MFC after: 1 week
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 Mon Jan 25 22:29:32 2016 (r294750)
+++ head/share/mk/bsd.dep.mk Mon Jan 25 22:29:41 2016 (r294751)
@@ -129,7 +129,7 @@ CFLAGS+= -I${.OBJDIR}
.endif
.for _DSRC in ${SRCS:M*.d:N*/*}
.for _D in ${_DSRC:R}
-DHDRS+= ${_D}.h
+SRCS+= ${_D}.h
${_D}.h: ${_DSRC}
${DTRACE} ${DTRACEFLAGS} -h -s ${.ALLSRC}
SRCS:= ${SRCS:S/^${_DSRC}$//}
@@ -137,20 +137,18 @@ OBJS+= ${_D}.o
CLEANFILES+= ${_D}.h ${_D}.o
${_D}.o: ${_DSRC} ${OBJS:S/^${_D}.o$//}
@rm -f ${.TARGET}
- ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC}
+ ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
.if defined(LIB)
CLEANFILES+= ${_D}.So ${_D}.po
${_D}.So: ${_DSRC} ${SOBJS:S/^${_D}.So$//}
@rm -f ${.TARGET}
- ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC}
+ ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//}
@rm -f ${.TARGET}
- ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC}
+ ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h}
.endif
.endfor
.endfor
-beforedepend: ${DHDRS}
-beforebuild: ${DHDRS}
.if ${MK_FAST_DEPEND} == "yes" && \
More information about the svn-src-head
mailing list