From 7742be6fb696f967878e52a99bdf7f86eb969838 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Wed, 24 Aug 2016 02:23:03 +0000 Subject: MFC r304697: FAST_DEPEND: Fix 'make all install' not properly rebuilding based on .depend.* files. --- share/mk/bsd.dep.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share/mk') diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index bddf575..064b829 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -76,12 +76,13 @@ tags: ${SRCS} _meta_filemon= 1 .endif -# Skip reading .depend when not needed to speed up tree-walks -# and simple lookups. +# Skip reading .depend when not needed to speed up tree-walks and simple +# lookups. For install, only do this if no other targets are specified. # Also skip generating or including .depend.* files if in meta+filemon mode # since it will track dependencies itself. OBJS_DEPEND_GUESS is still used. .if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(obj) || make(clean*) || \ - make(install*) || make(analyze) || defined(_meta_filemon) + ${.TARGETS:M*install*} == ${.TARGETS} || \ + make(analyze) || defined(_meta_filemon) _SKIP_READ_DEPEND= 1 .if ${MK_DIRDEPS_BUILD} == "no" .MAKE.DEPENDFILE= /dev/null -- cgit v1.1