--- cpukit/Makefile.am | 10 +++++++++- cpukit/configure.ac | 1 - cpukit/libmd/Makefile.am | 14 -------------- cpukit/wrapup/Makefile.am | 4 ---- 4 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 cpukit/libmd/Makefile.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index bd8a379222..c9c61fdb36 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -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 @@ -498,6 +500,13 @@ libcpukit_a_SOURCES += libfs/src/nfsclient/src/xdr_mbuf.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. # @@ -539,7 +548,6 @@ _SUBDIRS = . score rtems posix _SUBDIRS += libnetworking librpc _SUBDIRS += libpci _SUBDIRS += libmisc -_SUBDIRS += libmd _SUBDIRS += libstdthreads _SUBDIRS += wrapup diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 38b677b21e..edc2ac9410 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -501,7 +501,6 @@ libnetworking/Makefile libpci/Makefile librpc/Makefile libmisc/Makefile -libmd/Makefile libstdthreads/Makefile zlib/Makefile telnetd/Makefile diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am deleted file mode 100644 index ce502f2265..0000000000 --- a/cpukit/libmd/Makefile.am +++ /dev/null @@ -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 diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 6aeb657f83..3771f9b010 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -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) -- 2.13.7 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel