From 8fb3443b791ff2695b35b1ab633c722aaa4f2791 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 13 Sep 2018 06:37:56 +0200 Subject: build: Merge libfdt/Makefile.am --- cpukit/Makefile.am | 9 ++++++++- cpukit/configure.ac | 1 - cpukit/dtc/libfdt/Makefile.am | 15 --------------- cpukit/wrapup/Makefile.am | 1 - 4 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 cpukit/dtc/libfdt/Makefile.am diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 7a3e8319ff..2ad1c1c425 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -23,6 +23,14 @@ libcpukit_a_SOURCES += dev/i2c/xilinx-axi-i2c.c libcpukit_a_SOURCES += dev/serial/sc16is752.c libcpukit_a_SOURCES += dev/serial/sc16is752-spi.c libcpukit_a_SOURCES += dev/spi/spi-bus.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_addresses.c +libcpukit_a_SOURCES += dtc/libfdt/fdt.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_empty_tree.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_ro.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_rw.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_strerror.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_sw.c +libcpukit_a_SOURCES += dtc/libfdt/fdt_wip.c libcpukit_a_SOURCES += sapi/src/chainappendnotify.c libcpukit_a_SOURCES += sapi/src/chaingetnotify.c libcpukit_a_SOURCES += sapi/src/chaingetwait.c @@ -96,7 +104,6 @@ all-local: generate-vc-key # librtemscpu _SUBDIRS = . score rtems posix -_SUBDIRS += dtc/libfdt _SUBDIRS += libcrypt _SUBDIRS += libcsupport libblock libfs _SUBDIRS += libdrvmgr diff --git a/cpukit/configure.ac b/cpukit/configure.ac index df9ee8c05b..0120bc193b 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -474,7 +474,6 @@ RTEMS_AMPOLISH3 AC_CONFIG_FILES([ Doxyfile Makefile -dtc/libfdt/Makefile rtems/Makefile score/Makefile score/cpu/Makefile diff --git a/cpukit/dtc/libfdt/Makefile.am b/cpukit/dtc/libfdt/Makefile.am deleted file mode 100644 index 012923861d..0000000000 --- a/cpukit/dtc/libfdt/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -noinst_LIBRARIES = libfdt.a - -libfdt_a_SOURCES = -libfdt_a_SOURCES += fdt_addresses.c -libfdt_a_SOURCES += fdt.c -libfdt_a_SOURCES += fdt_empty_tree.c -libfdt_a_SOURCES += fdt_ro.c -libfdt_a_SOURCES += fdt_rw.c -libfdt_a_SOURCES += fdt_strerror.c -libfdt_a_SOURCES += fdt_sw.c -libfdt_a_SOURCES += fdt_wip.c - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index a24550da5a..014018349a 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -13,7 +13,6 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/librtemscpu.a librtemscpu_a_SOURCES = TMP_LIBS = -TMP_LIBS += ../dtc/libfdt/libfdt.a TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a TMP_LIBS += ../score/libscore.a TMP_LIBS += ../libcpukit.a -- cgit v1.2.3