diff options
| -rw-r--r-- | lib/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/netgraph/Makefile | 9 | ||||
| -rw-r--r-- | usr.bin/Makefile | 7 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 7 |
4 files changed, 13 insertions, 13 deletions
diff --git a/lib/Makefile b/lib/Makefile index cc1678b..48098e9 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 7d52da4..150177c 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -40,15 +40,12 @@ SUBDIR= UI \ vjc \ vlan -.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 + +.if !defined(NOCRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c) +_mppc= mppc .endif .include <bsd.subdir.mk> diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 09d818d..450110d 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 732613a..52e29b5 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 |
