X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=687f11fc8fce24e6beae2454082ea2b5f3d513d9;hp=5254a2b544698e0b28efd4a8e5f22fbd99b5e988;hb=2a864a89c8296d67587b93a58996615e74fe9c31;hpb=3a660e229301c905392a0b2826e5ebf08c4e01b9

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 5254a2b544..687f11fc8f 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,83 +1,63 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/target
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
 
+SUBDIRS =
 DRIVERFILES =
+libjtag_la_LIBADD =
+
+CLEANFILES =
+
+BUILT_SOURCES =
+
+BUILT_SOURCES += minidriver_imp.h
+CLEANFILES += minidriver_imp.h
 
 if MINIDRIVER
 
 if ZY1000
 DRIVERFILES += zy1000/zy1000.c
-AM_CPPFLAGS += -I$(srcdir)/zy1000
+JTAG_MINIDRIVER_DIR = $(srcdir)/zy1000
 endif
 if MINIDRIVER_DUMMY
 DRIVERFILES += minidummy/minidummy.c commands.c
-AM_CPPFLAGS += -I$(srcdir)/minidummy
+JTAG_MINIDRIVER_DIR = $(srcdir)/minidummy
 endif
 
+MINIDRIVER_IMP_DIR = $(srcdir)/minidriver
+
+jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
+	cp $< $@
+
+BUILT_SOURCES += jtag_minidriver.h
+
+CLEANFILES += jtag_minidriver.h
+
 else
 
-# Standard Driver: common files
-DRIVERFILES += driver.c commands.c
+MINIDRIVER_IMP_DIR = $(srcdir)/drivers
+DRIVERFILES += commands.c
 
-if USB
-DRIVERFILES += usb_common.c
+if HLADAPTER
+SUBDIRS += hla
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/hla/libocdhla.la
 endif
 
-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
-DRIVERFILES += amt_jtagaccel.c
-endif
-if EP93XX
-DRIVERFILES += ep93xx.c
-endif
-if AT91RM9200
-DRIVERFILES += at91rm9200.c
-endif
-if GW16012
-DRIVERFILES += gw16012.c
-endif
-if BITQ
-DRIVERFILES += bitq.c
-endif
-if PRESTO_DRIVER
-DRIVERFILES += presto.c
-endif
-if USBPROG
-DRIVERFILES += usbprog.c
-endif
-if JLINK
-DRIVERFILES += jlink.c
-endif
-if RLINK
-DRIVERFILES += rlink/rlink.c rlink/rlink_speed_table.c
-endif
-if VSLLINK
-DRIVERFILES += vsllink.c
-endif
-if ARMJTAGEW
-DRIVERFILES += arm-jtag-ew.c
-endif
+SUBDIRS += drivers
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
+
 
 endif
+
 # endif // MINIDRIVER
 
+minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
+	cp $< $@
+
 
 libjtag_la_SOURCES = \
+	adapter.c \
 	core.c \
 	interface.c \
 	interfaces.c \
@@ -85,19 +65,16 @@ libjtag_la_SOURCES = \
 	$(DRIVERFILES)
 
 noinst_HEADERS = \
+	commands.h \
+	driver.h \
 	interface.h \
 	interfaces.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 \
+	minidriver/minidriver_imp.h \
 	minidummy/jtag_minidriver.h \
-	usb_common.h
+	swd.h \
+	tcl.h
 
 EXTRA_DIST = startup.tcl