aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Fertser <fercerpav@gmail.com>2016-12-25 20:24:57 +0300
committerPaul Fertser <fercerpav@gmail.com>2017-01-15 10:14:53 +0000
commit7851207cf0d03428904a80f64db295268919ce86 (patch)
tree70c404bc7f80ab6e6b2361dd3715c67b3a82794b
parent33db10a1587da4452f1f3daf3b73e8ab2443969c (diff)
jtag: drivers: build usb_blaster only if enabled
Fix build failure when libusb dev files are not available and so usb_blaster is disabled. Change-Id: I4cda7df689cdb4b62b733cbbab813241cf561e29 Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/3920 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
-rw-r--r--src/jtag/drivers/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index c26d9978..e4114126 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -78,6 +78,7 @@ DRIVERFILES += %D%/jtag_vpi.c
endif
if USB_BLASTER_DRIVER
%C%_libocdjtagdrivers_la_LIBADD += %D%/usb_blaster/libocdusbblaster.la
+include %D%/usb_blaster/Makefile.am
endif
if AMTJTAGACCEL
DRIVERFILES += %D%/amt_jtagaccel.c
@@ -171,4 +172,3 @@ DRIVERHEADERS = \
%D%/versaloon/versaloon_include.h \
%D%/versaloon/versaloon_internal.h
-include %D%/usb_blaster/Makefile.am