Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 10 Aug 2014 06:43:40 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r269775 - head/share/mk
Message-ID:  <53e7149c.23c9.59b20a2b@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: rpaulo
Date: Sun Aug 10 06:43:40 2014
New Revision: 269775
URL: http://svnweb.freebsd.org/changeset/base/269775

Log:
  Fix a few problems with the USDT probes:
  
  * Include OBJDIR to make sure the generated file is found;
  * Simplify the definition of OBJS;
  * Add targets for shared objects and for profiled objects.
  
  MFC after:	3 days

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

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Sun Aug 10 06:10:21 2014	(r269774)
+++ head/share/mk/bsd.dep.mk	Sun Aug 10 06:43:40 2014	(r269775)
@@ -125,21 +125,26 @@ ${_YC:R}.o: ${_YC}
 .if ${SRCS:M*.d}
 LDFLAGS+=	-lelf
 LDADD+=		${LIBELF}
-CFLAGS+=	-D_DTRACE_VERSION=1
+CFLAGS+=	-D_DTRACE_VERSION=1 -I${.OBJDIR}
 .endif
 .for _DSRC in ${SRCS:M*.d:N*/*}
 .for _D in ${_DSRC:R}
 ${_D}.h: ${_DSRC}
 	${DTRACE} -xnolibs -h -s ${.ALLSRC}
 SRCS:=	${SRCS:S/${_DSRC}/${_D}.h/}
-${_D}.o: ${_D}.h ${_DSRC} ${OBJS} ${SOBJS}
-	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${_DSRC} \
-		${OBJS:S/${_D}.o//} ${SOBJS:S/${_D}.o//}
-CLEANFILES+= ${_D}.h ${_D}.o
-.if defined(PROG)
 OBJS+=	${_D}.o
-.else
-SOBJS+=	${_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//}
+.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//}
 .endif
 .endfor
 .endfor

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e7149c.23c9.59b20a2b>