X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=2144ff2dcad22dcd32910d3add58cc13ffba9f52;hp=61e363c92266834a6d749783332a9955f779884c;hb=747d6f22868dd87cb54341cc22d9eb3687039735;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 61e363c922..2144ff2dca 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,5 +1,29 @@
-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
+
 METASOURCES = AUTO
-noinst_LIBRARIES = libflash.a
-libflash_a_SOURCES = flash.c lpc2000.c cfi.c at91sam7.c str7x.c
-noinst_HEADERS = flash.h lpc2000.h cfi.h at91sam7.h str7x.h
+noinst_LTLIBRARIES = libflash.la
+libflash_la_SOURCES = \
+	common.c \
+	arm_nandio.c \
+	nand_ecc.c \
+	nand_ecc_kw.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 \
+	mflash.h \
+	nand.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in