X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=5254a2b544698e0b28efd4a8e5f22fbd99b5e988;hp=567a8fc2809d6e6624364f64617e1affaf2175fe;hb=a93b404161dc42f8dee805c8f95bc4974aded9cb;hpb=1419a728928dea6853e6d1bcd778477a668ed4d1

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 567a8fc280..5254a2b544 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -5,146 +5,88 @@ AM_CPPFLAGS = \
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
 
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
-endif
-
-if PARPORT
-PARPORTFILES = parport.c
-else
-PARPORTFILES =
-endif
+DRIVERFILES =
 
-if DUMMY
-DUMMYFILES = dummy.c
-else
-DUMMYFILES =
-endif
+if MINIDRIVER
 
-if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
-else
-if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
+if ZY1000
+DRIVERFILES += zy1000/zy1000.c
+AM_CPPFLAGS += -I$(srcdir)/zy1000
 endif
+if MINIDRIVER_DUMMY
+DRIVERFILES += minidummy/minidummy.c commands.c
+AM_CPPFLAGS += -I$(srcdir)/minidummy
 endif
 
-if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
 else
-AMTJTAGACCELFILES =
-endif
 
-if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
-endif
+# Standard Driver: common files
+DRIVERFILES += driver.c commands.c
 
-if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
-else
-ECOSBOARDFILES =
+if USB
+DRIVERFILES += usb_common.c
 endif
 
-if MINIDRIVER_DUMMY
-MINIDUMMYFILES = minidummy/minidummy.c commands.c
-AM_CPPFLAGS += -I$(srcdir)/minidummy
-else
-MINIDUMMYFILES =
+if BITBANG
+DRIVERFILES += bitbang.c
 endif
-
-if MINIDRIVER
-DRIVERFILES = $(MINIDUMMYFILES)
-else
-DRIVERFILES = jtag_driver.c commands.c
+if PARPORT
+DRIVERFILES += parport.c
+endif
+if DUMMY
+DRIVERFILES += dummy.c
+endif
+if FT2232_DRIVER
+DRIVERFILES += ft2232.c
+endif
+if AMTJTAGACCEL
+DRIVERFILES += amt_jtagaccel.c
+endif
+if EP93XX
+DRIVERFILES += ep93xx.c
 endif
-
 if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
-else
-AT91RM9200FILES =
+DRIVERFILES += at91rm9200.c
 endif
-
 if GW16012
-GW16012FILES = gw16012.c
-else
-GW16012FILES =
+DRIVERFILES += gw16012.c
 endif
-
 if BITQ
-BITQFILES = bitq.c
-else
-BITQFILES =
-endif
-
-if PRESTO_LIBFTDI
-PRESTOFILES = presto.c
-else
-if PRESTO_FTD2XX
-PRESTOFILES = presto.c
-else
-PRESTOFILES =
+DRIVERFILES += bitq.c
 endif
+if PRESTO_DRIVER
+DRIVERFILES += presto.c
 endif
-
 if USBPROG
-USBPROGFILES = usbprog.c
-else
-USBPROGFILES =
+DRIVERFILES += usbprog.c
 endif
-
 if JLINK
-JLINKFILES = jlink.c
-else
-JLINKFILES =
+DRIVERFILES += jlink.c
 endif
-
 if RLINK
-RLINKFILES = rlink/rlink.c rlink/rlink_speed_table.c
-else
-RLINKFILES =
+DRIVERFILES += rlink/rlink.c rlink/rlink_speed_table.c
 endif
-
 if VSLLINK
-VSLLINKFILES = vsllink.c
-else
-VSLLINKFILES =
+DRIVERFILES += vsllink.c
 endif
-
 if ARMJTAGEW
-ARMJTAGEWFILES = arm-jtag-ew.c
-else
-ARMJTAGEWFILES =
+DRIVERFILES += arm-jtag-ew.c
 endif
 
+endif
+# endif // MINIDRIVER
+
+
 libjtag_la_SOURCES = \
-	jtag.c \
+	core.c \
 	interface.c \
-	$(DRIVERFILES) \
-	$(BITBANGFILES) \
-	$(PARPORTFILES) \
-	$(DUMMYFILES) \
-	$(FT2232FILES) \
-	$(AMTJTAGACCELFILES) \
-	$(EP93XXFILES) \
-	$(AT91RM9200FILES) \
-	$(GW16012FILES) \
-	$(BITQFILES) \
-	$(PRESTOFILES) \
-	$(USBPROGFILES) \
-	$(ECOSBOARDFILES) \
-	$(JLINKFILES) \
-	$(RLINKFILES) \
-	$(VSLLINKFILES) \
-	$(ARMJTAGEWFILES)
+	interfaces.c \
+	tcl.c \
+	$(DRIVERFILES)
 
 noinst_HEADERS = \
 	interface.h \
+	interfaces.h \
 	commands.h \
 	minidriver.h \
 	bitbang.h \
@@ -154,6 +96,9 @@ noinst_HEADERS = \
 	rlink/ep1_cmd.h \
 	rlink/rlink.h \
 	rlink/st7.h \
-	minidummy/jtag_minidriver.h
+	minidummy/jtag_minidriver.h \
+	usb_common.h
+
+EXTRA_DIST = startup.tcl
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in