X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=a315dd726419d2e3ac9daea21c6f093720b66dff;hb=0e7ee109f6c37dd2f1acfdc861eb12803e96eabb;hp=9aeec4a00f609895d748bd0a4fa063bf785ae14c;hpb=087a3596c3f22599867411fafb79fdfb3f48097c;p=fw%2Fstlink

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