X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=9d983a8d9e10dd1f1afa6f57c8c94d10e8f9ebdd;hp=ab208b41c9781e3617f500fbb5066d6ca7b94138;hb=f5ae179519d578169b4123af89eebf667efa1e2c;hpb=66add57aa5bae147b7996840a2287f3547b4b8ea

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index ab208b41c9..9d983a8d9e 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,19 +1,25 @@
+SUBDIRS = \
+	nor \
+	nand
+
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/jtag \
-	-I$(top_srcdir)/src/target
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src
 
 METASOURCES = AUTO
-noinst_LIBRARIES = libflash.a
-libflash_a_SOURCES = \
-	flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c at91sam7_old.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
+noinst_LTLIBRARIES = libflash.la
+libflash_la_SOURCES = \
+	common.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 at91sam7_old.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
+	common.h \
+	mflash.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in