svn commit: r337481 - stable/11/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Wed Aug 8 18:50:33 UTC 2018
Author: bdrewery
Date: Wed Aug 8 18:50:32 2018
New Revision: 337481
URL: https://svnweb.freebsd.org/changeset/base/337481
Log:
MFC r326552:
Fix DPSRCS not getting .depend.* files.
Modified:
stable/11/share/mk/bsd.dep.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.dep.mk
==============================================================================
--- stable/11/share/mk/bsd.dep.mk Wed Aug 8 18:48:40 2018 (r337480)
+++ stable/11/share/mk/bsd.dep.mk Wed Aug 8 18:50:32 2018 (r337481)
@@ -177,6 +177,7 @@ DEPEND_MP?= -MP
# avoid collisions.
DEPEND_FILTER= C,/,_,g
DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc}
+DEPENDSRCS+= ${DPSRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc}
.if !empty(DEPENDSRCS)
DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,}
.endif
@@ -264,13 +265,12 @@ depend: beforedepend ${DEPENDFILE} afterdepend
# Tell bmake not to look for generated files via .PATH
.NOPATH: ${DEPENDFILE} ${DEPENDFILES_OBJS}
-DPSRCS+= ${SRCS}
# A .depend file will only be generated if there are commands in
# beforedepend/_EXTRADEPEND/afterdepend The _EXTRADEPEND target is
# ignored if using meta+filemon since it handles all dependencies. The other
# targets are kept as they be used for generating something. The target is
# kept to allow 'make depend' to generate files.
-${DEPENDFILE}: ${DPSRCS}
+${DEPENDFILE}: ${SRCS} ${DPSRCS}
.if exists(${.OBJDIR}/${DEPENDFILE}) || \
((commands(beforedepend) || \
(!defined(_meta_filemon) && commands(_EXTRADEPEND)) || \
More information about the svn-src-all
mailing list