-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+SUBDIRS = \
+ nor \
+ nand
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src
+
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 tms470.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 tms470.h
+noinst_LTLIBRARIES = libflash.la
+libflash_la_SOURCES = \
+ common.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 \
+ mflash.h \
+ nand.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in