projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retire jtag_add_dr_out
[fw/openocd]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 8375683d07e79dbfec6e16669df07d2512e00d36..5e9c850996425ba3c1a91765fbac5cf1293f1808 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-12,14
+12,10
@@
SUBDIRS = \
server \
rtos
server \
rtos
-
lib
_LTLIBRARIES = libopenocd.la
+
noinst
_LTLIBRARIES = libopenocd.la
bin_PROGRAMS = openocd
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
@@
-56,7
+52,7
@@
libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
endif
# add default CPPFLAGS
endif
# add default CPPFLAGS
-libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
+libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
$(LIBFTDI_CFLAGS)
# the library search path.
libopenocd_la_LDFLAGS = $(all_libraries)
# the library search path.
libopenocd_la_LDFLAGS = $(all_libraries)
@@
-67,42
+63,6
@@
else
MINGWLDADD =
endif
MINGWLDADD =
endif
-if FT2232_LIBFTDI
-FTDI2232LIB = -lftdi -lusb
-else
-if USB_BLASTER_LIBFTDI
-FTDI2232LIB = -lftdi -lusb
-else
-if PRESTO_LIBFTDI
-FTDI2232LIB = -lftdi -lusb
-else
-FTDI2232LIB =
-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 =
-endif
-endif
-endif
-endif
-endif
-
libopenocd_la_LIBADD = \
$(top_builddir)/src/xsvf/libxsvf.la \
$(top_builddir)/src/svf/libsvf.la \
libopenocd_la_LIBADD = \
$(top_builddir)/src/xsvf/libxsvf.la \
$(top_builddir)/src/svf/libsvf.la \
@@
-114,7
+74,8
@@
libopenocd_la_LIBADD = \
$(top_builddir)/src/server/libserver.la \
$(top_builddir)/src/rtos/librtos.la \
$(top_builddir)/src/helper/libhelper.la \
$(top_builddir)/src/server/libserver.la \
$(top_builddir)/src/rtos/librtos.la \
$(top_builddir)/src/helper/libhelper.la \
- $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
+ $(LIBFTDI_LIBS) $(MINGWLDADD) \
+ $(HIDAPI_LIBS) $(LIBUSB1_LIBS) $(LIBUSB0_LIBS)
STARTUP_TCL_SRCS = \
$(srcdir)/helper/startup.tcl \
STARTUP_TCL_SRCS = \
$(srcdir)/helper/startup.tcl \
@@
-142,7
+103,7
@@
CLEANFILES = startup.tcl startup_tcl.c
# we do not want generated file in the dist
dist-hook:
rm -f $(distdir)/startup_tcl.c
# we do not want generated file in the dist
dist-hook:
rm -f $(distdir)/startup_tcl.c
-
+
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
# The "quick" target builds executables & reinstalls the executables
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
# The "quick" target builds executables & reinstalls the executables