jlink_jtag_t -> struct jlink

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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 74ae863f8ba0ba5557eedd11a5eff9c99fd4cf55..ba722c6dc7a55c0a0f5c5bb24c00b8e6578228a0 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -9,7 +9,7 @@ DRIVERFILES =
 
 if MINIDRIVER
 
-if ECOSBOARD
+if ZY1000
 DRIVERFILES += zy1000/zy1000.c
 AM_CPPFLAGS += -I$(srcdir)/zy1000
 endif
@@ -32,13 +32,9 @@ endif
 if DUMMY
 DRIVERFILES += dummy.c
 endif
-if FT2232_LIBFTDI
-DRIVERFILES += ft2232.c
-else
-if FT2232_FTD2XX
+if FT2232_DRIVER
 DRIVERFILES += ft2232.c
 endif
-endif
 if AMTJTAGACCEL
 DRIVERFILES += amt_jtagaccel.c
 endif
@@ -54,13 +50,9 @@ endif
 if BITQ
 DRIVERFILES += bitq.c
 endif
-if PRESTO_LIBFTDI
-DRIVERFILES += presto.c
-else
-if PRESTO_FTD2XX
+if PRESTO_DRIVER
 DRIVERFILES += presto.c
 endif
-endif
 if USBPROG
 DRIVERFILES += usbprog.c
 endif
@@ -83,12 +75,14 @@ endif
 
 libjtag_la_SOURCES = \
        core.c \
-       tcl.c \
        interface.c \
+       interfaces.c \
+       tcl.c \
        $(DRIVERFILES)
 
 noinst_HEADERS = \
        interface.h \
+       interfaces.h \
        commands.h \
        minidriver.h \
        bitbang.h \