X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=58bbff362ee3bc010f9b63e57af6302ab440353c;hb=82aa9af1ad529cbea13dfe5ad4b2c359444d4d07;hp=7ee59076b18e805af6fc40c94725cbc055c449a7;hpb=647e61cc6d9b13dd2799d2302ce9289a1627e36c;p=openocd.git

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 7ee59076b1..58bbff362e 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -5,117 +5,91 @@ AM_CPPFLAGS = \
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
 
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
-endif
+DRIVERFILES =
 
-if PARPORT
-PARPORTFILES = parport.c
-else
-PARPORTFILES =
-endif
+if MINIDRIVER
 
-if DUMMY
-DUMMYFILES = dummy.c
-else
-DUMMYFILES =
+if ECOSBOARD
+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 FT2232_LIBFTDI
-FT2232FILES = ft2232.c
 else
-if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
+
+# Standard Driver: common files
+DRIVERFILES += driver.c commands.c
+
+if BITBANG
+DRIVERFILES += bitbang.c
 endif
+if PARPORT
+DRIVERFILES += parport.c
+endif
+if DUMMY
+DRIVERFILES += dummy.c
+endif
+if FT2232_DRIVER
+DRIVERFILES += ft2232.c
 endif
-
 if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
+DRIVERFILES += amt_jtagaccel.c
 endif
-
 if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
+DRIVERFILES += ep93xx.c
 endif
-
-if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
-else
-ECOSBOARDFILES =
-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
 
-libjtag_la_SOURCES = jtag.c \
-	$(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) \
-	$(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) \
-	$(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) \
-	$(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES) $(ARMJTAGEWFILES)
+endif
+# endif // MINIDRIVER
+
+
+libjtag_la_SOURCES = \
+	core.c \
+	tcl.c \
+	interface.c \
+	$(DRIVERFILES)
 
-noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
+noinst_HEADERS = \
+	interface.h \
+	commands.h \
+	minidriver.h \
+	bitbang.h \
+	jtag.h \
+	bitq.h \
+	rlink/dtc_cmd.h \
+	rlink/ep1_cmd.h \
+	rlink/rlink.h \
+	rlink/st7.h \
+	minidummy/jtag_minidriver.h
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in