flash/stm32l4x: fix maybe-uninitialized compiler error

[fw/openocd] / src / flash / Makefile.am

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index ee322eeeeba922aacbdc58d6a8fc938cf82b93b0..4c70702b53cad2054f972e59ec78c626b45d2976 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,35 +1,12 @@
-SUBDIRS = \
-       nor \
-       nand
+noinst_LTLIBRARIES += %D%/libflash.la
+%C%_libflash_la_SOURCES = \
+       %D%/common.c %D%/common.h
 
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src \
-       -I$(top_srcdir)/src/helper \
-       -I$(top_srcdir)/src/jtag \
-       -I$(top_srcdir)/src/target
+%C%_libflash_la_LIBADD = \
+       %D%/nor/libocdflashnor.la \
+       %D%/nand/libocdflashnand.la
 
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libflash.la
-libflash_la_SOURCES = \
-       common.c \
-       flash.c \
-       arm_nandio.c \
-       nand_ecc.c \
-       nand_ecc_kw.c \
-       nand.c \
-       mflash.c
+STARTUP_TCL_SRCS += %D%/startup.tcl
 
-libflash_la_LIBADD = \
-       $(top_builddir)/src/flash/nor/libocdflashnor.la \
-       $(top_builddir)/src/flash/nand/libocdflashnand.la
-
-noinst_HEADERS = \
-       arm_nandio.h \
-       common.h \
-       flash.h \
-       mflash.h \
-       nand.h
-
-EXTRA_DIST = startup.tcl
-
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include %D%/nor/Makefile.am
+include %D%/nand/Makefile.am