summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-05-14 14:13:38 +0000
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-05-14 14:13:38 +0000
commit548bb19aa28ca2eec4b8f1c06cbb4b0ace162db3 (patch)
tree3652a17e6c525942d3a2becfa05dbda1d9972437 /src/Makefile.am
parentf1e72cf029f28a337679ca787003c54d5c1e2bde (diff)
downloadopenocd+libswd-548bb19aa28ca2eec4b8f1c06cbb4b0ace162db3.tar.gz
openocd+libswd-548bb19aa28ca2eec4b8f1c06cbb4b0ace162db3.tar.bz2
openocd+libswd-548bb19aa28ca2eec4b8f1c06cbb4b0ace162db3.tar.xz
openocd+libswd-548bb19aa28ca2eec4b8f1c06cbb4b0ace162db3.zip
- added jlink support, based on Jürgen Stuber patch
git-svn-id: svn://svn.berlios.de/openocd/trunk@658 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d575fbde..4cfabb39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,8 +44,12 @@ endif
if USBPROG
LIBUSB = -lusb
else
+if JLINK
+LIBUSB = -lusb
+else
LIBUSB =
endif
+endif
if IS_WIN32
if FTD2XXDIR