Date: Mon, 23 Mar 2020 17:45:31 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359249 - stable/12/share/mk Message-ID: <202003231745.02NHjVTW018794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Mar 23 17:45:31 2020 New Revision: 359249 URL: https://svnweb.freebsd.org/changeset/base/359249 Log: MFC r359046: Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions. This allows simplification of Makefiles where some SUBDIR entries depend on two things (e.g. something that depends on C++ and some other knob). Discussed with: imp, jhb Obtained from: CheriBSD Sponsored by: DARPA Modified: stable/12/share/mk/bsd.subdir.mk Directory Properties: stable/12/ (props changed) Modified: stable/12/share/mk/bsd.subdir.mk ============================================================================== --- stable/12/share/mk/bsd.subdir.mk Mon Mar 23 17:38:20 2020 (r359248) +++ stable/12/share/mk/bsd.subdir.mk Mon Mar 23 17:45:31 2020 (r359249) @@ -16,8 +16,8 @@ # # SUBDIR A list of subdirectories that should be built as well. # Each of the targets will execute the same target in the -# subdirectories. SUBDIR.yes is automatically appended -# to this list. +# subdirectories. SUBDIR.yes and SUBDIR.yes.yes are +# automatically appended to this list. # # +++ targets +++ # @@ -122,8 +122,8 @@ install: beforeinstall realinstall afterinstall # SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD .if !target(_SUBDIR) -.if defined(SUBDIR) || defined(SUBDIR.yes) -SUBDIR:=${SUBDIR} ${SUBDIR.yes} +.if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes) +SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes} SUBDIR:=${SUBDIR:u} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003231745.02NHjVTW018794>