X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2FMakefile.am;h=db3e6ff2a4b193369fd7201b63c5d34e632d58a0;hb=7a1634034336bc990e575a39a2f679e0db10384a;hp=421987c4d58596fc767beb0def872f07f347a763;hpb=879a04cc6bc2bdf62b19b974524e1f15f2c9da8e;p=openocd.git

diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 421987c4d5..db3e6ff2a4 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -1,6 +1,4 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/target
+include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libjtag.la
@@ -9,34 +7,62 @@ SUBDIRS =
 DRIVERFILES =
 libjtag_la_LIBADD =
 
-if MINIDRIVER
+CLEANFILES =
+
+BUILT_SOURCES =
 
-# for minidriver_imp.h
-AM_CPPFLAGS += -I$(srcdir)/minidriver
+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
 
+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
 
-# for minidriver_imp.h
-AM_CPPFLAGS += -I$(srcdir)/drivers
 
 endif
+
 # endif // MINIDRIVER
 
+minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
+	cp $< $@
+
+
 libjtag_la_SOURCES = \
+	adapter.c \
 	core.c \
 	interface.c \
 	interfaces.c \
@@ -45,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