X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjtag%2FMakefile.am;h=59cd8ffffd06b85192f95ab2773d2f5f1f57c255;hb=1c794320615d917d0e8fb4c40d096fd22f9a824f;hp=3163b245e692e731d2ba08fe00728083cb469bcb;hpb=e8e0af395649b4b74786653256d5272f4689bc16;p=fw%2Fopenocd

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 3163b245e..59cd8ffff 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,139 +1,77 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/target
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
 
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
-endif
+SUBDIRS =
+DRIVERFILES =
+libjtag_la_LIBADD =
 
-if PARPORT
-PARPORTFILES = parport.c
-else
-PARPORTFILES =
-endif
+CLEANFILES =
 
-if DUMMY
-DUMMYFILES = dummy.c
-else
-DUMMYFILES =
-endif
+BUILT_SOURCES =
 
-if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
-else
-if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
-endif
-endif
+BUILT_SOURCES += minidriver_imp.h
+CLEANFILES += minidriver_imp.h
 
-if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
-endif
+if MINIDRIVER
 
-if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
+if ZY1000
+DRIVERFILES += zy1000/zy1000.c
+JTAG_MINIDRIVER_DIR = $(srcdir)/zy1000
 endif
-
-if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
-else
-ECOSBOARDFILES =
+if MINIDRIVER_DUMMY
+DRIVERFILES += minidummy/minidummy.c commands.c
+JTAG_MINIDRIVER_DIR = $(srcdir)/minidummy
 endif
 
-if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
-else
-AT91RM9200FILES =
-endif
+MINIDRIVER_IMP_DIR = $(srcdir)/minidriver
 
-if GW16012
-GW16012FILES = gw16012.c
-else
-GW16012FILES =
-endif
+jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
+	cp $< $@
 
-if BITQ
-BITQFILES = bitq.c
-else
-BITQFILES =
-endif
+BUILT_SOURCES += jtag_minidriver.h
 
-if PRESTO_LIBFTDI
-PRESTOFILES = presto.c
-else
-if PRESTO_FTD2XX
-PRESTOFILES = presto.c
-else
-PRESTOFILES =
-endif
-endif
+CLEANFILES += jtag_minidriver.h
 
-if USBPROG
-USBPROGFILES = usbprog.c
 else
-USBPROGFILES =
-endif
 
-if JLINK
-JLINKFILES = jlink.c
-else
-JLINKFILES =
-endif
+MINIDRIVER_IMP_DIR = $(srcdir)/drivers
+DRIVERFILES += commands.c
 
-if RLINK
-RLINKFILES = rlink/rlink.c rlink/rlink_speed_table.c
-else
-RLINKFILES =
-endif
+SUBDIRS += drivers
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
 
-if VSLLINK
-VSLLINKFILES = vsllink.c
-else
-VSLLINKFILES =
 endif
 
-if ARMJTAGEW
-ARMJTAGEWFILES = arm-jtag-ew.c
-else
-ARMJTAGEWFILES =
-endif
+# endif // MINIDRIVER
+
+minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
+	cp $< $@
 
-libjtag_la_SOURCES = jtag.c \
-	$(BITBANGFILES) \
-	$(PARPORTFILES) \
-	$(DUMMYFILES) \
-	$(FT2232FILES) \
-	$(AMTJTAGACCELFILES) \
-	$(EP93XXFILES) \
-	$(AT91RM9200FILES) \
-	$(GW16012FILES) \
-	$(BITQFILES) \
-	$(PRESTOFILES) \
-	$(USBPROGFILES) \
-	$(ECOSBOARDFILES) \
-	$(JLINKFILES) \
-	$(RLINKFILES) \
-	$(VSLLINKFILES) \
-	$(ARMJTAGEWFILES)
+
+libjtag_la_SOURCES = \
+	adapter.c \
+	core.c \
+	interface.c \
+	interfaces.c \
+	tcl.c \
+	transport.c \
+	$(DRIVERFILES)
 
 noinst_HEADERS = \
-	bitbang.h \
+	commands.h \
+	driver.h \
+	interface.h \
+	interfaces.h \
+	minidriver.h \
 	jtag.h \
-	bitq.h \
-	rlink/dtc_cmd.h \
-	rlink/ep1_cmd.h \
-	rlink/rlink.h \
-	rlink/st7.h
+	transport.h \
+	minidriver/minidriver_imp.h \
+	minidummy/jtag_minidriver.h
+
+EXTRA_DIST = startup.tcl
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in