diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-06-18 23:10:45 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-08-02 09:01:32 +0000 |
| commit | 91e47f3ab8875176b6f6ac9244562f42f140467d (patch) | |
| tree | 7d5fa6bbf301f70561a6b105bd4469f2093c1c96 /src/Makefile.am | |
| parent | f1b04a20dcf6baedbd0f06a38d8748586d48dbb7 (diff) | |
| download | riscv-openocd-91e47f3ab8875176b6f6ac9244562f42f140467d.zip riscv-openocd-91e47f3ab8875176b6f6ac9244562f42f140467d.tar.gz riscv-openocd-91e47f3ab8875176b6f6ac9244562f42f140467d.tar.bz2 | |
Fix some problems with the bin2char utility
Don't hardcode the type for the array, just output the array initializer
so the includer can choose the type and storage class, zero-terminate at
will and so on.
Change-Id: I6d5e0710eaaba0a218b3eb32f6569177356f4462
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/2176
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b539ec4..7d67e3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,8 +32,7 @@ endif libopenocd_la_SOURCES = \ hello.c \ - openocd.c \ - startup_tcl.c + openocd.c noinst_HEADERS = \ hello.h \ @@ -86,23 +85,23 @@ STARTUP_TCL_SRCS = \ EXTRA_DIST = $(STARTUP_TCL_SRCS) -BUILT_SOURCES = startup.tcl +BUILT_SOURCES = startup_tcl.inc startup.tcl: $(STARTUP_TCL_SRCS) cat $^ > $@ BIN2C = $(top_srcdir)/src/helper/bin2char.sh -# Convert .tcl to cfile -startup_tcl.c: startup.tcl $(BIN2C) - $(BIN2C) openocd_startup_tcl < $< > $@ || rm -f $@ +# Convert .tcl to c-array +startup_tcl.inc: startup.tcl $(BIN2C) + $(BIN2C) < $< > $@ || { rm -f $@; false; } -# add startup_tcl.c to make clean list -CLEANFILES = startup.tcl startup_tcl.c +# add generated files to make clean list +CLEANFILES = startup.tcl startup_tcl.inc # we do not want generated file in the dist dist-hook: - rm -f $(distdir)/startup_tcl.c + rm -f $(distdir)/startup_tcl.inc MAINTAINERCLEANFILES = $(srcdir)/Makefile.in |