--- cpukit/Makefile.am | 6 +++++- cpukit/configure.ac | 1 - cpukit/libcrypt/Makefile.am | 12 ------------ cpukit/wrapup/Makefile.am | 1 - 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 cpukit/libcrypt/Makefile.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 12f87f8d65..8447a98676 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -61,6 +61,11 @@ libcpukit_a_SOURCES += libblock/src/ramdisk-driver.c libcpukit_a_SOURCES += libblock/src/ramdisk-init.c libcpukit_a_SOURCES += libblock/src/ramdisk-register.c libcpukit_a_SOURCES += libblock/src/sparse-disk.c +libcpukit_a_SOURCES += libcrypt/crypt.c +libcpukit_a_SOURCES += libcrypt/crypt-md5.c +libcpukit_a_SOURCES += libcrypt/crypt-sha256.c +libcpukit_a_SOURCES += libcrypt/crypt-sha512.c +libcpukit_a_SOURCES += libcrypt/misc.c libcpukit_a_SOURCES += sapi/src/chainappendnotify.c libcpukit_a_SOURCES += sapi/src/chaingetnotify.c libcpukit_a_SOURCES += sapi/src/chaingetwait.c @@ -137,7 +142,6 @@ wrapup: $(builddir)/libcpukit.a # librtemscpu _SUBDIRS = . score rtems posix -_SUBDIRS += libcrypt _SUBDIRS += libcsupport libfs _SUBDIRS += libdrvmgr _SUBDIRS += libnetworking librpc diff --git a/cpukit/configure.ac b/cpukit/configure.ac index c7c4e6396b..c916d8d3fc 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -501,7 +501,6 @@ libdrvmgr/Makefile libfs/Makefile libfs/src/nfsclient/Makefile libgnat/Makefile -libcrypt/Makefile libcsupport/Makefile libnetworking/Makefile libpci/Makefile diff --git a/cpukit/libcrypt/Makefile.am b/cpukit/libcrypt/Makefile.am deleted file mode 100644 index 5aecfe131f..0000000000 --- a/cpukit/libcrypt/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -noinst_LIBRARIES = libcrypt.a - -libcrypt_a_SOURCES = -libcrypt_a_SOURCES += crypt.c -libcrypt_a_SOURCES += crypt-md5.c -libcrypt_a_SOURCES += crypt-sha256.c -libcrypt_a_SOURCES += crypt-sha512.c -libcrypt_a_SOURCES += misc.c - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index ddc14fc8a7..924e53a1d7 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -23,7 +23,6 @@ if LIBGNAT TMP_LIBS += ../libgnat/libgnat.a endif -TMP_LIBS += ../libcrypt/libcrypt.a TMP_LIBS += ../libstdthreads/libstdthreads.a TMP_LIBS += ../libcsupport/libcsupport.a TMP_LIBS += ../libcsupport/libcalloc.a -- 2.13.7 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
