projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RTOS Thread awareness support wip
[fw/openocd]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 56385f7e19ae04599fd194e5f2f6d9f0a0724230..3d7b05f6a3c8e75ddb933ade5e87e8f6dbce4543 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,12
+1,15
@@
+include $(top_srcdir)/common.mk
+
SUBDIRS = \
SUBDIRS = \
- helper \
jtag \
jtag \
+ helper \
target \
flash \
svf \
xsvf \
pld \
target \
flash \
svf \
xsvf \
pld \
- server
+ server \
+ rtos
lib_LTLIBRARIES = libopenocd.la
bin_PROGRAMS = openocd
lib_LTLIBRARIES = libopenocd.la
bin_PROGRAMS = openocd
@@
-20,6
+23,12
@@
endif
openocd_SOURCES = $(MAINFILE)
openocd_LDADD = libopenocd.la
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 \
libopenocd_la_SOURCES = \
hello.c \
openocd.c \
@@
-29,12
+38,6
@@
noinst_HEADERS = \
hello.h \
openocd.h
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
libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
# banner output includes RELSTR appended to $VERSION from the configure script
@@
-98,13
+101,10
@@
libopenocd_la_LIBADD = \
$(top_builddir)/src/flash/libflash.la \
$(top_builddir)/src/target/libtarget.la \
$(top_builddir)/src/server/libserver.la \
$(top_builddir)/src/flash/libflash.la \
$(top_builddir)/src/target/libtarget.la \
$(top_builddir)/src/server/libserver.la \
+ $(top_builddir)/src/rtos/librtos.la \
$(top_builddir)/src/helper/libhelper.la \
$(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
$(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 \
STARTUP_TCL_SRCS = \
$(srcdir)/helper/startup.tcl \
$(srcdir)/jtag/startup.tcl \