jtag: drivers: build usb_blaster only if enabled 20/3920/2
authorPaul Fertser <fercerpav@gmail.com>
Sun, 25 Dec 2016 17:24:57 +0000 (20:24 +0300)
committerPaul Fertser <fercerpav@gmail.com>
Sun, 15 Jan 2017 10:14:53 +0000 (10:14 +0000)
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>
src/jtag/drivers/Makefile.am

index c26d997..e411412 100644 (file)
@@ -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