From efa90d0f7850951a6296cfcbaf5f99e325d8b245 Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Sat, 11 Jun 2016 15:06:21 +0200 Subject: [PATCH] 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 Reviewed-on: http://openocd.zylin.com/3529 Tested-by: jenkins Reviewed-by: Paul Fertser --- src/jtag/drivers/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.30.2