X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=db3e6ff2a4b193369fd7201b63c5d34e632d58a0;hp=b5a3d8a6afdc339ad654348773df2640ecd3262b;hb=cf8a3c3d7075abad3c88cd604f8add4d06898abc;hpb=e127fb3a5ac69fcb5ea9f507b9c27550ce7c9308

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index b5a3d8a6af..db3e6ff2a4 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,105 +1,86 @@
+include $(top_srcdir)/common.mk
 
-if FTD2XXDIR
-if IS_MINGW
-FTD2XXINC = -I@WITH_FTD2XX@
-else
-FTD2XXINC = -I@WITH_FTD2XX@/
-endif
-else
-FTD2XXINC =
-endif
-
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes) -I$(top_srcdir)/src/target 
 METASOURCES = AUTO
-noinst_LIBRARIES = libjtag.a
+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 =
+BUILT_SOURCES += minidriver_imp.h
+CLEANFILES += minidriver_imp.h
+
+if MINIDRIVER
+
+if ZY1000
+DRIVERFILES += zy1000/zy1000.c
+JTAG_MINIDRIVER_DIR = $(srcdir)/zy1000
 endif
+if MINIDRIVER_DUMMY
+DRIVERFILES += minidummy/minidummy.c commands.c
+JTAG_MINIDRIVER_DIR = $(srcdir)/minidummy
 endif
 
-if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
-endif
+MINIDRIVER_IMP_DIR = $(srcdir)/minidriver
 
-if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
-endif
+jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
+	cp $< $@
 
-if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
-else
-ECOSBOARDFILES =
-endif
+BUILT_SOURCES += jtag_minidriver.h
 
-if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
-else
-AT91RM9200FILES =
-endif
+CLEANFILES += jtag_minidriver.h
 
-if GW16012
-GW16012FILES = gw16012.c
 else
-GW16012FILES =
-endif
 
-if BITQ
-BITQFILES = bitq.c
-else
-BITQFILES =
-endif
+MINIDRIVER_IMP_DIR = $(srcdir)/drivers
+DRIVERFILES += commands.c
 
-if PRESTO_LIBFTDI
-PRESTOFILES = presto.c
-else
-if PRESTO_FTD2XX
-PRESTOFILES = presto.c
-else
-PRESTOFILES =
-endif
+if HLADAPTER
+SUBDIRS += hla
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/hla/libocdhla.la
 endif
 
-if USBPROG
-USBPROGFILES = usbprog.c
-else
-USBPROGFILES =
+if AICE
+SUBDIRS += aice
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/aice/libocdaice.la
 endif
 
-if JLINK
-JLINKFILES = jlink.c
-else
-JLINKFILES =
+SUBDIRS += drivers
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
+
+
 endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES)
+# endif // MINIDRIVER
+
+minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
+	cp $< $@
+
+
+libjtag_la_SOURCES = \
+	adapter.c \
+	core.c \
+	interface.c \
+	interfaces.c \
+	tcl.c \
+	$(DRIVERFILES)
+
+noinst_HEADERS = \
+	commands.h \
+	driver.h \
+	interface.h \
+	interfaces.h \
+	minidriver.h \
+	jtag.h \
+	minidriver/minidriver_imp.h \
+	minidummy/jtag_minidriver.h \
+	swd.h \
+	tcl.h
+
+EXTRA_DIST = startup.tcl
 
-noinst_HEADERS = bitbang.h jtag.h
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in