From owner-svn-src-head@FreeBSD.ORG  Mon Apr 27 06:34:52 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9D32E50D;
 Mon, 27 Apr 2015 06:34:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8BCB2168F;
 Mon, 27 Apr 2015 06:34:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R6YqS9048391;
 Mon, 27 Apr 2015 06:34:52 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R6YqXu048390;
 Mon, 27 Apr 2015 06:34:52 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201504270634.t3R6YqXu048390@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 27 Apr 2015 06:34:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282054 - head/usr.sbin/bluetooth
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Apr 2015 06:34:52 -0000

Author: ngie
Date: Mon Apr 27 06:34:51 2015
New Revision: 282054
URL: https://svnweb.freebsd.org/changeset/base/282054

Log:
  ath3kfw, bcmfw, bthidcontrol, bthidd all require usb(4); build them
  conditionally if MK_USB != no
  
  MFC after: 1 week

Modified:
  head/usr.sbin/bluetooth/Makefile

Modified: head/usr.sbin/bluetooth/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/Makefile	Mon Apr 27 06:02:47 2015	(r282053)
+++ head/usr.sbin/bluetooth/Makefile	Mon Apr 27 06:34:51 2015	(r282054)
@@ -1,12 +1,10 @@
 # $Id: Makefile,v 1.5 2003/09/08 02:28:35 max Exp $
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SUBDIR= \
-	ath3kfw \
-	bcmfw \
 	bt3cfw \
-	bthidcontrol \
-	bthidd \
 	btpand \
 	hccontrol \
 	hcsecd \
@@ -17,5 +15,12 @@ SUBDIR= \
 	sdpcontrol \
 	sdpd
 
+.if ${MK_USB} != "no"
+SUBDIR+=	ath3kfw
+SUBDIR+=	bcmfw
+SUBDIR+=	bthidcontrol
+SUBDIR+=	bthidd
+.endif
+
 .include <bsd.subdir.mk>