projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash/nor/stellaris: actually enable protection and unprotection with ICDI
[fw/openocd]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index 8375683d07e79dbfec6e16669df07d2512e00d36..7d67e3d7e95f51063888799338ba737b54daa8b1 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
@@
-36,8
+32,7
@@
endif
libopenocd_la_SOURCES = \
hello.c \
libopenocd_la_SOURCES = \
hello.c \
- openocd.c \
- startup_tcl.c
+ openocd.c
noinst_HEADERS = \
hello.h \
noinst_HEADERS = \
hello.h \
@@
-67,42
+62,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
+73,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 \
@@
-125,24
+85,24
@@
STARTUP_TCL_SRCS = \
EXTRA_DIST = $(STARTUP_TCL_SRCS)
EXTRA_DIST = $(STARTUP_TCL_SRCS)
-BUILT_SOURCES = startup
.tcl
+BUILT_SOURCES = startup
_tcl.inc
startup.tcl: $(STARTUP_TCL_SRCS)
cat $^ > $@
startup.tcl: $(STARTUP_TCL_SRCS)
cat $^ > $@
-BIN2C = $(top_
builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+BIN2C = $(top_
srcdir)/src/helper/bin2char.sh
-# Convert .tcl to c
file
-startup_tcl.c: startup.tcl $(BIN2C)
- $(BIN2C)
openocd_startup_tcl < $< > $@ || rm -f $@
+# Convert .tcl to c
-array
+startup_tcl.
in
c: startup.tcl $(BIN2C)
+ $(BIN2C)
< $< > $@ || { rm -f $@; false; }
-# add
startup_tcl.c
to make clean list
-CLEANFILES = startup.tcl startup_tcl.c
+# add
generated files
to make clean list
+CLEANFILES = startup.tcl startup_tcl.
in
c
# we do not want generated file in the dist
dist-hook:
# we do not want generated file in the dist
dist-hook:
- rm -f $(distdir)/startup_tcl.c
-
+ rm -f $(distdir)/startup_tcl.
in
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