src/jtag: remove 'extern' and wrap headers.

[openocd] / src / target / Makefile.am

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 132ac50b3663c459b1fb0f776e51b1f1c81934f8..f62ba1d878dd87b43a565dc1db5a10bc5a5eef73 100644 (file)
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -10,6 +10,18 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/jtag \
        -I$(top_srcdir)/src/xsvf
 
+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 = \
@@ -31,12 +43,14 @@ libtarget_la_SOURCES = \
        arm_disassembler.c \
        arm966e.c \
        arm926ejs.c \
+       fa526.c \
        feroceon.c \
        etb.c \
        xscale.c \
        arm_simulator.c \
        image.c \
        armv7m.c \
+       armv7a.c \
        cortex_m3.c \
        cortex_a8.c \
        arm_adi_v5.c \
@@ -55,6 +69,7 @@ libtarget_la_SOURCES = \
 
 noinst_HEADERS = \
        target.h \
+       target_type.h \
        trace.h \
        register.h \
        armv4_5.h \
@@ -75,9 +90,11 @@ noinst_HEADERS = \
        arm926ejs.h \
        etb.h \
        xscale.h \
+       xscale_debug.h \
        arm_simulator.h \
        image.h \
        armv7m.h \
+       armv7a.h \
        cortex_m3.h \
        cortex_a8.h \
        arm_adi_v5.h \
@@ -94,7 +111,6 @@ noinst_HEADERS = \
        avrt.h
 
 nobase_dist_pkglib_DATA =
-nobase_dist_pkglib_DATA += xscale/debug_handler.bin 
 nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in