X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=db3e6ff2a4b193369fd7201b63c5d34e632d58a0;hb=b675edcc95935cbdf77002db1e261536026f4cbe;hp=3f132d4778b8111ab73c2960bd48a764cad68836;hpb=97de520bc02f96f31063175fbc9cad034e84055d;p=openocd.git

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 3f132d4778..db3e6ff2a4 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,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
@@ -53,6 +62,7 @@ minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
 
 
 libjtag_la_SOURCES = \
+	adapter.c \
 	core.c \
 	interface.c \
 	interfaces.c \
@@ -61,12 +71,15 @@ libjtag_la_SOURCES = \
 
 noinst_HEADERS = \
 	commands.h \
+	driver.h \
 	interface.h \
 	interfaces.h \
 	minidriver.h \
 	jtag.h \
 	minidriver/minidriver_imp.h \
-	minidummy/jtag_minidriver.h
+	minidummy/jtag_minidriver.h \
+	swd.h \
+	tcl.h
 
 EXTRA_DIST = startup.tcl