Convert to non-recursive make

Change-Id: I11f8bc8553957e2ff083c09e72e16881e4d3bb6f
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3865
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>

3 files changed, 110 insertions, 126 deletions

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index ece40183..a1b46f85 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,23 +1,13 @@
-include $(top_srcdir)/common.mk
+noinst_LTLIBRARIES += %D%/libflash.la
+%C%_libflash_la_SOURCES = \
+	%D%/common.c %D%/common.h \
+	%D%/mflash.c %D%/mflash.h
 
-SUBDIRS = \
-	nor \
-	nand
+%C%_libflash_la_LIBADD = \
+	%D%/nor/libocdflashnor.la \
+	%D%/nand/libocdflashnand.la
 
-METASOURCES = AUTO
-noinst_LTLIBRARIES = libflash.la
-libflash_la_SOURCES = \
-	common.c \
-	mflash.c
+STARTUP_TCL_SRCS += %D%/startup.tcl
 
-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
+include %D%/nor/Makefile.am
+include %D%/nand/Makefile.am
diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am
index 2ddd096a..abe90f8b 100644
--- a/src/flash/nand/Makefile.am
+++ b/src/flash/nand/Makefile.am
@@ -1,46 +1,43 @@
-include $(top_srcdir)/common.mk
+noinst_LTLIBRARIES += %D%/libocdflashnand.la
 
-noinst_LTLIBRARIES = libocdflashnand.la
-
-libocdflashnand_la_SOURCES = \
-	ecc.c \
-	ecc_kw.c \
-	core.c \
-	fileio.c \
-	tcl.c \
-	arm_io.c \
+%C%_libocdflashnand_la_SOURCES = \
+	%D%/ecc.c \
+	%D%/ecc_kw.c \
+	%D%/core.c \
+	%D%/fileio.c \
+	%D%/tcl.c \
+	%D%/arm_io.c \
 	$(NAND_DRIVERS) \
-	driver.c
+	%D%/driver.c \
+	$(NANDHEADERS)
 
 NAND_DRIVERS = \
-	nonce.c \
-	davinci.c \
-	lpc3180.c \
-	lpc32xx.c \
-	mxc.c \
-	mx3.c \
-	orion.c \
-	s3c24xx.c \
-	s3c2410.c \
-	s3c2412.c \
-	s3c2440.c \
-	s3c2443.c \
-	s3c6400.c \
-	at91sam9.c \
-	nuc910.c
-
-noinst_HEADERS = \
-	arm_io.h \
-	core.h \
-	driver.h \
-	fileio.h \
-	imp.h \
-	lpc3180.h \
-	lpc32xx.h \
-	mxc.h \
-	mx3.h \
-	s3c24xx.h \
-	s3c24xx_regs.h \
-	nuc910.h
+	%D%/nonce.c \
+	%D%/davinci.c \
+	%D%/lpc3180.c \
+	%D%/lpc32xx.c \
+	%D%/mxc.c \
+	%D%/mx3.c \
+	%D%/orion.c \
+	%D%/s3c24xx.c \
+	%D%/s3c2410.c \
+	%D%/s3c2412.c \
+	%D%/s3c2440.c \
+	%D%/s3c2443.c \
+	%D%/s3c6400.c \
+	%D%/at91sam9.c \
+	%D%/nuc910.c
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+NANDHEADERS = \
+	%D%/arm_io.h \
+	%D%/core.h \
+	%D%/driver.h \
+	%D%/fileio.h \
+	%D%/imp.h \
+	%D%/lpc3180.h \
+	%D%/lpc32xx.h \
+	%D%/mxc.h \
+	%D%/mx3.h \
+	%D%/s3c24xx.h \
+	%D%/s3c24xx_regs.h \
+	%D%/nuc910.h
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
index c167e8fd..727e4f2f 100644
--- a/src/flash/nor/Makefile.am
+++ b/src/flash/nor/Makefile.am
@@ -1,69 +1,66 @@
-include $(top_srcdir)/common.mk
-
-noinst_LTLIBRARIES = libocdflashnor.la
-libocdflashnor_la_SOURCES = \
-	core.c \
-	tcl.c \
+noinst_LTLIBRARIES += %D%/libocdflashnor.la
+%C%_libocdflashnor_la_SOURCES = \
+	%D%/core.c \
+	%D%/tcl.c \
 	$(NOR_DRIVERS) \
