X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2FMakefile.am;h=9f47b1fd86679fca021e7adcd7cb13de08b82945;hp=27ad054fb1a1916b69956aa53cd109765641478f;hb=cd440bd32a120a9b4c2d703d3d16dd52f16edab2;hpb=7d2bf8805df5ec9f108758188e85f2d355f720c4

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 27ad054fb1..9f47b1fd86 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -6,19 +6,22 @@ else
 OOCD_TRACE_FILES =
 endif
 
-BIN2C		= $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+SUBDIRS = openrisc
+libtarget_la_LIBADD = $(top_builddir)/src/target/openrisc/libopenrisc.la
+
+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
@@ -31,10 +34,13 @@ libtarget_la_SOURCES = \
 	$(ARM_MISC_SRC) \
 	$(AVR32_SRC) \
 	$(MIPS32_SRC) \
+	$(NDS32_SRC) \
+	$(INTEL_IA32_SRC) \
 	avrt.c \
 	dsp563xx.c \
 	dsp563xx_once.c \
-	dsp5680xx.c
+	dsp5680xx.c \
+	hla_target.c
 
 TARGET_CORE_SRC = \
 	algorithm.c \
@@ -73,7 +79,8 @@ ARMV6_SRC = \
 
 ARMV7_SRC = \
 	armv7m.c \
-	cortex_m3.c \
+	armv7m_trace.c \
+	cortex_m.c \
 	armv7a.c \
 	cortex_a.c
 
@@ -84,7 +91,9 @@ ARM_DEBUG_SRC = \
 	arm_simulator.c \
 	arm_semihosting.c \
 	arm_adi_v5.c \
- 	adi_v5_jtag.c \
+	armv7a_cache.c \
+	armv7a_cache_l2x.c \
+	adi_v5_jtag.c \
 	adi_v5_swd.c \
 	embeddedice.c \
 	trace.c \
@@ -106,6 +115,22 @@ MIPS32_SRC = \
 	mips32_dmaacc.c \
 	mips_ejtag.c
 
+NDS32_SRC = \
+	nds32.c \
+	nds32_reg.c \
+	nds32_cmd.c \
+	nds32_disassembler.c \
+	nds32_tlb.c \
+	nds32_v2.c \
+	nds32_v3_common.c \
+	nds32_v3.c \
+	nds32_v3m.c \
+	nds32_aice.c
+
+INTEL_IA32_SRC = \
+	quark_x10xx.c \
+	lakemont.c \
+	x86_32_common.c
 
 noinst_HEADERS = \
 	algorithm.h \
@@ -113,6 +138,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 \
@@ -132,12 +159,13 @@ noinst_HEADERS = \
 	armv4_5_cache.h \
 	armv7a.h \
 	armv7m.h \
+	armv7m_trace.h \
 	avrt.h \
 	dsp563xx.h \
 	dsp563xx_once.h \
 	dsp5680xx.h \
 	breakpoints.h \
-	cortex_m3.h \
+	cortex_m.h \
 	cortex_a.h \
 	embeddedice.h \
 	etb.h \
@@ -161,9 +189,23 @@ noinst_HEADERS = \
 	avr32_ap7k.h \
 	avr32_jtag.h \
 	avr32_mem.h \
-	avr32_regs.h
-
-nobase_dist_pkglib_DATA =
-nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
+	avr32_regs.h \
+	nds32.h \
+	nds32_cmd.h \
+	nds32_disassembler.h \
+	nds32_edm.h \
+	nds32_insn.h \
+	nds32_reg.h \
+	nds32_tlb.h \
+	nds32_v2.h \
+	nds32_v3_common.h \
+	nds32_v3.h \
+	nds32_v3m.h \
+	nds32_aice.h \
+	lakemont.h \
+	x86_32_common.h
+
+ocddatadir = $(pkglibdir)
+nobase_dist_ocddata_DATA =
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in