X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=4c70702b53cad2054f972e59ec78c626b45d2976;hb=da15f9f8c29064f0124e60ac0ac21ddd11fdcc2c;hp=d750b86b0ad3c8d49060606f664b54fb4c1f5456;hpb=3fbdfeb82c9dda6c019cc02580b89d67e01b9369;p=openocd.git

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index d750b86b0a..4c70702b53 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,8 +1,12 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
-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
+
+%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