Date: Tue, 24 Mar 2015 08:27:02 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r280428 - stable/9/include Message-ID: <201503240827.t2O8R2kH026814@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Mar 24 08:27:01 2015 New Revision: 280428 URL: https://svnweb.freebsd.org/changeset/base/280428 Log: MFstable/10 r280427: 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/9/include/Makefile Directory Properties: stable/9/ (props changed) stable/9/include/ (props changed) Modified: stable/9/include/Makefile ============================================================================== --- stable/9/include/Makefile Tue Mar 24 08:24:55 2015 (r280427) +++ stable/9/include/Makefile Tue Mar 24 08:27:01 2015 (r280428) @@ -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" @@ -85,10 +81,6 @@ INCS+= hesiod.h INCS+= iconv.h .endif -.if ${MK_BLUETOOTH} != "no" -LSUBSUBDIRS+= netgraph/bluetooth/include -.endif - # XXX unconditionally needed by <netsmb/netbios.h> #.if ${MK_IPX} != "no" _netipx= netipx @@ -99,6 +91,14 @@ _netncp= netncp _fs_nwfs= fs/nwfs .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 # probably only useful for developers and should be avoided if you do not
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503240827.t2O8R2kH026814>