Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Merge libdl/Makefile.am

Browse Source
This commit is contained in:
Sebastian Huber
2018-09-14 06:19:15 +02:00
parent bab7a688fd
commit 551f4736b3
4 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cpukit/Makefile.am
View File

@@ -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-@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

1
cpukit/configure.ac
View File

@@ -507,7 +507,6 @@ librpc/Makefile
libmisc/Makefile
libi2c/Makefile
libmd/Makefile
libdl/Makefile
libstdthreads/Makefile
zlib/Makefile
telnetd/Makefile

35
cpukit/libdl/Makefile.am
View File

@@ -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-@RTEMS_CPU@.c
endif
include $(top_srcdir)/automake/local.am

4
cpukit/wrapup/Makefile.am
View File

@@ -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)