From 8a14a72f573065fc38ed2e4029d2a41d701c3622 Mon Sep 17 00:00:00 2001 From: oharboe Date: Thu, 17 Jul 2008 17:34:53 +0000 Subject: [PATCH] Charles Hardin move jim into helper git-svn-id: svn://svn.berlios.de/openocd/trunk@822 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/Makefile.am | 14 ++------------ src/flash/flash.c | 3 +-- src/helper/Makefile.am | 18 ++++++++++++++++-- src/{ => helper}/bin2char.c | 0 src/{ => helper}/jim.c | 0 src/{ => helper}/jim.h | 0 src/{ => helper}/startup.tcl | 0 src/server/tcl_server.c | 2 +- 8 files changed, 20 insertions(+), 17 deletions(-) rename src/{ => helper}/bin2char.c (100%) rename src/{ => helper}/jim.c (100%) rename src/{ => helper}/jim.h (100%) rename src/{ => helper}/startup.tcl (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 75239fcc5..793d020ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/flash/flash.c b/src/flash/flash.c index 900fdbf9d..01bc6e70b 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -41,8 +41,7 @@ #include #include -#include "../jim.h" - +#include "jim.h" extern Jim_Interp *interp; diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 8a2d472e9..2ba0a5630 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -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 diff --git a/src/bin2char.c b/src/helper/bin2char.c similarity index 100% rename from src/bin2char.c rename to src/helper/bin2char.c diff --git a/src/jim.c b/src/helper/jim.c similarity index 100% rename from src/jim.c rename to src/helper/jim.c diff --git a/src/jim.h b/src/helper/jim.h similarity index 100% rename from src/jim.h rename to src/helper/jim.h diff --git a/src/startup.tcl b/src/helper/startup.tcl similarity index 100% rename from src/startup.tcl rename to src/helper/startup.tcl diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c index 2771254da..a12442ea7 100644 --- a/src/server/tcl_server.c +++ b/src/server/tcl_server.c @@ -24,7 +24,7 @@ #include #include "tcl_server.h" -#include "../jim.h" +#include "jim.h" #include "log.h" #include "command.h"