X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2FMakefile.am;h=2cec491e9bdf5994415f68aae4330976cd11d873;hb=refs%2Fchanges%2F56%2F2356%2F9;hp=efbeb33afd190c8140020cb61b18d9d658f0f893;hpb=f1b04a20dcf6baedbd0f06a38d8748586d48dbb7;p=openocd.git

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index efbeb33afd..2cec491e9b 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -16,12 +16,12 @@ EXTRA_DIST = \
 	startup.tcl \
 	$(wildcard $(srcdir)/xscale/*)
 
-DEBUG_HEADER	= xscale_debug.h
+DEBUG_HEADER	= xscale_debug.inc
 BUILT_SOURCES = $(DEBUG_HEADER)
 CLEANFILES = $(DEBUG_HEADER)
 
-$(DEBUG_HEADER): $(BIN2C) $(DEBUG_HANDLER)
-	$(BIN2C) < $(DEBUG_HANDLER) xscale_debug_handler > xscale_debug.h
+$(DEBUG_HEADER): $(DEBUG_HANDLER) $(BIN2C)
+	$(BIN2C) < $< > $@ || { rm -f $@; false; }
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libtarget.la
@@ -79,6 +79,7 @@ ARMV6_SRC = \
 
 ARMV7_SRC = \
 	armv7m.c \
+	armv7m_trace.c \
 	cortex_m.c \
 	armv7a.c \
 	cortex_a.c
@@ -92,7 +93,6 @@ ARM_DEBUG_SRC = \
 	arm_adi_v5.c \
 	adi_v5_jtag.c \
 	adi_v5_swd.c \
-	adi_v5_cmsis_dap.c \
 	embeddedice.c \
 	trace.c \
 	etb.c \
@@ -155,6 +155,7 @@ noinst_HEADERS = \
 	armv4_5_cache.h \
 	armv7a.h \
 	armv7m.h \
+	armv7m_trace.h \
 	avrt.h \
 	dsp563xx.h \
 	dsp563xx_once.h \