rtos: Rewrite rtos_qsymbol() and fix auto-detect false positive

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

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 37dee8b539fa3699ad64ac0be7c8d717c2c040cf..ece4018370b088352cf69ebd50e7e63b91b50c10 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,8 +1,23 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+include $(top_srcdir)/common.mk
+
+SUBDIRS = \
+       nor \
+       nand
+
 METASOURCES = AUTO
-noinst_LIBRARIES = libflash.a
-libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c str7x.c str9x.c nand.c lpc3180_nand_controller.c \
-                                        stellaris.c str9xpec.c stm32x.c tms470.c
-noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h str7x.h str9x.h nand.h lpc3180_nand_controller.h \
-                                stellaris.h str9xpec.h stm32x.h tms470.h
+noinst_LTLIBRARIES = libflash.la
+libflash_la_SOURCES = \
+       common.c \
+       mflash.c
+
+libflash_la_LIBADD = \
+       $(top_builddir)/src/flash/nor/libocdflashnor.la \
+       $(top_builddir)/src/flash/nand/libocdflashnand.la
+
+noinst_HEADERS = \
+       common.h \
+       mflash.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in