X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=4c70702b53cad2054f972e59ec78c626b45d2976;hb=4acd965573728faa8f564514f2cb76a9db5fbc01;hp=27846d768016efd377000eaffcf17a47dcaa10a4;hpb=9542318312ceb4fd93f50fa58a708643befeefc2;p=openocd.git

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 27846d7680..4c70702b53 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,69 +1,12 @@
-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
 
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libflash.la
-libflash_la_SOURCES = \
-	arm_nandio.c \
-	flash.c \
-	lpc2000.c \
-	lpc288x.c \
-	lpc2900.c \
-	cfi.c \
-	non_cfi.c \
-	at91sam7.c \
-	at91sam3.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 \
-	ocl.c \
-	mflash.c \
-	pic32mx.c \
-	avrf.c \
-	mx3_nand.c
+%C%_libflash_la_LIBADD = \
+	%D%/nor/libocdflashnor.la \
+	%D%/nand/libocdflashnand.la
 
-noinst_HEADERS = \
-	arm_nandio.h \
-	flash.h \
-	lpc2000.h \
-	lpc288x.h \
-	lpc2900.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 \
-	mflash.h \
-	ocl.h \
-	pic32mx.h \
-	avrf.h \
-	mx3_nand.h
+STARTUP_TCL_SRCS += %D%/startup.tcl
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include %D%/nor/Makefile.am
+include %D%/nand/Makefile.am