X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2FMakefile.am;h=9d983a8d9e10dd1f1afa6f57c8c94d10e8f9ebdd;hb=08a890e4aae307d874bd617f4dc742a56f2064a2;hp=65692e3a2e620b51ec9baca7b3140ebae84cb7eb;hpb=a582e9a8d183c56d1aa8ae18afc1c11e2cbd6d2d;p=openocd.git

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