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

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 73f02bffc1..ee322eeeeb 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,4 +1,9 @@
+SUBDIRS = \
+	nor \
+	nand
+
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/helper \
 	-I$(top_srcdir)/src/jtag \
 	-I$(top_srcdir)/src/target
@@ -6,56 +11,25 @@ AM_CPPFLAGS = \
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
+	common.c \
 	flash.c \
-	lpc2000.c \
-	cfi.c \
-	non_cfi.c \
-	at91sam7.c \
-	davinci_nand.c \
-	str7x.c \
-	str9x.c \
-	aduc702x.c \
-	nand.c \
+	arm_nandio.c \
 	nand_ecc.c \
 	nand_ecc_kw.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
+	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 \
-	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
+	nand.h
+
+EXTRA_DIST = startup.tcl
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in