-	drivers.c
+	%D%/drivers.c \
+	$(NORHEADERS)
 
 NOR_DRIVERS = \
-	aduc702x.c \
-	aducm360.c \
-	ambiqmicro.c \
-	at91sam4.c \
-	at91sam4l.c \
-	at91samd.c \
-	at91sam3.c \
-	at91sam7.c \
-	atsamv.c \
-	avrf.c \
-	cfi.c \
-	dsp5680xx_flash.c \
-	efm32.c \
-	em357.c \
-	faux.c \
-	fm3.c \
-	fm4.c \
-	jtagspi.c \
-	kinetis.c \
-	kinetis_ke.c \
-	lpc2000.c \
-	lpc288x.c \
-	lpc2900.c \
-	lpcspifi.c \
-	mdr.c \
-	mrvlqspi.c \
-	niietcm4.c \
-	non_cfi.c \
-	nrf51.c \
-	numicro.c \
-	ocl.c \
-	pic32mx.c \
-	psoc4.c \
-	sim3x.c \
-	spi.c \
-	stmsmi.c \
-	stellaris.c \
-	stm32f1x.c \
-	stm32f2x.c \
-	stm32lx.c \
-	stm32l4x.c \
-	str7x.c \
-	str9x.c \
-	str9xpec.c \
-	tms470.c \
-	virtual.c \
-	xmc1xxx.c \
-	xmc4xxx.c
-
-noinst_HEADERS = \
-	core.h \
-	cfi.h \
-	driver.h \
-	imp.h \
-	non_cfi.h \
-	ocl.h \
-	spi.h
+	%D%/aduc702x.c \
+	%D%/aducm360.c \
+	%D%/ambiqmicro.c \
+	%D%/at91sam4.c \
+	%D%/at91sam4l.c \
+	%D%/at91samd.c \
+	%D%/at91sam3.c \
+	%D%/at91sam7.c \
+	%D%/atsamv.c \
+	%D%/avrf.c \
+	%D%/cfi.c \
+	%D%/dsp5680xx_flash.c \
+	%D%/efm32.c \
+	%D%/em357.c \
+	%D%/faux.c \
+	%D%/fm3.c \
+	%D%/fm4.c \
+	%D%/jtagspi.c \
+	%D%/kinetis.c \
+	%D%/kinetis_ke.c \
+	%D%/lpc2000.c \
+	%D%/lpc288x.c \
+	%D%/lpc2900.c \
+	%D%/lpcspifi.c \
+	%D%/mdr.c \
+	%D%/mrvlqspi.c \
+	%D%/niietcm4.c \
+	%D%/non_cfi.c \
+	%D%/nrf51.c \
+	%D%/numicro.c \
+	%D%/ocl.c \
+	%D%/pic32mx.c \
+	%D%/psoc4.c \
+	%D%/sim3x.c \
+	%D%/spi.c \
+	%D%/stmsmi.c \
+	%D%/stellaris.c \
+	%D%/stm32f1x.c \
+	%D%/stm32f2x.c \
+	%D%/stm32lx.c \
+	%D%/stm32l4x.c \
+	%D%/str7x.c \
+	%D%/str9x.c \
+	%D%/str9xpec.c \
+	%D%/tms470.c \
+	%D%/virtual.c \
+	%D%/xmc1xxx.c \
+	%D%/xmc4xxx.c
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+NORHEADERS = \
+	%D%/core.h \
+	%D%/cfi.h \
+	%D%/driver.h \
+	%D%/imp.h \
+	%D%/non_cfi.h \
+	%D%/ocl.h \
+	%D%/spi.h