Align loader to 32-bit boundary

[fw/stlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9aeec4a00f609895d748bd0a4fa063bf785ae14c..9afbc0f0b0b06c4a18a8f391e22ba3b71138a33c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,54 @@
 # Makefile.am -- Process this file with automake to produce Makefile.in
-bin_PROGRAMS = st-flash st-util
 
-noinst_LTLIBRARIES      = libstlink.la
+SUBDIRS = . $(MAYBE_GUI)
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+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
-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 \
+       src/stlink-usb.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 \
+       src/stlink-sg.h \
+       src/uglylogging.h \
+       src/mmap.h
+
+libstlink_a_SOURCES    =       $(CFILES) $(HFILES)
+
+libstlink_a_CPPFLAGS   = -std=gnu99 -Wall -Wextra -O2
+libstlink_a_LIBADD = $(LIBOBJS)
 
-libstlink_la_SOURCES   =       src/stlink-common.c src/stlink-usb.c src/stlink-sg.c src/uglylogging.c \
-                               src/stlink-common.h src/stlink-usb.h src/stlink-sg.h src/uglylogging.h
+st_flash_LDADD =       libstlink.a
+st_flash_CPPFLAGS      = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcdir)/mingw
 
-libstlink_la_CPPFLAGS  = -std=gnu99 -Wall -Wextra -O2
+st_util_LDADD  =       libstlink.a
+st_util_CPPFLAGS       = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcdir)/mingw
 
-st_flash_LDADD =       libstlink.la
-st_flash_CPPFLAGS      = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src
+st_term_LDADD   =       libstlink.a
+st_term_CPPFLAGS        = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src -I$(top_srcdir)/mingw
 
-st_util_LDADD  =       libstlink.la
-st_util_CPPFLAGS       = -std=gnu99 -Wall -Wextra -O2 -I$(top_srcdir)/src
+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