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

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 73f02bffc1..a1b46f853b 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,61 +1,13 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/jtag \
-	-I$(top_srcdir)/src/target
+noinst_LTLIBRARIES += %D%/libflash.la
+%C%_libflash_la_SOURCES = \
+	%D%/common.c %D%/common.h \
+	%D%/mflash.c %D%/mflash.h
 
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libflash.la
-libflash_la_SOURCES = \
-	flash.c \
-	lpc2000.c \
-	cfi.c \
-	non_cfi.c \
-	at91sam7.c \
-	davinci_nand.c \
-	str7x.c \
-	str9x.c \
-	aduc702x.c \
-	nand.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
+%C%_libflash_la_LIBADD = \
+	%D%/nor/libocdflashnor.la \
+	%D%/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
+STARTUP_TCL_SRCS += %D%/startup.tcl
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include %D%/nor/Makefile.am
+include %D%/nand/Makefile.am