summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-21 13:23:59 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-07-21 13:23:59 +0000
commitc1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38 (patch)
tree0214c8d90134f53e03339506626f0e10062de151 /src
parentc4c1776a09759a8bde3d0a28c423d3ff269fb160 (diff)
downloadopenocd_libswd-c1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38.tar.gz
openocd_libswd-c1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38.tar.bz2
openocd_libswd-c1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38.tar.xz
openocd_libswd-c1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38.zip
cross compile fix
git-svn-id: svn://svn.berlios.de/openocd/trunk@848 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/helper/Makefile.am11
-rw-r--r--src/helper/command.h2
2 files changed, 7 insertions, 6 deletions
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 630fbf50..6e1af8fd 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -15,13 +15,14 @@ libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c comman
noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
time_support.h replacements.h fileio.h jim.h
-noinst_PROGRAMS = bin2char
-
-bin2char_SOURCES = bin2char.c
# Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT)
- ./bin2char$(EXEEXT) startup_tcl < $(srcdir)/$< > $@
+#
+# Fix!!! how do we make this more automake friendly?
+#
+startup_tcl.c: startup.tcl
+ gcc -o bin2char $(srcdir)/bin2char.c
+ ./bin2char startup_tcl < $(srcdir)/startup.tcl > $@
# add startup_tcl.c to make clean list
CLEANFILES = startup_tcl.c
diff --git a/src/helper/command.h b/src/helper/command.h
index 0ef313ad..c8807dde 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -84,7 +84,7 @@ extern int fast_and_dangerous;
/* Integrate the JIM TCL interpretor into the command processing. */
#include <stdarg.h>
-#ifdef __ECOS
+#if BUILD_ECOSBOARD
/* Jim is provied by eCos */
#include <cyg/jimtcl/jim.h>
#else