summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomek CEDRO <cederom@tlen.pl>2011-06-25 03:28:15 +0200
committerTomek CEDRO <cederom@tlen.pl>2011-06-25 03:28:15 +0200
commit1cfa4bfd3bbd1f92d68b5e3d9bb8e149952dd3d4 (patch)
tree1c0902df17abe8826fb1f78e9f625ca7dbc5fd3e
parent71f9339384b39e1f603dd26f490e8aba5d7628e6 (diff)
downloadopenocd+libswd-1cfa4bfd3bbd1f92d68b5e3d9bb8e149952dd3d4.tar.gz
openocd+libswd-1cfa4bfd3bbd1f92d68b5e3d9bb8e149952dd3d4.tar.bz2
openocd+libswd-1cfa4bfd3bbd1f92d68b5e3d9bb8e149952dd3d4.tar.xz
openocd+libswd-1cfa4bfd3bbd1f92d68b5e3d9bb8e149952dd3d4.zip
Fixed linking with innternal/external libswd.
-rw-r--r--src/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index cd034acb..e2f54c9a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,12 @@ else
openocd_LDADD += -ljim
endif
+if INTERNAL_LIBSWD
+openocd_LDADD += $(top_builddir)/submodules/libswd/src/libswd.la
+else
+openocd_LDADD += -lswd
+endif
+
libopenocd_la_SOURCES = \
hello.c \
openocd.c \