aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-03-09 17:05:31 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-03-09 17:05:31 +0000
commita091d2a5259cbf29e34745516e64b04e30245894 (patch)
treeb5cf98cf8c78c6e43ee0f978cafd29a6ff9d864a /lib
parentfe9ee5e879007c21e8f6368901711495655a69b6 (diff)
downloadsrc-a091d2a5259cbf29e34745516e64b04e30245894.tar.gz
src-a091d2a5259cbf29e34745516e64b04e30245894.zip
Install libusb20.so.1 as libusb.so.1, there will be a followup commit to the
ports tree so that programs use libusb from the base by default. Thanks to Stanislav Sedov for sorting out the ports build. Bump __FreeBSD_version to 800069 Help and testing by: stas
Notes
Notes: svn path=/head/; revision=189585
Diffstat (limited to 'lib')
-rw-r--r--lib/libusb20/Makefile7
-rw-r--r--lib/libusb20/libusb20_compat01.c2
-rw-r--r--lib/libusb20/usb.h (renamed from lib/libusb20/libusb20_compat01.h)0
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/libusb20/Makefile b/lib/libusb20/Makefile
index 0c0f18f1bfec..3eb437886022 100644
--- a/lib/libusb20/Makefile
+++ b/lib/libusb20/Makefile
@@ -4,7 +4,7 @@
# Makefile for the FreeBSD specific LibUSB 2.0
#
-LIB= usb20
+LIB= usb
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
SRCS= libusb20.c
@@ -14,11 +14,12 @@ SRCS+= libusb20_compat01.c
SRCS+= libusb20_compat10.c
INCS+= libusb20.h
INCS+= libusb20_desc.h
-INCS+= libusb20_compat01.h
-INCS+= libusb20_compat10.h
MAN= libusb20.3
MKLINT= no
NOGCCERROR=
+# libusb 0.1 compat
+INCS+= usb.h
+
.include <bsd.lib.mk>
diff --git a/lib/libusb20/libusb20_compat01.c b/lib/libusb20/libusb20_compat01.c
index 5d3f0d31584a..5e1e8e181f88 100644
--- a/lib/libusb20/libusb20_compat01.c
+++ b/lib/libusb20/libusb20_compat01.c
@@ -37,7 +37,7 @@
#include "libusb20.h"
#include "libusb20_desc.h"
#include "libusb20_int.h"
-#include "libusb20_compat01.h"
+#include "usb.h"
/*
* The two following macros were taken from the original LibUSB v0.1
diff --git a/lib/libusb20/libusb20_compat01.h b/lib/libusb20/usb.h
index 3963a9f0355c..3963a9f0355c 100644
--- a/lib/libusb20/libusb20_compat01.h
+++ b/lib/libusb20/usb.h