diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-11 18:25:21 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-07-11 18:25:21 +0000 |
| commit | 76dec044c02bb6d045c2e699501c8e07d75f6013 (patch) | |
| tree | 355dbb415f86d1494e35c4c64731357a346e58af | |
| parent | 94966bf2e3933e308f3093a3fbf403ab83331ac5 (diff) | |
| download | openocd+libswd-76dec044c02bb6d045c2e699501c8e07d75f6013.tar.gz openocd+libswd-76dec044c02bb6d045c2e699501c8e07d75f6013.tar.bz2 openocd+libswd-76dec044c02bb6d045c2e699501c8e07d75f6013.tar.xz openocd+libswd-76dec044c02bb6d045c2e699501c8e07d75f6013.zip | |
- configure check added for tclsh
- startup.c manually added to clean deps
git-svn-id: svn://svn.berlios.de/openocd/trunk@796 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 343b52c6..cce438fe 100644 --- a/configure.in +++ b/configure.in @@ -290,6 +290,12 @@ AM_CONDITIONAL(BITQ, test $build_bitq = yes) AC_LANG_C AC_PROG_CC AC_PROG_RANLIB +AC_PATH_PROG(TCLSH, tclsh) + +# quit if we have no tclsh +if test "x${TCLSH}" = "x"; then + AC_MSG_ERROR([no working tclsh found]) +fi AC_SUBST(WITH_FTD2XX, $with_ftd2xx) diff --git a/src/Makefile.am b/src/Makefile.am index fae00866..20b64251 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,6 @@ else MAINFILE = main.c jim.c endif - openocd_SOURCES = $(MAINFILE) openocd.c startup.c # set the include path found by configure @@ -99,4 +98,7 @@ nobase_dist_pkglib_DATA = \ # Convert .tcl to .c file startup.c: $(top_srcdir)/src/startup.tcl Makefile $(top_srcdir)/src/file2c.tcl - tclsh $(top_srcdir)/src/file2c.tcl $(top_srcdir)/src/startup.tcl startup.c
\ No newline at end of file + ${TCLSH} $(top_srcdir)/src/file2c.tcl $(top_srcdir)/src/startup.tcl startup.c + +# add startup.c to make clean list +CLEANFILES = startup.c |