diff options
| author | Mauro Gamba <maurillo71@gmail.com> | 2011-11-16 15:01:04 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2011-11-18 17:00:58 +0000 |
| commit | b302344779941f36129f1c09c24c5bbc414c4744 (patch) | |
| tree | 9662047971852bed425ee82da5b1e039a55f5474 /src/Makefile.am | |
| parent | 88ca3aabfbc512a1701cd76e3ac9683b167e4299 (diff) | |
| download | riscv-openocd-b302344779941f36129f1c09c24c5bbc414c4744.zip riscv-openocd-b302344779941f36129f1c09c24c5bbc414c4744.tar.gz riscv-openocd-b302344779941f36129f1c09c24c5bbc414c4744.tar.bz2 | |
libusb-1.0 support
The configuration script check for libusb-1.0 availability first and only
if not found check for libusb-0. So if both libraries are installed on the
system the build script will use libusb-1.0
It's possible to force compiling with libusb-0 with the --enable-libusb0 switch.
If the driver support only libusb0 the script check anly for it.
Change-Id: I7eb045d4e2bd553abefad53f3f4023ff46b0f5f6
Signed-off-by: Mauro Gamba <maurillo71@gmail.com>
Reviewed-on: http://openocd.zylin.com/33
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8375683..3a92fff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,26 +81,13 @@ endif endif endif -if USBPROG -LIBUSB = -lusb -else -if JLINK -LIBUSB = -lusb -else -if RLINK -LIBUSB = -lusb -else -if ULINK -LIBUSB = -lusb -else -if VSLLINK -LIBUSB = -lusb -else LIBUSB = +if USE_LIBUSB1 +LIBUSB += -lusb-1.0 endif -endif -endif -endif + +if USE_LIBUSB0 +LIBUSB += -lusb endif libopenocd_la_LIBADD = \ |