diff options
| author | imp <imp@FreeBSD.org> | 2015-08-27 01:55:00 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-08-27 01:55:00 +0000 |
| commit | 441e2dd32dfc3e4489426bfeee7b51682b747326 (patch) | |
| tree | 4810e745957f719507a2a0203af678992d20403a | |
| parent | 979fd50373ee4cb704438796324ec9f8c5bee236 (diff) | |
| download | FreeBSD-src-441e2dd32dfc3e4489426bfeee7b51682b747326.zip FreeBSD-src-441e2dd32dfc3e4489426bfeee7b51682b747326.tar.gz | |
Automatically append SUBDIR.yes to the SUBDIR variable, and
remove duplicates. We cannot sort SUBDIR because many Makefiles
have .WAIT in the list which is strongly ordering. Rather than
try to second guess when to sort and when to not sort depending
on .WAIT being in the list, just remove duplicates.
| -rw-r--r-- | share/mk/bsd.subdir.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index e1b1276..8fab656 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -16,7 +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. +# subdirectories. SUBDIR.yes is automatically appeneded +# to this list. # # +++ targets +++ # @@ -43,6 +44,11 @@ _SUBDIR: .endif .if !target(_SUBDIR) +.if defined(SUBDIR) +SUBDIR:=${SUBDIR} ${SUBDIR.yes} +SUBDIR:=${SUBDIR:u} +.endif + DISTRIBUTION?= base .if !target(distribute) distribute: .MAKE |
