From e0a4d74bbb8f4636596ba93c1d459e7f698b8738 Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Tue, 24 Mar 2015 08:24:55 +0000
Subject: MFC r278204:

Sort the entries by build knob, then MACHINE_ARCH like other areas of the tree

Sponsored by: EMC / Isilon Storage Division
---
 include/Makefile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/Makefile b/include/Makefile
index 4aa08ac..09b4080 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -58,14 +58,10 @@ LSUBDIRS=	cam/ata cam/scsi \
 	security/mac_mls security/mac_partition \
 	ufs/ffs ufs/ufs
 
-.if ${MK_USB} != "no"
-LSUBDIRS+=	dev/usb
-.endif
-
 LSUBSUBDIRS=	dev/mpt/mpilib
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
-_dev_powermac_nvram=	dev/powermac_nvram
+.if ${MK_BLUETOOTH} != "no"
+LSUBSUBDIRS+=	netgraph/bluetooth/include
 .endif
 
 .if ${MK_GPIB} != "no"
@@ -81,10 +77,6 @@ INCS+=		gssapi.h
 INCS+=	hesiod.h
 .endif
 
-.if ${MK_BLUETOOTH} != "no"
-LSUBSUBDIRS+=	netgraph/bluetooth/include
-.endif
-
 # XXX unconditionally needed by <netsmb/netbios.h>
 #.if ${MK_IPX} != "no"
 _netipx=	netipx
@@ -94,7 +86,14 @@ _netipx=	netipx
 .if ${MK_ICONV} == "yes"
 INCS+=		iconv.h
 .endif
-	
+
+.if ${MK_USB} != "no"
+LSUBDIRS+=	dev/usb
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+_dev_powermac_nvram=	dev/powermac_nvram
+.endif
 
 # Define SHARED to indicate whether you want symbolic links to the system
 # source (``symlinks''), or a separate copy (``copies'').  ``symlinks'' is
-- 
cgit v1.1