Merge branch 'master' of ssh://dbrownell@openocd.git.sourceforge.net/gitroot/openocd...

[fw/openocd] / src / flash / Makefile.am

diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index d750b86b0ad3c8d49060606f664b54fb4c1f5456..27846d768016efd377000eaffcf17a47dcaa10a4 100644 (file)
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -1,8 +1,69 @@
-INCLUDES = -I$(top_srcdir)/src/helper -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target $(all_includes)
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/helper \
+       -I$(top_srcdir)/src/jtag \
+       -I$(top_srcdir)/src/target
+
 METASOURCES = AUTO
-noinst_LIBRARIES = libflash.a
-libflash_a_SOURCES = flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c str7x.c str9x.c nand.c lpc3180_nand_controller.c \
-                                        stellaris.c str9xpec.c stm32x.c
-noinst_HEADERS = flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h str7x.h str9x.h nand.h lpc3180_nand_controller.h \
-                                stellaris.h str9xpec.h stm32x.h
+noinst_LTLIBRARIES = libflash.la
+libflash_la_SOURCES = \
+       arm_nandio.c \
+       flash.c \
+       lpc2000.c \
+       lpc288x.c \
+       lpc2900.c \
+       cfi.c \
+       non_cfi.c \
+       at91sam7.c \
+       at91sam3.c \
+       davinci_nand.c \
+       str7x.c \
+       str9x.c \
+       aduc702x.c \
+       nand.c \
+       nand_ecc.c \
+       nand_ecc_kw.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 \
+       ocl.c \
+       mflash.c \
+       pic32mx.c \
+       avrf.c \
+       mx3_nand.c
+
+noinst_HEADERS = \
+       arm_nandio.h \
+       flash.h \
+       lpc2000.h \
+       lpc288x.h \
+       lpc2900.h \
+       cfi.h \
+       non_cfi.h \
+       at91sam7.h \
+       at91sam3.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 \
+       mflash.h \
+       ocl.h \
+       pic32mx.h \
+       avrf.h \
+       mx3_nand.h
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in