X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=3d75c31b4e88e653ca13c8777ffe6d8d93d3c1b4;hb=0c2f8b6eb8f4b379aa0c78caba73ec1ebaae8414;hp=59cd8ffffd06b85192f95ab2773d2f5f1f57c255;hpb=93f2afa45f4cfcb8afd08dae5a17996dba5c7a9c;p=fw%2Fopenocd

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 59cd8ffff..3d75c31b4 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
@@ -41,9 +39,15 @@ else
 MINIDRIVER_IMP_DIR = $(srcdir)/drivers
 DRIVERFILES += commands.c
 
+if STLINK
+SUBDIRS += stlink
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/stlink/libocdstlink.la
+endif
+
 SUBDIRS += drivers
 libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
 
+
 endif
 
 # endif // MINIDRIVER
@@ -58,7 +62,6 @@ libjtag_la_SOURCES = \
 	interface.c \
 	interfaces.c \
 	tcl.c \
-	transport.c \
 	$(DRIVERFILES)
 
 noinst_HEADERS = \
@@ -68,9 +71,10 @@ noinst_HEADERS = \
 	interfaces.h \
 	minidriver.h \
 	jtag.h \
-	transport.h \
 	minidriver/minidriver_imp.h \
-	minidummy/jtag_minidriver.h
+	minidummy/jtag_minidriver.h \
+	swd.h \
+	tcl.h
 
 EXTRA_DIST = startup.tcl