jlink: Replace crazy home cooked assertion with a real one

[openocd] / src / jtag / Makefile.am

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 59cd8ffffd06b85192f95ab2773d2f5f1f57c255..db3e6ff2a4b193369fd7201b63c5d34e632d58a0 100644 (file)
--- 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,20 @@ else
 MINIDRIVER_IMP_DIR = $(srcdir)/drivers
 DRIVERFILES += commands.c
 
+if HLADAPTER
+SUBDIRS += hla
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/hla/libocdhla.la
+endif
+
+if AICE
+SUBDIRS += aice
+libjtag_la_LIBADD += $(top_builddir)/src/jtag/aice/libocdaice.la
+endif
+
 SUBDIRS += drivers
 libjtag_la_LIBADD += $(top_builddir)/src/jtag/drivers/libocdjtagdrivers.la
 
+
 endif
 
 # endif // MINIDRIVER
@@ -58,7 +67,6 @@ libjtag_la_SOURCES = \
        interface.c \
        interfaces.c \
        tcl.c \
-       transport.c \
        $(DRIVERFILES)
 
 noinst_HEADERS = \
@@ -68,9 +76,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