diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-13 17:31:40 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-13 17:31:40 +0000 |
| commit | 766b0ca8ac484a37d878623a189985b8e51e73cd (patch) | |
| tree | 96f2c1b701471ff694e9051cce67b949a92d1219 /src/Makefile.am | |
| parent | 6956527849370062f059a2e63f30936595b48825 (diff) | |
| download | openocd+libswd-766b0ca8ac484a37d878623a189985b8e51e73cd.tar.gz openocd+libswd-766b0ca8ac484a37d878623a189985b8e51e73cd.tar.bz2 openocd+libswd-766b0ca8ac484a37d878623a189985b8e51e73cd.tar.xz openocd+libswd-766b0ca8ac484a37d878623a189985b8e51e73cd.zip | |
Charles Hardin <ckhardin@gmail.com> - hopefully final word on startup.tcl => c conversion
git-svn-id: svn://svn.berlios.de/openocd/trunk@803 b42882b7-edfa-0310-969c-e2dbd0fdcd60
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 502a63d5..0cb13ab6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,6 @@ -bin_PROGRAMS = openocd +bin_PROGRAMS = openocd bin2char + +bin2char_SOURCES = bin2char.c if ECOSBOARD MAINFILE = ecosboard.c @@ -6,7 +8,7 @@ else MAINFILE = main.c jim.c endif -openocd_SOURCES = $(MAINFILE) openocd.c +openocd_SOURCES = $(MAINFILE) openocd.c startup_tcl.c # set the include path found by configure INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \ @@ -70,7 +72,7 @@ FTD2XXLIB = endif endif -openocd_LDADD = $(top_builddir)/src/startup.o $(top_builddir)/src/xsvf/libxsvf.a \ +openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \ $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \ $(top_builddir)/src/helper/libhelper.a \ $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \ @@ -94,9 +96,6 @@ nobase_dist_pkglib_DATA = \ tcl/mmr_helpers.tcl \ tcl/readable.tcl -# Convert .tcl to object - -$(top_builddir)/src/startup.o: $(top_srcdir)/src/startup.tcl - abs_builddir=`cd $(top_builddir) && pwd` && \ - cd $(top_srcdir)/src && \ - ${OBJCOPY} -I binary -O ${OBJCOPY_FORMAT} -B ${OBJCOPY_ARCH} startup.tcl $$abs_builddir/src/startup.o +# Convert .tcl to cfile +startup_tcl.c: bin2char startup.tcl + ./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c |