projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfg: ftdi icdi enable srst open drain config
[fw/openocd]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 1e7af9c760dae0ab7b01a39d8c904d09d7fa9e42..c78e81c801fb48324a30578460b0e21104b1ab3a 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-15,11
+15,7
@@
SUBDIRS = \
lib_LTLIBRARIES = libopenocd.la
bin_PROGRAMS = openocd
lib_LTLIBRARIES = libopenocd.la
bin_PROGRAMS = openocd
-if ECOSBOARD
-MAINFILE = ecosboard.c
-else
MAINFILE = main.c
MAINFILE = main.c
-endif
openocd_SOURCES = $(MAINFILE)
openocd_LDADD = libopenocd.la
openocd_SOURCES = $(MAINFILE)
openocd_LDADD = libopenocd.la
@@
-30,6
+26,10
@@
else
openocd_LDADD += -ljim
endif
openocd_LDADD += -ljim
endif
+if ULINK
+openocd_LDADD += -lm
+endif
+
libopenocd_la_SOURCES = \
hello.c \
openocd.c \
libopenocd_la_SOURCES = \
hello.c \
openocd.c \
@@
-45,10
+45,11
@@
libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
# guess-rev.sh returns either a repository version ID or "-snapshot"
if RELEASE
libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
# guess-rev.sh returns either a repository version ID or "-snapshot"
if RELEASE
libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
+libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
else
libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
else
libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
-endif
libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+endif
# add default CPPFLAGS
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
# add default CPPFLAGS
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
@@
-76,26
+77,13
@@
endif
endif
endif
endif
endif
-if USBPROG
-LIBUSB = -lusb
-else
-if JLINK
-LIBUSB = -lusb
-else
-if RLINK
-LIBUSB = -lusb
-else
-if ULINK
-LIBUSB = -lusb
-else
-if VSLLINK
-LIBUSB = -lusb
-else
LIBUSB =
LIBUSB =
+if USE_LIBUSB1
+LIBUSB += -lusb-1.0
endif
endif
-endif
-endif
-endif
+
+if USE_LIBUSB0
+LIBUSB += -lusb
endif
libopenocd_la_LIBADD = \
endif
libopenocd_la_LIBADD = \