Don't require Jim Tcl to be separately configured and installed. This fixes builds on cygwin.
Signed-off-by: Steve Bennett <[email protected]> --- Makefile.am | 2 +- bootstrap | 8 ++------ configure.in | 2 ++ jimtcl | 2 +- src/Makefile.am | 6 ++++-- src/flash/Makefile.am | 4 +++- src/flash/nand/Makefile.am | 4 +++- src/flash/nor/Makefile.am | 4 +++- src/helper/Makefile.am | 2 ++ src/jtag/Makefile.am | 4 +++- src/jtag/drivers/Makefile.am | 4 +++- src/pld/Makefile.am | 4 +++- src/server/Makefile.am | 2 ++ src/svf/Makefile.am | 4 +++- src/target/Makefile.am | 4 +++- src/xsvf/Makefile.am | 4 +++- 16 files changed, 41 insertions(+), 19 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7d42fd3..b346570 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ nobase_dist_pkgdata_DATA = \ contrib/libdcc/README \ contrib/openocd.udev -SUBDIRS = src doc +SUBDIRS = jimtcl src doc EXTRA_DIST = \ Doxyfile.in \ diff --git a/bootstrap b/bootstrap index 81c9804..d41adae 100755 --- a/bootstrap +++ b/bootstrap @@ -28,14 +28,10 @@ automake --gnu --add-missing --copy # otherwise the documentation will fail to build due to missing version.texi echo "Bootstrap complete. Quick start build instructions:" echo "" -echo "1. Build Jim Tcl" +echo "1. Update Jim Tcl" echo "" echo "git submodule init" echo "git submodule update" -echo "cd jimtcl" -echo "./configure --with-jim-ext=nvp" -echo "make" -echo "make install" echo "" echo "2. Configure" -echo "./configure --enable-maintainer-mode ...." +echo "./configure --enable-maintainer-mode --with-jim-ext=nvp ...." diff --git a/configure.in b/configure.in index a15b80a..c4e8505 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,8 @@ AC_DISABLE_SHARED AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) +AC_CONFIG_SUBDIRS([jimtcl]) + dnl configure checks required for Jim files (these are obsolete w/ C99) AC_C_CONST diff --git a/jimtcl b/jimtcl index fbbc8e0..5a9c9cd 160000 --- a/jimtcl +++ b/jimtcl @@ -1 +1 @@ -Subproject commit fbbc8e0b402adb4b0c8d3976015fe4a82c94560f +Subproject commit 5a9c9cdc1a0add1d0e6e63e64d5d7d7febc6d749 diff --git a/src/Makefile.am b/src/Makefile.am index b54161c..5d22c44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ MAINFILE = main.c endif openocd_SOURCES = $(MAINFILE) -openocd_LDADD = libopenocd.la -ljim +openocd_LDADD = libopenocd.la -L$(top_builddir)/jimtcl -ljim libopenocd_la_SOURCES = \ hello.c \ @@ -33,7 +33,9 @@ noinst_HEADERS = \ # set the include path found by configure AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\" diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index 9d983a8..d79acf1 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -4,7 +4,9 @@ SUBDIRS = \ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl METASOURCES = AUTO noinst_LTLIBRARIES = libflash.la diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am index 8ea7b36..ea052d6 100644 --- a/src/flash/nand/Makefile.am +++ b/src/flash/nand/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl noinst_LTLIBRARIES = libocdflashnand.la diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index eec6f50..b17db8b 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl noinst_LTLIBRARIES = libocdflashnor.la libocdflashnor_la_SOURCES = \ diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index c721881..670c1d1 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl \ -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 59cd8ff..ca03952 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl METASOURCES = AUTO noinst_LTLIBRARIES = libjtag.la diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 0588126..11312d0 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl noinst_LTLIBRARIES = libocdjtagdrivers.la diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am index 3993622..866caa7 100644 --- a/src/pld/Makefile.am +++ b/src/pld/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl METASOURCES = AUTO noinst_LTLIBRARIES = libpld.la diff --git a/src/server/Makefile.am b/src/server/Makefile.am index c6c946f..484b57b 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl \ -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am index 398f967..b6b9d06 100644 --- a/src/svf/Makefile.am +++ b/src/svf/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl METASOURCES = AUTO noinst_LTLIBRARIES = libsvf.la diff --git a/src/target/Makefile.am b/src/target/Makefile.am index 1e29ae7..17b283f 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -7,7 +7,9 @@ endif AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD) diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am index f96331c..d6980ca 100644 --- a/src/xsvf/Makefile.am +++ b/src/xsvf/Makefile.am @@ -1,6 +1,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src + -I$(top_builddir)/src \ + -I$(top_srcdir)/jimtcl \ + -I$(top_builddir)/jimtcl METASOURCES = AUTO noinst_LTLIBRARIES = libxsvf.la -- 1.5.5.3 _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
