From: Marc Schink <openocd-dev@marcschink.de>
Date: Sat, 11 Jun 2016 13:06:21 +0000 (+0200)
Subject: drivers/Makefile.am: Fix libjaylink integration
X-Git-Tag: v0.10.0-rc1~60
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=efa90d0f7850951a6296cfcbaf5f99e325d8b245;hp=37ed4751e857563d39b2da04360c9bd2b576aed0

drivers/Makefile.am: Fix libjaylink integration

Include libjaylink in DIST_SUBDIRS only if J-Link driver is enabled.

Change-Id: Ib32bb6a5d8fe9bb6e93d968802733eb4973f2c25
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3529
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
---

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 00d8371c26..c81c08e44b 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -167,8 +167,10 @@ noinst_HEADERS = \
 
 DIST_SUBDIRS = usb_blaster
 
+if JLINK
 if INTERNAL_LIBJAYLINK
 DIST_SUBDIRS += libjaylink
 endif
+endif
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in