X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2FMakefile.am;h=1f4cbba42388cf01c7a68e1aba665bb1ce2c0bee;hb=b6c4a5db3e306b317308bab1e872b4a66eb65487;hp=4d9ea418a39a9319ecdeaf90ef013a40e153979c;hpb=4dc8cd201c667bac72bc083ef1fa1b285eb093fc;p=openocd.git

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 4d9ea418a3..1f4cbba423 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -9,19 +9,19 @@ endif
 SUBDIRS = openrisc
 libtarget_la_LIBADD = $(top_builddir)/src/target/openrisc/libopenrisc.la
 
-BIN2C		= $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+BIN2C		= $(top_srcdir)/src/helper/bin2char.sh
 
 DEBUG_HANDLER	= $(srcdir)/xscale/debug_handler.bin
 EXTRA_DIST = \
 	startup.tcl \
-	$(DEBUG_HANDLER)
+	$(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
@@ -35,6 +35,7 @@ libtarget_la_SOURCES = \
 	$(AVR32_SRC) \
 	$(MIPS32_SRC) \
 	$(NDS32_SRC) \
+	$(INTEL_IA32_SRC) \
 	avrt.c \
 	dsp563xx.c \
 	dsp563xx_once.c \
@@ -78,6 +79,7 @@ ARMV6_SRC = \
 
 ARMV7_SRC = \
 	armv7m.c \
+	armv7m_trace.c \
 	cortex_m.c \
 	armv7a.c \
 	cortex_a.c
@@ -89,9 +91,10 @@ ARM_DEBUG_SRC = \
 	arm_simulator.c \
 	arm_semihosting.c \
 	arm_adi_v5.c \
+	armv7a_cache.c \
+	armv7a_cache_l2x.c \
 	adi_v5_jtag.c \
 	adi_v5_swd.c \
-	adi_v5_cmsis_dap.c \
 	embeddedice.c \
 	trace.c \
 	etb.c \
@@ -124,6 +127,11 @@ NDS32_SRC = \
 	nds32_v3m.c \
 	nds32_aice.c
 
+INTEL_IA32_SRC = \
+	quark_x10xx.c \
+	quark_d20xx.c \
+	lakemont.c \
+	x86_32_common.c
 
 noinst_HEADERS = \
 	algorithm.h \
@@ -131,6 +139,8 @@ noinst_HEADERS = \
 	arm_dpm.h \
 	arm_jtag.h \
 	arm_adi_v5.h \
+	armv7a_cache.h \
+	armv7a_cache_l2x.h \
 	arm_disassembler.h \
 	arm_opcodes.h \
 	arm_simulator.h \
@@ -150,6 +160,7 @@ noinst_HEADERS = \
 	armv4_5_cache.h \
 	armv7a.h \
 	armv7m.h \
+	armv7m_trace.h \
 	avrt.h \
 	dsp563xx.h \
 	dsp563xx_once.h \
@@ -191,7 +202,9 @@ noinst_HEADERS = \
 	nds32_v3_common.h \
 	nds32_v3.h \
 	nds32_v3m.h \
-	nds32_aice.h
+	nds32_aice.h \
+	lakemont.h \
+	x86_32_common.h
 
 ocddatadir = $(pkglibdir)
 nobase_dist_ocddata_DATA =