From 23d1e148af7f38da41431e66f6ac943884dee98c Mon Sep 17 00:00:00 2001
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Wed, 7 Jul 2004 22:48:30 +0000
Subject: [PATCH] Make bluetooth compile on all platforms

Reviewed by:	imp, ru
---
 lib/Makefile                  |  3 ++-
 sys/modules/netgraph/Makefile | 11 ++++-------
 usr.bin/Makefile              |  7 ++++---
 usr.sbin/Makefile             |  7 ++++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index cc1678b3e184..48098e910b45 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -51,11 +51,12 @@ _libngatm=	libngatm
 _libbind=	libbind
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
 .if !defined(NO_BLUETOOTH)
 _libbluetooth=	libbluetooth
 _libsdp=	libsdp
 .endif
+
+.if ${MACHINE_ARCH} == "i386"
 _compat=	compat
 _libncp=	libncp
 _libsmb=	libsmb
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index 7d52da46c673..150177c2af7e 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -40,15 +40,12 @@ SUBDIR=	UI \
 	vjc \
 	vlan
 
+.if !defined(NO_BLUETOOTH) || defined(ALL_MODULES)
+_bluetooth=	bluetooth
+.endif
+
 .if !defined(NOCRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c)
 _mppc=		mppc
 .endif
 
-.if ${MACHINE_ARCH} == "i386"
-# Things that don't compile on alpha or are aout specific:
-.if !defined(NO_BLUETOOTH) || defined(ALL_MODULES)
-_bluetooth=	bluetooth
-.endif
-.endif
-
 .include <bsd.subdir.mk>
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 09d818d5a21b..450110d9e15d 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -240,6 +240,10 @@ _dnsquery=	dnsquery
 _host=		host
 .endif
 
+.if !defined(NO_BLUETOOTH)
+_bluetooth=	bluetooth
+.endif
+
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 _chkey=		chkey
 _newkey=	newkey
@@ -266,9 +270,6 @@ _usbhidctl=	usbhidctl
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
-.if !defined(NO_BLUETOOTH)
-_bluetooth=	bluetooth
-.endif
 _ncplist=	ncplist
 _ncplogin=	ncplogin
 _smbutil=	smbutil
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 732613a5fcca..52e29b5f58f5 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -199,6 +199,10 @@ _nslookup=	nslookup
 _nsupdate=	nsupdate
 .endif
 
+.if !defined(NO_BLUETOOTH)
+_bluetooth=	bluetooth
+.endif
+
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 _keyserv=	keyserv
 .endif
@@ -245,9 +249,6 @@ _acpi=		acpi
 _apm=		apm
 _apmd=		apmd
 _asf=		asf
-.if !defined(NO_BLUETOOTH)
-_bluetooth=	bluetooth
-.endif
 .if ${MACHINE} == "i386"
 _arlcontrol=	arlcontrol
 _boot0cfg=	boot0cfg