ARMv7-M: make DAP commands verify target is an ARMv7-M

[openocd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9198d0cafd7e1fdc6649eb22cff35ff57fc8cbb1..a566b4d422fdce4cfd98079a4e3fca3dd55de687 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS = helper jtag xsvf svf target server flash pld
+SUBDIRS = \
+       helper \
+       jtag \
+       target \
+       flash \
+       svf \
+       xsvf \
+       pld \
+       server

 
 lib_LTLIBRARIES = libopenocd.la
 bin_PROGRAMS = openocd
 
 lib_LTLIBRARIES = libopenocd.la
 bin_PROGRAMS = openocd


@@ -12,26 +20,29 @@ endif
 openocd_SOURCES = $(MAINFILE)
 openocd_LDADD = libopenocd.la
 
 openocd_SOURCES = $(MAINFILE)
 openocd_LDADD = libopenocd.la
 

-libopenocd_la_SOURCES = openocd.c
+libopenocd_la_SOURCES = \
+       hello.c \
+       openocd.c \
+       startup_tcl.c
+
+noinst_HEADERS = \
+       hello.h \
+       openocd.h
+

 
 # set the include path found by configure
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
 
 # set the include path found by configure
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \

-       -I$(top_srcdir)/src/helper \
-       -I$(top_srcdir)/src/jtag \
-       -I$(top_srcdir)/src/target \
-       -I$(top_srcdir)/src/xsvf \
-       -I$(top_srcdir)/src/svf \
-       -I$(top_srcdir)/src/server \
-       -I$(top_srcdir)/src/flash \
-       -I$(top_srcdir)/src/pld
+       -I$(top_builddir)/src

 
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
 
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 

+# banner output includes RELSTR appended to $VERSION from the configure script
+# guess-rev.sh returns either a repository version ID or "-snapshot"

 if RELEASE
 if RELEASE

-libopenocd_la_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
+libopenocd_la_CPPFLAGS += -DRELSTR=\"\"

 else
 else

-libopenocd_la_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
+libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"

 endif
 
 # add default CPPFLAGS
 endif
 
 # add default CPPFLAGS


@@ -41,7 +52,7 @@ libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
 libopenocd_la_LDFLAGS = $(all_libraries)
 
 if IS_MINGW
 libopenocd_la_LDFLAGS = $(all_libraries)
 
 if IS_MINGW

-MINGWLDADD = -lwsock32
+MINGWLDADD = -lws2_32

 else
 MINGWLDADD =
 endif
 else
 MINGWLDADD =
 endif


@@ -49,12 +60,16 @@ endif
 if FT2232_LIBFTDI
 FTDI2232LIB = -lftdi -lusb
 else
 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
 if PRESTO_LIBFTDI
 FTDI2232LIB = -lftdi -lusb
 else
 FTDI2232LIB =
 endif
 endif

+endif

 
 if USBPROG
 LIBUSB = -lusb
 
 if USBPROG
 LIBUSB = -lusb


@@ -89,6 +104,30 @@ if HTTPD
 libopenocd_la_LIBADD += -lmicrohttpd
 endif
 
 libopenocd_la_LIBADD += -lmicrohttpd
 endif
 

+STARTUP_TCL_SRCS = \
+       $(srcdir)/helper/startup.tcl \
+       $(srcdir)/jtag/startup.tcl \
+       $(srcdir)/target/startup.tcl \
+       $(srcdir)/flash/startup.tcl \
+       $(srcdir)/server/startup.tcl
+
+EXTRA_DIST = $(STARTUP_TCL_SRCS)
+
+BUILT_SOURCES = startup.tcl
+
+startup.tcl: $(STARTUP_TCL_SRCS)
+       cat $^ > $@
+
+BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD)
+
+# Convert .tcl to cfile
+startup_tcl.c: startup.tcl $(BIN2C)
+       $(BIN2C) openocd_startup_tcl < $< > $@ || rm -f $@
+
+# add startup_tcl.c to make clean list
+CLEANFILES = startup.tcl 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