diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2013-09-11 23:07:59 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-09-13 21:43:18 +0000 |
| commit | 191a5736c202dfb784e86a8190edc64e80dc62e5 (patch) | |
| tree | d56878000543ba0e217d6cce5953b9d18d1bc2a5 /src/jtag | |
| parent | 10df176b0fb932d61f0dc5d6bfd0a0942501fc40 (diff) | |
| download | riscv-openocd-191a5736c202dfb784e86a8190edc64e80dc62e5.zip riscv-openocd-191a5736c202dfb784e86a8190edc64e80dc62e5.tar.gz riscv-openocd-191a5736c202dfb784e86a8190edc64e80dc62e5.tar.bz2 | |
libusb: require pkg-config support
An alternative approach to show how much cleaner the pure pkg-config
way is.
This changes the discovery procedures for libusb-1.0 and libusb-0.1,
making them depend on pkg-config being properly installed and
configured, including the necessary build host configuration for the
cross-builds (see
http://www.flameeyes.eu/autotools-mythbuster/pkgconfig/cross-compiling.html)
It should make it possible to compile OpenOCD without changes and
extra effort on GNU/Linux, FreeBSD users would need to supply a .pc
file for their libusb implementation or add LIBUSB1_LIBS and
LIBUSB1_CFLAGS to the configure environment.
Change-Id: I826e378dd1e0d101a549a573b2c63212a7e00b64
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1467
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Tested-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/aice/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/libusb1_common.h | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/mpsse.c | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/ti_icdi_usb.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/jtag/aice/Makefile.am b/src/jtag/aice/Makefile.am index 38c441e..7b9469d 100644 --- a/src/jtag/aice/Makefile.am +++ b/src/jtag/aice/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/common.mk -AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers +AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS) noinst_LTLIBRARIES = libocdaice.la diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index e3ed219..e8f1efb 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -6,6 +6,8 @@ libocdjtagdrivers_la_LIBADD = libocdjtagdrivers_la_SOURCES = \ $(DRIVERFILES) +libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS) + ULINK_FIRMWARE = $(srcdir)/OpenULINK EXTRA_DIST = $(ULINK_FIRMWARE) diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h index cd1f7f1..0e653d8 100644 --- a/src/jtag/drivers/libusb1_common.h +++ b/src/jtag/drivers/libusb1_common.h @@ -22,7 +22,7 @@ #ifndef JTAG_LIBUSB_COMMON_H #define JTAG_LIBUSB_COMMON_H -#include <libusb-1.0/libusb.h> +#include <libusb.h> #define jtag_libusb_device libusb_device #define jtag_libusb_device_handle libusb_device_handle diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c index c5fd6d7..c5e0b61 100644 --- a/src/jtag/drivers/mpsse.c +++ b/src/jtag/drivers/mpsse.c @@ -24,7 +24,7 @@ #include "mpsse.h" #include "helper/log.h" -#include <libusb-1.0/libusb.h> +#include <libusb.h> /* Compatibility define for older libusb-1.0 */ #ifndef LIBUSB_CALL diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c index c0c0718..f10d120 100644 --- a/src/jtag/drivers/ti_icdi_usb.c +++ b/src/jtag/drivers/ti_icdi_usb.c @@ -33,7 +33,7 @@ #include <target/cortex_m.h> -#include <libusb-1.0/libusb.h> +#include <libusb.h> #define ICDI_WRITE_ENDPOINT 0x02 #define ICDI_READ_ENDPOINT 0x83 |