Updates and fixes from Kees Jongenburger

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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index a35e3f3f17b0e0b645acda77aac034fc76e8a0aa..b5a3d8a6afdc339ad654348773df2640ecd3262b 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -9,7 +9,7 @@ else
 FTD2XXINC =
 endif
 
-INCLUDES = -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes)
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes) -I$(top_srcdir)/src/target 
 METASOURCES = AUTO
 noinst_LIBRARIES = libjtag.a
 
@@ -25,6 +25,12 @@ else
 PARPORTFILES =
 endif
 
+if DUMMY
+DUMMYFILES = dummy.c
+else
+DUMMYFILES =
+endif
+
 if FT2232_LIBFTDI
 FT2232FILES = ft2232.c
 else
@@ -47,6 +53,12 @@ else
 EP93XXFILES =
 endif
 
+if ECOSBOARD
+ECOSBOARDFILES = zy1000.c
+else
+ECOSBOARDFILES =
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
@@ -81,7 +93,13 @@ else
 USBPROGFILES =
 endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-       $(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES)
+if JLINK
+JLINKFILES = jlink.c
+else
+JLINKFILES =
+endif
+
+libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
+       $(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES)
 
 noinst_HEADERS = bitbang.h jtag.h