From c1ee650a9aead0bd25d7aa37fd65e5a3ed0c6e38 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 21 Jul 2008 13:23:59 +0000
Subject: [PATCH] cross compile fix

git-svn-id: svn://svn.berlios.de/openocd/trunk@848 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/helper/Makefile.am | 11 ++++++-----
 src/helper/command.h   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 630fbf50a9..6e1af8fd9e 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 0ef313ad5b..c8807dde3f 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
-- 
2.30.2