[PATCH 11/31] build: Merge libdl/Makefile.am

[Sebastian Huber]

---
 cpukit/Makefile.am        | 30 +++++++++++++++++++++++++++++-
 cpukit/configure.ac       |  1 -
 cpukit/libdl/Makefile.am  | 35 -----------------------------------
 cpukit/wrapup/Makefile.am |  4 ----
 4 files changed, 29 insertions(+), 41 deletions(-)
 delete mode 100644 cpukit/libdl/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 35b47e4b54..08fce92381 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -298,6 +298,35 @@ libcpukit_a_SOURCES += sapi/src/sapirbtreeinsert.c
 libcpukit_a_SOURCES += sapi/src/tcsimpleinstall.c
 libcpukit_a_SOURCES += sapi/src/version.c
 
+if LIBDL
+
+libcpukit_a_SOURCES += libdl/dlfcn.c
+libcpukit_a_SOURCES += libdl/dlfcn-shell.c
+libcpukit_a_SOURCES += libdl/fastlz.c
+libcpukit_a_SOURCES += libdl/rap.c
+libcpukit_a_SOURCES += libdl/rap-shell.c
+libcpukit_a_SOURCES += libdl/rtl-allocator.c
+libcpukit_a_SOURCES += libdl/rtl-alloc-heap.c
+libcpukit_a_SOURCES += libdl/rtl.c
+libcpukit_a_SOURCES += libdl/rtl-chain-iterator.c
+libcpukit_a_SOURCES += libdl/rtl-debugger.c
+libcpukit_a_SOURCES += libdl/rtl-elf.c
+libcpukit_a_SOURCES += libdl/rtl-error.c
+libcpukit_a_SOURCES += libdl/rtl-find-file.c
+libcpukit_a_SOURCES += libdl/rtl-mdreloc- at RTEMS_CPU@.c
+libcpukit_a_SOURCES += libdl/rtl-obj.c
+libcpukit_a_SOURCES += libdl/rtl-obj-cache.c
+libcpukit_a_SOURCES += libdl/rtl-obj-comp.c
+libcpukit_a_SOURCES += libdl/rtl-rap.c
+libcpukit_a_SOURCES += libdl/rtl-shell.c
+libcpukit_a_SOURCES += libdl/rtl-string.c
+libcpukit_a_SOURCES += libdl/rtl-sym.c
+libcpukit_a_SOURCES += libdl/rtl-trace.c
+libcpukit_a_SOURCES += libdl/rtl-unresolved.c
+libcpukit_a_SOURCES += libdl/rtl-unwind-dw2.c
+
+endif
+
 #
 # Create a new Version VC Key header if the VC state has changed.
 #
@@ -341,7 +370,6 @@ _SUBDIRS += libi2c
 _SUBDIRS += libmisc
 _SUBDIRS += libmd
 _SUBDIRS += libgnat
-_SUBDIRS += libdl
 _SUBDIRS += libstdthreads
 _SUBDIRS += wrapup
 
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 6b7c719bdd..cdf162150f 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -507,7 +507,6 @@ librpc/Makefile
 libmisc/Makefile
 libi2c/Makefile
 libmd/Makefile
-libdl/Makefile
 libstdthreads/Makefile
 zlib/Makefile
 telnetd/Makefile
diff --git a/cpukit/libdl/Makefile.am b/cpukit/libdl/Makefile.am
deleted file mode 100644
index e58b332713..0000000000
--- a/cpukit/libdl/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-include $(top_srcdir)/automake/compile.am
-
-if LIBDL
-
-noinst_LIBRARIES = libdl.a
-libdl_a_SOURCES = \
-  dlfcn-shell.c \
-  dlfcn.c \
-  fastlz.c \
-  rap-shell.c \
-  rap.c \
-  rtl.c \
-  rtl-alloc-heap.c \
-  rtl-allocator.c \
-  rtl-chain-iterator.c \
-  rtl-debugger.c \
-  rtl-elf.c \
-  rtl-error.c \
-  rtl-find-file.c \
-  rtl-obj-cache.c \
-  rtl-obj-comp.c \
-  rtl-obj.c \
-  rtl-rap.c \
-  rtl-shell.c \
-  rtl-string.c \
-  rtl-sym.c \
-  rtl-trace.c \
-  rtl-unwind-dw2.c \
-  rtl-unresolved.c
-
-libdl_a_SOURCES += rtl-mdreloc- at RTEMS_CPU@.c
-
-endif
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 41bc76316d..1335b5bfce 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -86,10 +86,6 @@ if NEWLIB
 TMP_LIBS += ../libmd/libmd.a
 endif
 
-if LIBDL
-TMP_LIBS += ../libdl/libdl.a
-endif
-
 librtemscpu.a: $(TMP_LIBS)
 	$(AM_V_GEN)rm -f $@
 	$(AM_V_GEN)$(MKDIR_P) $(ARCH)
-- 
2.16.4