Commit 8a14a72f authored by oharboe's avatar oharboe
Browse files

Charles Hardin <ckhardin@gmail.com> move jim into helper

git-svn-id: svn://svn.berlios.de/openocd/trunk@822 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 0ebb33b1
......@@ -3,10 +3,10 @@ bin_PROGRAMS = openocd
if ECOSBOARD
MAINFILE = ecosboard.c
else
MAINFILE = main.c jim.c
MAINFILE = main.c
endif
openocd_SOURCES = $(MAINFILE) openocd.c startup_tcl.c
openocd_SOURCES = $(MAINFILE) openocd.c
# set the include path found by configure
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \
......@@ -94,13 +94,3 @@ nobase_dist_pkglib_DATA = \
tcl/mmr_helpers.tcl \
tcl/readable.tcl
noinst_PROGRAMS = bin2char
bin2char_SOURCES = bin2char.c
# Convert .tcl to cfile
startup_tcl.c: bin2char startup.tcl
./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
# add startup_tcl.c to make clean list
CLEANFILES = startup_tcl.c
......@@ -41,8 +41,7 @@
#include <errno.h>
#include <inttypes.h>
#include "../jim.h"
#include "jim.h"
extern Jim_Interp *interp;
......
......@@ -6,10 +6,24 @@ noinst_LIBRARIES = libhelper.a
if ECOSBOARD
CONFIGFILES =
else
CONFIGFILES = options.c
CONFIGFILES = options.c jim.c
endif
libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
replacements.c fileio.c
noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
time_support.h replacements.h fileio.h
time_support.h replacements.h fileio.h \
jim.h
libhelper_a_SOURCES += startup_tcl.c
noinst_PROGRAMS = bin2char
bin2char_SOURCES = bin2char.c
# Convert .tcl to cfile
startup_tcl.c: bin2char startup.tcl
./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
# add startup_tcl.c to make clean list
CLEANFILES = startup_tcl.c
......@@ -24,7 +24,7 @@
#include <stdarg.h>
#include "tcl_server.h"
#include "../jim.h"
#include "jim.h"
#include "log.h"
#include "command.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment