diff options
author | Spencer Oliver <ntfreak@users.sourceforge.net> | 2010-11-17 10:26:21 +0000 |
---|---|---|
committer | Spencer Oliver <ntfreak@users.sourceforge.net> | 2010-11-18 14:05:57 +0000 |
commit | d80fca527a6618595a118381a2cd2a569f85889f (patch) | |
tree | 3c26855eb3bd281825cb9e8bc77af886fdc1b658 /src | |
parent | 838cd58e24a18102b8a140df9fa993fe65706828 (diff) |
build: add autobuild jimtcl to configure scripts
Rather than having to configure/build jimtcl openocd
will do this as part of its own build.
To use an external jimtcl lib specify disable-internal-jimtcl
to the configure step.
Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c2d37c10..77449862 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,13 @@ MAINFILE = main.c endif openocd_SOURCES = $(MAINFILE) -openocd_LDADD = libopenocd.la -ljim +openocd_LDADD = libopenocd.la + +if INTERNAL_JIMTCL +openocd_LDADD += $(top_builddir)/jimtcl/libjim.a +else +openocd_LDADD += -ljim +endif libopenocd_la_SOURCES = \ hello.c \ |