X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2FMakefile.am;h=c81c08e44bbafdc8a0b3d9a995580468881ad090;hb=efa90d0f7850951a6296cfcbaf5f99e325d8b245;hp=22bc89bbcad443556a74ad21ddb5685ffd017d81;hpb=6be2a55bde5531de9897fd844c6db13e49213ae8;p=openocd.git

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 22bc89bbca..c81c08e44b 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -6,16 +6,37 @@ libocdjtagdrivers_la_LIBADD =
 libocdjtagdrivers_la_SOURCES = \
 	$(DRIVERFILES)
 
-ocddatadir = $(pkglibdir)
-nobase_dist_ocddata_DATA =
+libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \
+	$(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS) $(LIBFTDI_CFLAGS)
 
 ULINK_FIRMWARE = $(srcdir)/OpenULINK
 
-EXTRA_DIST = $(ULINK_FIRMWARE)
+EXTRA_DIST = $(ULINK_FIRMWARE) \
+	usb_blaster/README.CheapClone \
+	Makefile.rlink \
+	rlink_call.m4 \
+	rlink_init.m4
 
 DRIVERFILES =
 SUBDIRS=
 
+if JLINK
+if INTERNAL_LIBJAYLINK
+SUBDIRS += libjaylink
+
+libjaylink_internal_la_SOURCES = jlink.c
+libjaylink_internal_la_LIBADD = libjaylink/libjaylink/libjaylink.la
+libjaylink_internal_la_CPPFLAGS = -I$(builddir)/libjaylink/libjaylink \
+	-I$(srcdir)/libjaylink $(AM_CPPFLAGS)
+
+noinst_LTLIBRARIES += libjaylink_internal.la
+libocdjtagdrivers_la_LIBADD += libjaylink_internal.la
+else
+DRIVERFILES += jlink.c
+libocdjtagdrivers_la_CPPFLAGS += $(libjaylink_CFLAGS)
+endif
+endif
+
 # Standard Driver: common files
 DRIVERFILES += driver.c
 
@@ -42,9 +63,12 @@ endif
 if FT2232_DRIVER
 DRIVERFILES += ft2232.c
 endif
-if FTDI_DRIVER
+if FTDI
 DRIVERFILES += ftdi.c mpsse.c
 endif
+if JTAG_VPI
+DRIVERFILES += jtag_vpi.c
+endif
 if USB_BLASTER_DRIVER
 SUBDIRS += usb_blaster
 libocdjtagdrivers_la_LIBADD += $(top_builddir)/src/jtag/drivers/usb_blaster/libocdusbblaster.la
@@ -70,15 +94,13 @@ endif
 if USBPROG
 DRIVERFILES += usbprog.c
 endif
-if JLINK
-DRIVERFILES += jlink.c
-endif
 if RLINK
 DRIVERFILES += rlink.c rlink_speed_table.c
 endif
 if ULINK
 DRIVERFILES += ulink.c
-nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
+ulinkdir = $(pkgdatadir)/OpenULINK
+dist_ulink_DATA = $(ULINK_FIRMWARE)/ulink_firmware.hex
 endif
 if VSLLINK
 DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c
@@ -119,6 +141,10 @@ if OPENJTAG
 DRIVERFILES += openjtag.c
 endif
 
+if CMSIS_DAP
+DRIVERFILES += cmsis_dap_usb.c
+endif
+
 noinst_HEADERS = \
 	bitbang.h \
 	bitq.h \
@@ -139,4 +165,12 @@ noinst_HEADERS = \
 	versaloon/versaloon_include.h \
 	versaloon/versaloon_internal.h
 
+DIST_SUBDIRS = usb_blaster
+
+if JLINK
+if INTERNAL_LIBJAYLINK
+DIST_SUBDIRS += libjaylink
+endif
+endif
+
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in