summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2007-08-14 10:05:40 +0000
committerdrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2007-08-14 10:05:40 +0000
commit708535960c13fcb7bbd5d07abc871c5832f53aa2 (patch)
treeb924228b71c7277ece9ed3e1d7db00923b6edd6c /src
parent29000b204d039bc1123027eba755329ab36a3dde (diff)
downloadopenocd+libswd-708535960c13fcb7bbd5d07abc871c5832f53aa2.tar.gz
openocd+libswd-708535960c13fcb7bbd5d07abc871c5832f53aa2.tar.bz2
openocd+libswd-708535960c13fcb7bbd5d07abc871c5832f53aa2.tar.xz
openocd+libswd-708535960c13fcb7bbd5d07abc871c5832f53aa2.zip
- corrected automake script
git-svn-id: svn://svn.berlios.de/openocd/trunk@195 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/jtag/Makefile.am3
-rw-r--r--src/openocd.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e72a612..512aade4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,10 @@ FTDI2232LIB = -lftdi
else
if PRESTO_LIBFTDI
FTDI2232LIB = -lftdi
-endif
+else
FTDI2232LIB =
endif
+endif
if USBPROG
LIBUSB = -lusb
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index b993b1ce..a35e3f3f 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -70,9 +70,10 @@ PRESTOFILES = presto.c
else
if PRESTO_FTD2XX
PRESTOFILES = presto.c
-endif
+else
PRESTOFILES =
endif
+endif
if USBPROG
USBPROGFILES = usbprog.c
diff --git a/src/openocd.c b/src/openocd.c
index f7261c77..7e85c82b 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#define OPENOCD_VERSION "Open On-Chip Debugger (2007-08-14 11:45 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-08-14 12:00 CEST)"
#ifdef HAVE_CONFIG_H
#include "config.h"