shuffled comments about for jtag_add_dr_out() fn.

[openocd] / src / jtag / Makefile.am

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 64159e589ce841372bff726156af21b5a4d0055e..7ee59076b18e805af6fc40c94725cbc055c449a7 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,6 +17,12 @@ else
 PARPORTFILES =
 endif
 
+if DUMMY
+DUMMYFILES = dummy.c
+else
+DUMMYFILES =
+endif
+
 if FT2232_LIBFTDI
 FT2232FILES = ft2232.c
 else
@@ -47,6 +45,12 @@ else
 EP93XXFILES =
 endif
 
+if ECOSBOARD
+ECOSBOARDFILES = zy1000.c
+else
+ECOSBOARDFILES =
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
@@ -65,11 +69,15 @@ else
 BITQFILES =
 endif
 
-if PRESTO
+if PRESTO_LIBFTDI
+PRESTOFILES = presto.c
+else
+if PRESTO_FTD2XX
 PRESTOFILES = presto.c
 else
 PRESTOFILES =
 endif
+endif
 
 if USBPROG
 USBPROGFILES = usbprog.c
@@ -77,7 +85,37 @@ 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
+
+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 \
+       $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) \
+       $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
+       $(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) \
+       $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) \
+       $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES) $(ARMJTAGEWFILES)
+
+noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
 
-noinst_HEADERS = bitbang.h jtag.h
+MAINTAINERCLEANFILES = Makefile.in