From: Paul Fertser <fercerpav@gmail.com>
Date: Sun, 25 Dec 2016 17:24:57 +0000 (+0300)
Subject: jtag: drivers: build usb_blaster only if enabled
X-Git-Tag: v0.10.0-rc2~8
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=7851207cf0d03428904a80f64db295268919ce86

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>
---

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index c26d99784e..e411412626 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