X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2FMakefile.am;h=a50c92746c0513065ee0e8d08156adfa3f3c2f4c;hp=c2aac76fdc2128f30954f3a60d753d156306664c;hb=95de342a93445faa99b32d8dfecc947e3a5b49cb;hpb=7301bf1a67f63d9b9d8a13514c31476c143a0e28

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index c2aac76fdc..a50c92746c 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -7,7 +7,7 @@ libocdjtagdrivers_la_SOURCES = \
 	$(DRIVERFILES)
 
 libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \
-	$(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS)
+	$(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS) $(LIBFTDI_CFLAGS)
 
 ULINK_FIRMWARE = $(srcdir)/OpenULINK
 
@@ -20,6 +20,23 @@ EXTRA_DIST = $(ULINK_FIRMWARE) \
 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
 
@@ -43,9 +60,6 @@ endif
 if DUMMY
 DRIVERFILES += dummy.c
 endif
-if FT2232_DRIVER
-DRIVERFILES += ft2232.c
-endif
 if FTDI
 DRIVERFILES += ftdi.c mpsse.c
 endif
@@ -71,15 +85,12 @@ endif
 if BITQ
 DRIVERFILES += bitq.c
 endif
-if PRESTO_DRIVER
+if PRESTO
 DRIVERFILES += presto.c
 endif
 if USBPROG
 DRIVERFILES += usbprog.c
 endif
-if JLINK
-DRIVERFILES += jlink.c
-endif
 if RLINK
 DRIVERFILES += rlink.c rlink_speed_table.c
 endif
@@ -134,7 +145,6 @@ endif
 noinst_HEADERS = \
 	bitbang.h \
 	bitq.h \
-	ftd2xx_common.h \
 	libusb0_common.h \
 	libusb1_common.h \
 	libusb_common.h \
@@ -151,4 +161,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