Merge with master

[fw/stlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 538db1a878f0f261b938eaf80fc81f1e5e27efd9..9a0b387e21085eb2227f86383aa6fa7c3f40bb8a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,18 @@ SUBDIRS = . $(MAYBE_GUI)
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-bin_PROGRAMS = st-flash st-util st-term
+if MINGW
+bin_PROGRAMS = st-flash st-util st-info st-probe
+else
+bin_PROGRAMS = st-flash st-util st-term st-info st-probe
+endif
 
 noinst_LIBRARIES      = libstlink.a
 
 st_flash_SOURCES = flash/main.c
 st_term_SOURCES = src/st-term.c
+st_info_SOURCES = src/st-info.c
+st_probe_SOURCES = src/st-probe.c
 st_util_SOURCES = gdbserver/gdb-remote.c gdbserver/gdb-remote.h gdbserver/gdb-server.c mingw/mingw.c mingw/mingw.h
 
 CFILES = \
@@ -17,7 +23,11 @@ CFILES = \
        src/stlink-usb.c \
        src/stlink-sg.c \
        src/uglylogging.c \
-        src/st-term.c
+       src/st-info.c
+
+if !MINGW
+CFILES += src/st-term.c
+endif
 
 HFILES = \
        src/stlink-common.h \
@@ -40,6 +50,10 @@ st_util_CPPFLAGS     = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcd
 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
+st_probe_LDADD   =       libstlink.a
+st_probe_CPPFLAGS       = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcdir)/mingw
 
+EXTRA_DIST = autogen.sh