X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2FMakefile.am;h=bf80c64c021aa9ef4e261751ff31a5ec057f9147;hb=1d7176f50bc7d5971a82977ac2baa79eef521c21;hp=02bf0f42c62b19269aecac688d29c3e16c8b2d39;hpb=3428035a7e0890a319f40a5c7c61f5ebeb3126d0;p=openocd.git

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 02bf0f42c6..bf80c64c02 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,7 @@ ARMV6_SRC = \
 
 ARMV7_SRC = \
 	armv7m.c \
-	cortex_m3.c \
+	cortex_m.c \
 	armv7a.c \
 	cortex_a.c
 
@@ -84,8 +90,9 @@ ARM_DEBUG_SRC = \
 	arm_simulator.c \
 	arm_semihosting.c \
 	arm_adi_v5.c \
- 	adi_v5_jtag.c \
+	adi_v5_jtag.c \
 	adi_v5_swd.c \
+	adi_v5_cmsis_dap.c \
 	embeddedice.c \
 	trace.c \
 	etb.c \
@@ -106,6 +113,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 \
@@ -137,7 +160,7 @@ noinst_HEADERS = \
 	dsp563xx_once.h \
 	dsp5680xx.h \
 	breakpoints.h \
-	cortex_m3.h \
+	cortex_m.h \
 	cortex_a.h \
 	embeddedice.h \
 	etb.h \
@@ -157,14 +180,27 @@ noinst_HEADERS = \
 	target_request.h \
 	trace.h \
 	xscale.h \
-	xscale_debug.h \
 	smp.h \
 	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