Author: bdrewery
Date: Fri Jun 23 20:38:21 2017
New Revision: 320298
URL: https://svnweb.freebsd.org/changeset/base/320298
Log:
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)
Modified:
stable/11/share/mk/bsd.dep.mk
stable/11/share/mk/bsd.init.mk
stable/11/sys/conf/kern.post.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.dep.mk
==============================================================================
--- stable/11/share/mk/bsd.dep.mk Fri Jun 23 20:25:58 2017
(r320297)
+++ stable/11/share/mk/bsd.dep.mk Fri Jun 23 20:38:21 2017
(r320298)
@@ -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
Modified: stable/11/share/mk/bsd.init.mk
==============================================================================
--- stable/11/share/mk/bsd.init.mk Fri Jun 23 20:25:58 2017
(r320297)
+++ stable/11/share/mk/bsd.init.mk Fri Jun 23 20:38:21 2017
(r320298)
@@ -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
Modified: stable/11/sys/conf/kern.post.mk
==============================================================================
--- stable/11/sys/conf/kern.post.mk Fri Jun 23 20:25:58 2017
(r320297)
+++ stable/11/sys/conf/kern.post.mk Fri Jun 23 20:38:21 2017
(r320298)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
