aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2002-03-28 18:44:25 +0000
committerJosef Karthauser <joe@FreeBSD.org>2002-03-28 18:44:25 +0000
commit7b8cfc5217ae8baeb727c452a8057e437caee3ba (patch)
tree77dc9aaa8c39041cad8348f799789d22c14ce176
parent7793e75522f13cd778e4c301ee235d74aaa0746c (diff)
Notes
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local2
-rw-r--r--lib/libusbhid/Makefile2
-rw-r--r--lib/libusbhid/usbhid.32
-rw-r--r--share/mk/bsd.libnames.mk2
-rw-r--r--usr.bin/usbhidctl/Makefile4
5 files changed, 6 insertions, 6 deletions
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 3c9248c3c2fb..ca192e7d7b47 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -47,7 +47,7 @@
.ds doc-str-Lb-libpam PAM Library (libpam, \-lpam)
.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc)
.ds doc-str-Lb-libskey S/Key Password Control Table Access Library (libskey, \-lskey)
-.ds doc-str-Lb-libusb USB HID access routines library (libusb, \-lusb)
+.ds doc-str-Lb-libusbhid USB HID access routines library (libusbhid, \-lusbhid)
.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl)
.
.\" Default .Os value
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 4869ce969d25..8222bee0652d 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -3,7 +3,7 @@
MAINTAINER= n_hibma@FreeBSD.ORG
-LIB= usb
+LIB= usbhid
MAN= usbhid.3
SHLIB_MAJOR= 0
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index 2ae6f7ff9d74..615b5fc0151a 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -45,7 +45,7 @@
.Nm hid_set_data
.Nd USB HID access routines
.Sh LIBRARY
-.Lb libusb
+.Lb libusbhid
.Sh SYNOPSIS
.In libusbhid.h
.Ft report_desc_t
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 23dd7d422e8d..aa1ae3345dc3 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -106,7 +106,7 @@ LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES"
LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a
-LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a
+LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a
LIBVGL?= ${DESTDIR}${LIBDIR}/libvgl.a
LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a
LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a
diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile
index 87a7c743e3c3..9636f667c1b0 100644
--- a/usr.bin/usbhidctl/Makefile
+++ b/usr.bin/usbhidctl/Makefile
@@ -6,8 +6,8 @@
PROG= usbhidctl
SRCS= usbhid.c
-LDADD+= -lusb
-DPADD+= ${LIBUSB}
+LDADD+= -lusbhid
+DPADD+= ${LIBUSBHID}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>