use COMMAND_REGISTER macro

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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 74ae863f8ba0ba5557eedd11a5eff9c99fd4cf55..5254a2b544698e0b28efd4a8e5f22fbd99b5e988 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
@@ -23,6 +23,10 @@ else
 # Standard Driver: common files
 DRIVERFILES += driver.c commands.c
 
+if USB
+DRIVERFILES += usb_common.c
+endif
+
 if BITBANG
 DRIVERFILES += bitbang.c
 endif
@@ -32,13 +36,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,12 +54,8 @@ endif
 if BITQ
 DRIVERFILES += bitq.c
 endif
-if PRESTO_LIBFTDI
+if PRESTO_DRIVER
 DRIVERFILES += presto.c
-else
-if PRESTO_FTD2XX
-DRIVERFILES += presto.c
-endif
 endif
 if USBPROG
 DRIVERFILES += usbprog.c
@@ -83,12 +79,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 \
@@ -98,6 +96,9 @@ noinst_HEADERS = \
        rlink/ep1_cmd.h \
        rlink/rlink.h \
        rlink/st7.h \
-       minidummy/jtag_minidriver.h
+       minidummy/jtag_minidriver.h \
+       usb_common.h
+
+EXTRA_DIST = startup.tcl
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in