build: Merge libmd/Makefile.am

This commit is contained in:
Sebastian Huber
2018-09-14 06:41:27 +02:00
parent 0c56264ea7
commit e39642a468
4 changed files with 9 additions and 20 deletions

View File

@@ -362,6 +362,8 @@ libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-utils.c
libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-shell.c
libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-trace.c
libcpukit_a_SOURCES += libi2c/libi2c.c
libcpukit_a_SOURCES += libmd/md4.c
libcpukit_a_SOURCES += libmd/md5.c
libcpukit_a_SOURCES += sapi/src/chainappendnotify.c
libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
libcpukit_a_SOURCES += sapi/src/chaingetwait.c
@@ -486,6 +488,13 @@ libcpukit_a_SOURCES += libgnat/adasupp.c
endif
if SHA
libcpukit_a_SOURCES += libmd/sha256c.c
libcpukit_a_SOURCES += libmd/sha512c.c
endif
#
# Create a new Version VC Key header if the VC state has changed.
#
@@ -524,7 +533,6 @@ _SUBDIRS = . score rtems posix
_SUBDIRS += libnetworking librpc
_SUBDIRS += libpci
_SUBDIRS += libmisc
_SUBDIRS += libmd
_SUBDIRS += libstdthreads
_SUBDIRS += wrapup

View File

@@ -501,7 +501,6 @@ libnetworking/Makefile
libpci/Makefile
librpc/Makefile
libmisc/Makefile
libmd/Makefile
libstdthreads/Makefile
zlib/Makefile
telnetd/Makefile

View File

@@ -1,14 +0,0 @@
include $(top_srcdir)/automake/compile.am
if NEWLIB
noinst_LIBRARIES = libmd.a
libmd_a_SOURCES =
libmd_a_SOURCES += md4.c
libmd_a_SOURCES += md5.c
if SHA
libmd_a_SOURCES += sha256c.c
libmd_a_SOURCES += sha512c.c
endif
endif
include $(top_srcdir)/automake/local.am

View File

@@ -66,10 +66,6 @@ TMP_LIBS += ../librpc/librpc.a
TMP_LIBS += ../librpc/libxdr.a
endif
if NEWLIB
TMP_LIBS += ../libmd/libmd.a
endif
librtemscpu.a: $(TMP_LIBS)
$(AM_V_GEN)rm -f $@
$(AM_V_GEN)$(MKDIR_P) $(ARCH)