summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2017-06-23 20:38:21 +0000
committerbdrewery <bdrewery@FreeBSD.org>2017-06-23 20:38:21 +0000
commitec792d6a0c9e4ddf9433bec303b18032c5c1ddb8 (patch)
treee94aac8ecd4547b70bcebc48fef1b9972c4f8dcf
parent5231d6b380c96054725986f2e843ab210febc253 (diff)
downloadFreeBSD-src-ec792d6a0c9e4ddf9433bec303b18032c5c1ddb8.zip
FreeBSD-src-ec792d6a0c9e4ddf9433bec303b18032c5c1ddb8.tar.gz
MFC r320174,r320204:
r320174: Fix 'make clean all' to work again. r320204: Fix various 'make *clean *all *install' combinations. PR: 219819 Approved by: re (gjb)
-rw-r--r--share/mk/bsd.dep.mk2
-rw-r--r--share/mk/bsd.init.mk5
-rw-r--r--sys/conf/kern.post.mk6
3 files changed, 7 insertions, 6 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 04f54cf..ab5cabc 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -90,7 +90,7 @@ _meta_filemon= 1
.if defined(_SKIP_BUILD) || defined(_meta_filemon)
_SKIP_READ_DEPEND= 1
.if ${MK_DIRDEPS_BUILD} == "no" || make(analyze) || make(print-dir) || \
- make(obj) || make(clean*) || make(destroy*)
+ make(obj) || (!make(all) && (make(clean*) || make(destroy*)))
.MAKE.DEPENDFILE= /dev/null
.endif
.endif
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index bab4e23..ce3b3a4 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -50,8 +50,9 @@ $xGRP= ${_gid}
_SKIP_BUILD= not building at level 0
.elif !empty(.MAKEFLAGS:M-V${_V_DO_BUILD}) || \
${.TARGETS:M*install*} == ${.TARGETS} || \
- make(clean*) || make(obj) || make(analyze) || make(print-dir) || \
- make(destroy*)
+ ${.TARGETS:Mclean*} == ${.TARGETS} || \
+ ${.TARGETS:Mdestroy*} == ${.TARGETS} || \
+ make(obj) || make(analyze) || make(print-dir)
# Skip building, but don't show a warning.
_SKIP_BUILD=
.endif
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index aa6cc60..3d03363 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -200,10 +200,10 @@ _meta_filemon= 1
# 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*) || \
+.if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(*obj) || \
+ ${.TARGETS:M*clean*} == ${.TARGETS} || \
${.TARGETS:M*install*} == ${.TARGETS} || \
- make(kernel-obj) || make(kernel-clean*) || \
- make(kernel-install*) || defined(_meta_filemon)
+ defined(_meta_filemon)
_SKIP_READ_DEPEND= 1
.MAKE.DEPENDFILE= /dev/null
.endif
OpenPOWER on IntegriCloud