projects
/
fw
/
stlink
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Align loader to 32-bit boundary
[fw/stlink]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 28e11d5e59a6e1589aad4b7c4bf75b194331c75a..9afbc0f0b0b06c4a18a8f391e22ba3b71138a33c 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,13
+1,21
@@
# Makefile.am -- Process this file with automake to produce Makefile.in
# Makefile.am -- Process this file with automake to produce Makefile.in
+SUBDIRS = . $(MAYBE_GUI)
+
AUTOMAKE_OPTIONS = subdir-objects
AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = st-flash st-util
+if MINGW
+bin_PROGRAMS = st-flash st-util st-info
+else
+bin_PROGRAMS = st-flash st-util st-term st-info
+endif
noinst_LIBRARIES = libstlink.a
st_flash_SOURCES = flash/main.c
noinst_LIBRARIES = libstlink.a
st_flash_SOURCES = flash/main.c
-st_util_SOURCES = gdbserver/gdb-remote.c gdbserver/gdb-remote.h gdbserver/gdb-server.c
+st_term_SOURCES = src/st-term.c
+st_info_SOURCES = src/st-info.c
+st_util_SOURCES = gdbserver/gdb-remote.c gdbserver/gdb-remote.h gdbserver/gdb-server.c mingw/mingw.c mingw/mingw.h
CFILES = \
src/stlink-common.c \
CFILES = \
src/stlink-common.c \
@@
-15,6
+23,10
@@
CFILES = \
src/stlink-sg.c \
src/uglylogging.c
src/stlink-sg.c \
src/uglylogging.c
+if !MINGW
+CFILES += src/st-term.c
+endif
+
HFILES = \
src/stlink-common.h \
src/stlink-usb.h \
HFILES = \
src/stlink-common.h \
src/stlink-usb.h \
@@
-28,10
+40,15
@@
libstlink_a_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2
libstlink_a_LIBADD = $(LIBOBJS)
st_flash_LDADD = libstlink.a
libstlink_a_LIBADD = $(LIBOBJS)
st_flash_LDADD = libstlink.a
-st_flash_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src
+st_flash_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src
-I$(top_srcdir)/mingw
st_util_LDADD = libstlink.a
st_util_LDADD = libstlink.a
-st_util_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src
+st_util_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src
-I$(top_srcdir)/mingw
-EXTRA_DIST = autogen.sh
+st_term_LDADD = libstlink.a
+st_term_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcdir)/mingw
+st_info_LDADD = libstlink.a
+st_info_CPPFLAGS = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcdir)/mingw
+
+EXTRA_DIST = autogen.sh