Remove support for the GPL incompatible FTDI D2XX library

[openocd.git] / src / jtag / drivers / Makefile.am

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 2aaf8fd8420b604cf232e25f92ea0bf046060851..1322c0f10e8fb48decc88c97422c8dc036e66327 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -33,6 +33,7 @@ noinst_LTLIBRARIES += libjaylink_internal.la
 libocdjtagdrivers_la_LIBADD += libjaylink_internal.la
 else
 DRIVERFILES += jlink.c
+libocdjtagdrivers_la_CPPFLAGS += $(libjaylink_CFLAGS)
 endif
 endif
 
@@ -59,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
@@ -87,7 +85,7 @@ endif
 if BITQ
 DRIVERFILES += bitq.c
 endif
-if PRESTO_DRIVER
+if PRESTO
 DRIVERFILES += presto.c
 endif
 if USBPROG
@@ -147,7 +145,6 @@ endif
 noinst_HEADERS = \
        bitbang.h \
        bitq.h \
-       ftd2xx_common.h \
        libusb0_common.h \
        libusb1_common.h \
        libusb_common.h \
@@ -166,8 +163,10 @@ noinst_HEADERS = \
 
 DIST_SUBDIRS = usb_blaster
 
+if JLINK
 if INTERNAL_LIBJAYLINK
 DIST_SUBDIRS += libjaylink
 endif
+endif
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in