From 01df7d10a5af251d6f03fcd04bf84142b9282000 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Thu, 6 Jul 2017 04:15:30 +0000 Subject: [PATCH] Remove SUBDIR ordering/uniquifying in *bin/Makefile After the addition of SUBDIR.yes, uniquifying/ordering the SUBDIRs doesn't make a whole lot of sense, and it's in effect a half measure. Ordering SUBDIR (after adding SUBDIR.yes to it) in bsd.subdir.mk is a separate change that warrants more discussion/testing, because while the SUBDIR_PARALLEL work largely fixed dependency ordering for SUBDIRs, there might be downstream FreeBSD consumers that rely on the SUBDIR ordering. MFC after: 2 months Reviewed by: bdrewery Differential Revision: D11398 --- bin/Makefile | 2 -- sbin/Makefile | 2 -- usr.bin/Makefile | 2 -- usr.sbin/Makefile | 2 -- 4 files changed, 8 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index b3385dcd32d9..3e7571c27e61 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -47,8 +47,6 @@ SUBDIR.${MK_TESTS}+= tests .include -SUBDIR:= ${SUBDIR:O} - SUBDIR_PARALLEL= .include diff --git a/sbin/Makefile b/sbin/Makefile index 51e80bae8001..43f3cec7e03c 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -93,8 +93,6 @@ SUBDIR.${MK_TESTS}+= tests .include -SUBDIR:= ${SUBDIR:O} - SUBDIR_PARALLEL= .include diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 98f5a71f960c..c32ff16b5b02 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -306,8 +306,6 @@ SUBDIR+= mkesdb_static .include -SUBDIR:= ${SUBDIR:O:u} - SUBDIR_PARALLEL= .include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 0aa63a8fb947..b1b5c5026678 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -218,8 +218,6 @@ SUBDIR.${MK_TESTS}+= tests .include -SUBDIR:= ${SUBDIR:O} - SUBDIR_PARALLEL= .include