build: add autobuild jimtcl to configure scripts

[openocd] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a566b4d422fdce4cfd98079a4e3fca3dd55de687..77449862dadc8547a91075877080131aaeaa08a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
+include $(top_srcdir)/common.mk
+
 SUBDIRS = \
-       helper \
        jtag \
+       helper \
        target \
        flash \
        svf \
@@ -20,6 +22,12 @@ endif
 openocd_SOURCES = $(MAINFILE)
 openocd_LDADD = libopenocd.la
 
+if INTERNAL_JIMTCL
+openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
+else
+openocd_LDADD += -ljim
+endif
+
 libopenocd_la_SOURCES = \
        hello.c \
        openocd.c \
@@ -29,12 +37,6 @@ noinst_HEADERS = \
        hello.h \
        openocd.h
 
-
-# set the include path found by configure
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_builddir)/src
-
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
 # banner output includes RELSTR appended to $VERSION from the configure script
@@ -44,6 +46,7 @@ libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
 else
 libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
 endif
+libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
 
 # add default CPPFLAGS
 libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
@@ -100,10 +103,6 @@ libopenocd_la_LIBADD = \
        $(top_builddir)/src/helper/libhelper.la \
        $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
-if HTTPD
-libopenocd_la_LIBADD += -lmicrohttpd
-endif
-
 STARTUP_TCL_SRCS = \
        $(srcdir)/helper/startup.tcl \
        $(srcdir)/jtag/startup.tcl \