Update autotools scripts to require automake 1.6. The configure.in script

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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index a3a06606244112f9a5f95154f4f36f5d550cdd1e..45883121956a0c027c6b488d611aced1c7618a2e 100644 (file)
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,11 +1,7 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/helper \
+       -I$(top_srcdir)/src/target
 
-if FTD2XXDIR
-FTD2XXINC = -I@WITH_FTD2XX@/
-else
-FTD2XXINC =
-endif
-
-INCLUDES = -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes)
 METASOURCES = AUTO
 noinst_LIBRARIES = libjtag.a
 
@@ -21,16 +17,20 @@ else
 PARPORTFILES =
 endif
 
-if FTDI2232
-FTDI2232FILES = ftdi2232.c
+if DUMMY
+DUMMYFILES = dummy.c
 else
-FTDI2232FILES =
+DUMMYFILES =
 endif
 
-if FTD2XX
-FTD2XXFILES = ftd2xx.c
+if FT2232_LIBFTDI
+FT2232FILES = ft2232.c
 else
-FTD2XXFILES =
+if FT2232_FTD2XX
+FT2232FILES = ft2232.c
+else
+FT2232FILES =
+endif
 endif
 
 if AMTJTAGACCEL
@@ -45,6 +45,73 @@ else
 EP93XXFILES =
 endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(FTDI2232FILES) $(FTD2XXFILES) $(AMTJTAGACCELFILES) $(EP93XXFILES)
+if ECOSBOARD
+ECOSBOARDFILES = zy1000.c
+else
+ECOSBOARDFILES =
+endif
+
+if AT91RM9200
+AT91RM9200FILES = at91rm9200.c
+else
+AT91RM9200FILES =
+endif
+
+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_a_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