X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=2144ff2dcad22dcd32910d3add58cc13ffba9f52;hp=9d7746cd0643dbee7392a18ae161f46d0c23415b;hb=747d6f22868dd87cb54341cc22d9eb3687039735;hpb=19ce96746d2107cfac5bdd6d94373cf7ff6802e7

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 9d7746cd06..2144ff2dca 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,12 +1,29 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+SUBDIRS = \
+	nor \
+	nand
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/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 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
-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
-
-MAINTAINERCLEANFILES = Makefile.in
+noinst_LTLIBRARIES = libflash.la
+libflash_la_SOURCES = \
+	common.c \
+	arm_nandio.c \
+	nand_ecc.c \
+	nand_ecc_kw.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 \
+	mflash.h \
+	nand.h
+
+EXTRA_DIST = startup.tcl
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in