Convert usr.sbin to LIBADD

Reduce overlinking

12 files changed, 12 insertions, 24 deletions

diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile b/usr.sbin/bluetooth/ath3kfw/Makefile
index 373655b..26ce06e 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile
@@ -2,7 +2,6 @@
 
 PROG=		ath3kfw
 MAN=		ath3kfw.8
-DPADD+=		${LIBUSB}
-LDADD+=		-lusb
+LIBADD+=	usb
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/bt3cfw/Makefile b/usr.sbin/bluetooth/bt3cfw/Makefile
index 90bf751..f9da6ca 100644
--- a/usr.sbin/bluetooth/bt3cfw/Makefile
+++ b/usr.sbin/bluetooth/bt3cfw/Makefile
@@ -5,7 +5,6 @@ PROG=		bt3cfw
 MAN=		bt3cfw.8
 WARNS?=		2
 
-DPADD=		${LIBNETGRAPH}
-LDADD=		-lnetgraph
+LIBADD+=	netgraph
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/bthidcontrol/Makefile b/usr.sbin/bluetooth/bthidcontrol/Makefile
index 6c9eafb..09128d6 100644
--- a/usr.sbin/bluetooth/bthidcontrol/Makefile
+++ b/usr.sbin/bluetooth/bthidcontrol/Makefile
@@ -9,7 +9,6 @@ SRCS=		bthidcontrol.c hid.c lexer.l  parser.y sdp.c
 WARNS?=		1
 CFLAGS+=	-DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBUSBHID}
-LDADD=		-lbluetooth -lsdp -lusbhid
+LIBADD+=	bluetooth sdp usbhid
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile
index fe6ef33..587189b 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile
+++ b/usr.sbin/bluetooth/bthidd/Makefile
@@ -10,8 +10,7 @@ SRCS=		bthidd.c client.c hid.c kbd.c lexer.l parser.y server.c \
 CFLAGS+=	-I${.CURDIR}
 DEBUG_FLAGS=	-g
 
-DPADD=          ${LIBBLUETOOTH} ${LIBUSBHID}
-LDADD=		-lbluetooth -lusbhid
+LIBADD+=	bluetooth usbhid
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
diff --git a/usr.sbin/bluetooth/btpand/Makefile b/usr.sbin/bluetooth/btpand/Makefile
index 5e4bb0b..0689d17 100644
--- a/usr.sbin/bluetooth/btpand/Makefile
+++ b/usr.sbin/bluetooth/btpand/Makefile
@@ -7,7 +7,6 @@ SRCS=	btpand.c bnep.c channel.c client.c event.c packet.c server.c sdp.c tap.c
 
 WARNS?=	3
 
-DPADD+=	${LIBBLUETOOTH} ${LIBSDP} ${LIBUTIL}
-LDADD+=	-lbluetooth -lsdp -lutil
+LIBADD=	bluetooth sdp util
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/hccontrol/Makefile b/usr.sbin/bluetooth/hccontrol/Makefile
index 592247e..61206df 100644
--- a/usr.sbin/bluetooth/hccontrol/Makefile
+++ b/usr.sbin/bluetooth/hccontrol/Makefile
@@ -8,7 +8,6 @@ SRCS=		send_recv.c link_policy.c link_control.c \
 		util.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/hcsecd/Makefile b/usr.sbin/bluetooth/hcsecd/Makefile
index e544ed4..684243d 100644
--- a/usr.sbin/bluetooth/hcsecd/Makefile
+++ b/usr.sbin/bluetooth/hcsecd/Makefile
@@ -7,7 +7,6 @@ SRCS=		hcsecd.c lexer.l parser.y
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR}
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/hcseriald/Makefile b/usr.sbin/bluetooth/hcseriald/Makefile
index ed0bf32..e02e1ae 100644
--- a/usr.sbin/bluetooth/hcseriald/Makefile
+++ b/usr.sbin/bluetooth/hcseriald/Makefile
@@ -5,7 +5,6 @@ PROG=		hcseriald
 MAN=		hcseriald.8
 WARNS?=		2
 
-DPADD=		${LIBNETGRAPH}
-LDADD=		-lnetgraph
+LIBADD=		netgraph
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/l2control/Makefile b/usr.sbin/bluetooth/l2control/Makefile
index 847ff4b..8f17e02 100644
--- a/usr.sbin/bluetooth/l2control/Makefile
+++ b/usr.sbin/bluetooth/l2control/Makefile
@@ -6,7 +6,6 @@ MAN=		l2control.8
 SRCS=		l2cap.c l2control.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/l2ping/Makefile b/usr.sbin/bluetooth/l2ping/Makefile
index bc130e3..572366a 100644
--- a/usr.sbin/bluetooth/l2ping/Makefile
+++ b/usr.sbin/bluetooth/l2ping/Makefile
@@ -5,7 +5,6 @@ PROG=		l2ping
 MAN=		l2ping.8
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/Makefile b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
index adac64e..f31e1e5 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/Makefile
+++ b/usr.sbin/bluetooth/rfcomm_pppd/Makefile
@@ -8,7 +8,6 @@ MAN=		rfcomm_pppd.8
 SRCS=		rfcomm_pppd.c rfcomm_sdp.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP}
-LDADD=		-lbluetooth -lsdp
+LIBADD=		bluetooth sdp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bluetooth/sdpcontrol/Makefile b/usr.sbin/bluetooth/sdpcontrol/Makefile
index c0ec8d4..e3ebcd8 100644
--- a/usr.sbin/bluetooth/sdpcontrol/Makefile
+++ b/usr.sbin/bluetooth/sdpcontrol/Makefile
@@ -6,7 +6,6 @@ MAN=		sdpcontrol.8
 SRCS=		sdpcontrol.c search.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP}
-LDADD=		-lbluetooth -lsdp
+LIBADD=		bluetooth sdp
 
 .include <bsd.prog.mk>