xsvf: Fix shadow issues on Mac

[openocd] / src / flash / Makefile.am

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 353fcf1650a0eb88efddad55e39db5fc9161ae8c..9d983a8d9e10dd1f1afa6f57c8c94d10e8f9ebdd 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,74 +1,24 @@
 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_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
-       $(FLASH_SRCS) \
-       $(NAND_SRCS) \
+       common.c \
        mflash.c
 
 libflash_la_LIBADD = \
+       $(top_builddir)/src/flash/nor/libocdflashnor.la \
        $(top_builddir)/src/flash/nand/libocdflashnand.la
 
-FLASH_SRCS = \
-       common.c \
-       cfi.c \
-       non_cfi.c \
-       faux.c \
-       $(FLASH_DEVICES_SRCS) \
-       flash.c
-
-FLASH_DEVICES_SRCS = \
-       aduc702x.c \
-       at91sam3.c \
-       at91sam7.c \
-       avrf.c \
-       ecos.c \
-       lpc2000.c \
-       lpc288x.c \
-       lpc2900.c \
-       ocl.c \
-       pic32mx.c \
-       stellaris.c \
-       stm32x.c \
-       str7x.c \
-       str9x.c \
-       str9xpec.c \
-       tms470.c
-
-NAND_SRCS = \
-       arm_nandio.c \
-       nand_ecc.c \
-       nand_ecc_kw.c \
-       nand.c
-
 noinst_HEADERS = \
-       arm_nandio.h \
-       at91sam7.h \
-       at91sam3.h \
-       avrf.h \
-       cfi.h \
        common.h \
-       flash.h \
-       lpc2000.h \
-       lpc288x.h \
-       mflash.h \
-       non_cfi.h \
-       nand.h \
-       ocl.h \
-       pic32mx.h \
-       stellaris.h \
-       stm32x.h \
-       str7x.h \
-       str9x.h \
-       str9xpec.h \
-       tms470.h
+       mflash.h
 
 EXTRA_DIST = startup.tcl