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

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index d73eee7ed4..567a8fc280 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,17 +1,9 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/helper \
+	-I$(top_srcdir)/src/target
 
-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
@@ -59,6 +51,19 @@ else
 ECOSBOARDFILES =
 endif
 
+if MINIDRIVER_DUMMY
+MINIDUMMYFILES = minidummy/minidummy.c commands.c
+AM_CPPFLAGS += -I$(srcdir)/minidummy
+else
+MINIDUMMYFILES =
+endif
+
+if MINIDRIVER
+DRIVERFILES = $(MINIDUMMYFILES)
+else
+DRIVERFILES = jtag_driver.c commands.c
+endif
+
 if AT91RM9200
 AT91RM9200FILES = at91rm9200.c
 else
@@ -105,7 +110,50 @@ else
 RLINKFILES =
 endif
 
-libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES)
-
-noinst_HEADERS = bitbang.h jtag.h
+if VSLLINK
+VSLLINKFILES = vsllink.c
+else
+VSLLINKFILES =
+endif
+
+if ARMJTAGEW
+ARMJTAGEWFILES = arm-jtag-ew.c
+else
+ARMJTAGEWFILES =
+endif
+
+libjtag_la_SOURCES = \
+	jtag.c \
+	interface.c \
+	$(DRIVERFILES) \
+	$(BITBANGFILES) \
+	$(PARPORTFILES) \
+	$(DUMMYFILES) \
+	$(FT2232FILES) \
+	$(AMTJTAGACCELFILES) \
+	$(EP93XXFILES) \
+	$(AT91RM9200FILES) \
+	$(GW16012FILES) \
+	$(BITQFILES) \
+	$(PRESTOFILES) \
+	$(USBPROGFILES) \
+	$(ECOSBOARDFILES) \
+	$(JLINKFILES) \
+	$(RLINKFILES) \
+	$(VSLLINKFILES) \
+	$(ARMJTAGEWFILES)
+
+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