oocd_trace_t -> struct oocd_trace

[openocd.git] / src / target / Makefile.am

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index a2c34f0f74355ca427f55c1ad09c57cc4e870d86..9dd0bdc91b7b4cc5999ea9806f809a839b6bf152 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -10,99 +10,130 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/jtag \
        -I$(top_srcdir)/src/xsvf
 
-# ideally this would be specific to xscale_debug.S ...
-libtarget_la_CCASFLAGS = \
-       -Wa,-I$(top_srcdir)/src/target \
-       $(AM_CCASFLAGS)
+BIN2C          = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
 
+DEBUG_HANDLER  = $(srcdir)/xscale/debug_handler.bin
+EXTRA_DIST = $(DEBUG_HANDLER)
+
+DEBUG_HEADER   = xscale_debug.h
+BUILT_SOURCES = $(DEBUG_HEADER)
+CLEANFILES = $(DEBUG_HEADER)
+
+$(DEBUG_HEADER): $(BIN2C) $(DEBUG_HANDLER)
+       $(BIN2C) < $(DEBUG_HANDLER) xscale_debug_handler > xscale_debug.h
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libtarget.la
 libtarget_la_SOURCES = \
-       target.c \
+       $(TARGET_CORE_SRC) \
+       $(ARM_DEBUG_SRC) \
+       $(ARMV4_5_SRC) \
+       $(ARMV6_SRC) \
+       $(ARMV7_SRC) \
+       $(ARM_MISC_SRC) \
+       $(MIPS32_SRC) \
+       avrt.c
+
+TARGET_CORE_SRC = \
+       algorithm.c \
        register.c \
+       image.c \
        breakpoints.c \
+       target.c \
+       target_request.c
+
+ARMV4_5_SRC = \
        armv4_5.c \
-       embeddedice.c \
-       etm.c \
+       armv4_5_mmu.c \
+       armv4_5_cache.c \
+       $(ARM7_9_SRC)
+
+ARM7_9_SRC = \
+       arm7_9_common.c \
        arm7tdmi.c \
+       arm720t.c \
        arm9tdmi.c \
-       arm_jtag.c \
-       arm7_9_common.c \
-       algorithm.c \
        arm920t.c \
-       arm720t.c \
-       armv4_5_mmu.c \
-       armv4_5_cache.c \
-       arm_disassembler.c \
        arm966e.c \
-       arm926ejs.c \
+       arm926ejs.c
+
+ARM_MISC_SRC = \
        fa526.c \
        feroceon.c \
-       etb.c \
-       xscale.c \
-       xscale_debug.S \
-       arm_simulator.c \
-       image.c \
+       xscale.c
+
+ARMV6_SRC = \
+       arm11.c \
+       arm11_dbgtap.c
+
+ARMV7_SRC = \
        armv7m.c \
-       armv7a.c \
        cortex_m3.c \
-       cortex_a8.c \
+       armv7a.c \
+       cortex_a8.c
+
+ARM_DEBUG_SRC = \
+       arm_jtag.c \
+       arm_disassembler.c \
+       arm_simulator.c \
        arm_adi_v5.c \
-       etm_dummy.c \
-       $(OOCD_TRACE_FILES) \
-       target_request.c \
+       embeddedice.c \
        trace.c \
-       arm11.c \
-       arm11_dbgtap.c \
+       etb.c \
+       etm.c \
+       $(OOCD_TRACE_FILES) \
+       etm_dummy.c
+
+MIPS32_SRC = \
        mips32.c \
        mips_m4k.c \
        mips32_pracc.c \
        mips32_dmaacc.c \
-       mips_ejtag.c \
-       avrt.c
+       mips_ejtag.c
+
 
 noinst_HEADERS = \
-       target.h \
-       target_type.h \
-       trace.h \
-       register.h \
-       armv4_5.h \
-       embeddedice.h \
-       etm.h \
-       arm7tdmi.h \
-       arm9tdmi.h \
+       algorithm.h \
        arm_jtag.h \
+       arm_adi_v5.h \
+       arm_disassembler.h \
+       arm_simulator.h \
        arm7_9_common.h \
-       arm920t.h \
+       arm7tdmi.h \
        arm720t.h \
+       arm9tdmi.h \
+       arm920t.h \
+       arm926ejs.h \
+       arm966e.h \
+       arm11.h \
+       armv4_5.h \
        armv4_5_mmu.h \
        armv4_5_cache.h \
-       breakpoints.h \
-       algorithm.h \
-       arm_disassembler.h \
-       arm966e.h \
-       arm926ejs.h \
-       etb.h \
-       xscale.h \
-       arm_simulator.h \
-       image.h \
-       armv7m.h \
        armv7a.h \
+       armv7m.h \
+       avrt.h \
+       breakpoints.h \
        cortex_m3.h \
        cortex_a8.h \
-       arm_adi_v5.h \
+       embeddedice.h \
+       etb.h \
+       etm.h \
        etm_dummy.h \
-       oocd_trace.h \
-       target_request.h \
-       trace.h \
-       arm11.h \
+       image.h \
        mips32.h \
        mips_m4k.h \
        mips_ejtag.h \
        mips32_pracc.h \
        mips32_dmaacc.h \
-       avrt.h
+       oocd_trace.h \
+       register.h \
+       target.h \
+       target_type.h \
+       trace.h \
+       target_request.h \
+       trace.h \
+       xscale.h \
+       xscale_debug.h
 
 nobase_dist_pkglib_DATA =
 nobase_dist_pkglib_DATA += ecos/at91eb40a.elf