- remove unused objcopy from configure.in

[fw/openocd] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f1a221138a56934c05567415dc6ba672eff284e..27309ecabae12689e3c7ed69698b8da49fe8adbf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,6 @@
-bin_PROGRAMS = openocd
+bin_PROGRAMS = bin2char openocd
+
+bin2char_SOURCES = bin2char.c
 
 if ECOSBOARD
 MAINFILE = ecosboard.c
@@ -6,7 +8,7 @@ else
 MAINFILE = main.c jim.c
 endif
 
-openocd_SOURCES = $(MAINFILE) openocd.c
+openocd_SOURCES = $(MAINFILE) openocd.c startup_tcl.c
 
 # set the include path found by configure
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \
@@ -70,7 +72,7 @@ FTD2XXLIB =
 endif
 endif
 
-openocd_LDADD = $(top_builddir)/src/startup.o $(top_builddir)/src/xsvf/libxsvf.a \
+openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
        $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
        $(top_builddir)/src/helper/libhelper.a \
        $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
@@ -78,8 +80,6 @@ openocd_LDADD = $(top_builddir)/src/startup.o $(top_builddir)/src/xsvf/libxsvf.a
        $(top_builddir)/src/pld/libpld.a \
        $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
 
-       
-       
 nobase_dist_pkglib_DATA = \
        tcl/bitsbytes.tcl  \
        tcl/chip/atmel/at91/aic.tcl  \
@@ -96,7 +96,9 @@ nobase_dist_pkglib_DATA = \
        tcl/mmr_helpers.tcl  \
        tcl/readable.tcl  
 
-# Convert .tcl to object
+# Convert .tcl to cfile
+startup_tcl.c: bin2char startup.tcl
+       ./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
 
-$(top_builddir)/src/startup.o: $(top_srcdir)/src/startup.tcl
-       ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl startup.o
+# add startup_tcl.c to make clean list
+CLEANFILES = startup_tcl.c