X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=ee322eeeeba922aacbdc58d6a8fc938cf82b93b0;hp=8d30790b45ff4b3bf007b8af41b012e8d76edbc0;hb=896ac8d4ef3212f80887bf009d626c5becb1240a;hpb=09883194f86725f4eae7e6db9eabcf6b3d1511de

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 8d30790b45..ee322eeeeb 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,5 +1,35 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
+SUBDIRS = \
+	nor \
+	nand
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/helper \
+	-I$(top_srcdir)/src/jtag \
+	-I$(top_srcdir)/src/target
+
 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
-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
+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
+
+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