svn commit: r280427 - stable/10/include

[Garrett Cooper]

Author: ngie
Date: Tue Mar 24 08:24:55 2015
New Revision: 280427
URL: https://svnweb.freebsd.org/changeset/base/280427

Log:
  MFC r278204:
  
  Sort the entries by build knob, then MACHINE_ARCH like other areas of the tree
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/include/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/include/Makefile
==============================================================================
--- stable/10/include/Makefile	Tue Mar 24 08:22:48 2015	(r280426)
+++ stable/10/include/Makefile	Tue Mar 24 08:24:55 2015	(r280427)
@@ -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