cortex_m: Fix single stepping will not return to debug mode sometimes

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

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 64fc54f53510d37134258444d83e8f50062b155b..ece4018370b088352cf69ebd50e7e63b91b50c10 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,19 +1,23 @@
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/helper \
-       -I$(top_srcdir)/src/jtag \
-       -I$(top_srcdir)/src/target
+include $(top_srcdir)/common.mk
+
+SUBDIRS = \
+       nor \
+       nand
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
-       flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c davinci_nand.c \
-       str7x.c str9x.c aduc702x.c nand.c nand_ecc.c nand_ecc_kw.c \
-       lpc3180_nand_controller.c stellaris.c str9xpec.c stm32x.c tms470.c \
-       ecos.c orion_nand.c s3c24xx_nand.c s3c2410_nand.c s3c2412_nand.c \
-       s3c2440_nand.c s3c2443_nand.c lpc288x.c ocl.c mflash.c pic32mx.c avrf.c
+       common.c \
+       mflash.c
+
+libflash_la_LIBADD = \
+       $(top_builddir)/src/flash/nor/libocdflashnor.la \
+       $(top_builddir)/src/flash/nand/libocdflashnand.la
+
 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 s3c24xx_nand.h s3c24xx_regs_nand.h lpc288x.h \
-       mflash.h ocl.h pic32mx.h avrf.h
-MAINTAINERCLEANFILES = Makefile.in
+       common.h \
+       mflash.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in