X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=55f7e6a2b16e8f30314561670cc02ffd5adb9219;hb=d2a8922bd451d0d99303d038aefb9e62c63ba831;hp=78230b629c97ebe430e9292e7ad09f53f080f630;hpb=a4f2e1eaaca40dbcc7916755efb094cacafbb65c;p=openocd.git

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 78230b629c..55f7e6a2b1 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,15 +1,6 @@
 
-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)
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper  $(all_includes) -I$(top_srcdir)/src/target 
 METASOURCES = AUTO
 noinst_LIBRARIES = libjtag.a
 
@@ -25,6 +16,12 @@ else
 PARPORTFILES =
 endif
 
+if DUMMY
+DUMMYFILES = dummy.c
+else
+DUMMYFILES =
+endif
+
 if FT2232_LIBFTDI
 FT2232FILES = ft2232.c
 else
@@ -47,6 +44,12 @@ else
 EP93XXFILES =
 endif
 
+if ECOSBOARD
+ECOSBOARDFILES = zy1000.c
+else
+ECOSBOARDFILES =
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
@@ -59,6 +62,47 @@ else
 GW16012FILES =
 endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) $(AT91RM9200FILES) $(GW16012FILES)
+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
+
+libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
+	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
 
-noinst_HEADERS = bitbang.h jtag.h
+noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h