build: Merge libcrypt/Makefile.am

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
@@ -134,7 +139,6 @@ all-local: generate-vc-key
 
 # librtemscpu
 _SUBDIRS = . score rtems posix
-_SUBDIRS += libcrypt
 _SUBDIRS += libcsupport libfs
 _SUBDIRS += libdrvmgr
 _SUBDIRS += libnetworking librpc

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

cpukit/libcrypt/Makefile.am

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

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