X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=ba44adb3846a36c42feee244157456df5bcde96e;hb=e51b9a4ac7afa0fde11690268ba88861e1000f60;hp=7895edc85af55127ad43c7749f7f539c4efb06ad;hpb=647e61cc6d9b13dd2799d2302ce9289a1627e36c;p=openocd.git

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 7895edc85a..ba44adb384 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,19 +1,30 @@
+SUBDIRS = \
+	nor \
+	nand
+
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/jtag \
-	-I$(top_srcdir)/src/target
+	-I$(top_srcdir)/src
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
-	flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c \
-	str7x.c str9x.c aduc702x.c nand.c nand_ecc.c \
-	lpc3180_nand_controller.c stellaris.c str9xpec.c stm32x.c tms470.c \
-	ecos.c orion_nand.c s3c24xx_nand.c s3c2410_nand.c s3c2412_nand.c \
-	s3c2440_nand.c s3c2443_nand.c lpc288x.c ocl.c mflash.c pic32mx.c avrf.c
+	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 = \
-	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 s3c24xx_nand.h s3c24xx_regs_nand.h lpc288x.h \
-	mflash.h ocl.h pic32mx.h avrf.h
-MAINTAINERCLEANFILES = Makefile.in
+	arm_nandio.h \
+	common.h \
+	mflash.h \
+	nand.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in