X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=a1b46f853bbdc5733756c7f050a8bf53d08f723f;hp=76c8c180ffa99895d65f453df58bcda59a830ab8;hb=2caa3455ada686baea01a50d092e4244c461e101;hpb=8c290412d28f9eef568dac0cfc20ccd4a9eca4d5

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 76c8c180ff..a1b46f853b 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,7 +1,13 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
-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
-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
+noinst_LTLIBRARIES += %D%/libflash.la
+%C%_libflash_la_SOURCES = \
+	%D%/common.c %D%/common.h \
+	%D%/mflash.c %D%/mflash.h
+
+%C%_libflash_la_LIBADD = \
+	%D%/nor/libocdflashnor.la \
+	%D%/nand/libocdflashnand.la
+
+STARTUP_TCL_SRCS += %D%/startup.tcl
+
+include %D%/nor/Makefile.am
+include %D%/nand/Makefile.am