Simplify and fix bug in jtag_tap_by_string:

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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index c63c734a7f3663fba6a1464687703e0050937ed0..b798a28dd7bb43b27b98cecb6ec4c63e6401a265 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,17 +1,9 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/helper \
+       -I$(top_srcdir)/src/target
 
-if FTD2XXDIR
-if IS_MINGW
-FTD2XXINC = -I@WITH_FTD2XX@
-else
-FTD2XXINC = -I@WITH_FTD2XX@/
-endif
-else
-FTD2XXINC =
-endif
-
-INCLUDES = -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes)
 METASOURCES = AUTO
-noinst_LIBRARIES = libjtag.a
+noinst_LTLIBRARIES = libjtag.la
 
 if BITBANG
 BITBANGFILES = bitbang.c
@@ -25,17 +17,21 @@ else
 PARPORTFILES =
 endif
 
-if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
+if DUMMY
+DUMMYFILES = dummy.c
 else
-FT2232FILES =
+DUMMYFILES =
 endif
 
+if FT2232_LIBFTDI
+FT2232FILES = ft2232.c
+else
 if FT2232_FTD2XX
 FT2232FILES = ft2232.c
 else
 FT2232FILES =
 endif
+endif
 
 if AMTJTAGACCEL
 AMTJTAGACCELFILES = amt_jtagaccel.c
@@ -49,12 +45,116 @@ else
 EP93XXFILES =
 endif
 
+if ECOSBOARD
+ECOSBOARDFILES = zy1000/zy1000.c
+AM_CPPFLAGS += -I$(srcdir)/zy1000
+else
+ECOSBOARDFILES =
+endif
+
+if MINIDRIVER_DUMMY
+MINIDUMMYFILES = minidummy/minidummy.c commands.c
+AM_CPPFLAGS += -I$(srcdir)/minidummy
+else
+MINIDUMMYFILES =
+endif
+
+if MINIDRIVER
+DRIVERFILES = $(MINIDUMMYFILES)
+else
+DRIVERFILES = jtag_driver.c commands.c
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
 AT91RM9200FILES =
 endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) $(AT91RM9200FILES)
+if GW16012
+GW16012FILES = gw16012.c
+else
+GW16012FILES =
+endif
+
+if BITQ
+BITQFILES = bitq.c
+else
+BITQFILES =
+endif
+
+if PRESTO_LIBFTDI
+PRESTOFILES = presto.c
+else
+if PRESTO_FTD2XX
+PRESTOFILES = presto.c
+else
+PRESTOFILES =
+endif
+endif
+
+if USBPROG
+USBPROGFILES = usbprog.c
+else
+USBPROGFILES =
+endif
+
+if JLINK
+JLINKFILES = jlink.c
+else
+JLINKFILES =
+endif
+
+if RLINK
+RLINKFILES = rlink/rlink.c rlink/rlink_speed_table.c
+else
+RLINKFILES =
+endif
+
+if VSLLINK
+VSLLINKFILES = vsllink.c
+else
+VSLLINKFILES =
+endif
+
+if ARMJTAGEW
+ARMJTAGEWFILES = arm-jtag-ew.c
+else
+ARMJTAGEWFILES =
+endif
+
+libjtag_la_SOURCES = \
+       jtag.c \
+       interface.c \
+       $(DRIVERFILES) \
+       $(BITBANGFILES) \
+       $(PARPORTFILES) \
+       $(DUMMYFILES) \
+       $(FT2232FILES) \
+       $(AMTJTAGACCELFILES) \
+       $(EP93XXFILES) \
+       $(AT91RM9200FILES) \
+       $(GW16012FILES) \
+       $(BITQFILES) \
+       $(PRESTOFILES) \
+       $(USBPROGFILES) \
+       $(ECOSBOARDFILES) \
+       $(JLINKFILES) \
+       $(RLINKFILES) \
+       $(VSLLINKFILES) \
+       $(ARMJTAGEWFILES)
+
+noinst_HEADERS = \
+       interface.h \
+       commands.h \
+       minidriver.h \
+       bitbang.h \
+       jtag.h \
+       bitq.h \
+       rlink/dtc_cmd.h \
+       rlink/ep1_cmd.h \
+       rlink/rlink.h \
+       rlink/st7.h \
+       minidummy/jtag_minidriver.h
 
-noinst_HEADERS = bitbang.h jtag.h
+MAINTAINERCLEANFILES = Makefile.in