X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=353fcf1650a0eb88efddad55e39db5fc9161ae8c;hp=9a180960f5d49db2596707e5a83501e025109a70;hb=e1ec02bb055fa356b058dddc0a15710e0fdc9870;hpb=9262e0dbdfeb6a4c7fa27aa64cfca19379981d6c

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 9a180960f5..353fcf1650 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = \
+	nand
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/helper \
 	-I$(top_srcdir)/src/jtag \
@@ -6,62 +9,67 @@ AM_CPPFLAGS = \
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
-	arm_nandio.c \
-	flash.c \
-	lpc2000.c \
+	$(FLASH_SRCS) \
+	$(NAND_SRCS) \
+	mflash.c
+
+libflash_la_LIBADD = \
+	$(top_builddir)/src/flash/nand/libocdflashnand.la
+
+FLASH_SRCS = \
+	common.c \
 	cfi.c \
 	non_cfi.c \
-	at91sam7.c \
-	at91sam3.c \
-	davinci_nand.c \
-	str7x.c \
-	str9x.c \
+	faux.c \
+	$(FLASH_DEVICES_SRCS) \
+	flash.c
+
+FLASH_DEVICES_SRCS = \
 	aduc702x.c \
-	nand.c \
-	nand_ecc.c \
-	nand_ecc_kw.c \
-	lpc3180_nand_controller.c \
-	stellaris.c \
-	str9xpec.c \
-	stm32x.c \
-	tms470.c \
+	at91sam3.c \
+	at91sam7.c \
+	avrf.c \
 	ecos.c \
-	orion_nand.c \
-	s3c24xx_nand.c \
-	s3c2410_nand.c \
-	s3c2412_nand.c \
-	s3c2440_nand.c \
-	s3c2443_nand.c \
+	lpc2000.c \
 	lpc288x.c \
+	lpc2900.c \
 	ocl.c \
-	mflash.c \
 	pic32mx.c \
-	avrf.c \
-	mx3_nand.c
+	stellaris.c \
+	stm32x.c \
+	str7x.c \
+	str9x.c \
+	str9xpec.c \
+	tms470.c
+
+NAND_SRCS = \
+	arm_nandio.c \
+	nand_ecc.c \
+	nand_ecc_kw.c \
+	nand.c
 
 noinst_HEADERS = \
 	arm_nandio.h \
-	flash.h \
-	lpc2000.h \
-	cfi.h \
-	non_cfi.h \
 	at91sam7.h \
 	at91sam3.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 \
+	avrf.h \
+	cfi.h \
+	common.h \
+	flash.h \
+	lpc2000.h \
 	lpc288x.h \
 	mflash.h \
+	non_cfi.h \
+	nand.h \
 	ocl.h \
 	pic32mx.h \
-	avrf.h \
-	mx3_nand.h
+	stellaris.h \
+	stm32x.h \
+	str7x.h \
+	str9x.h \
+	str9xpec.h \
+	tms470.h
+
+EXTRA_DIST = startup.tcl
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in