build: Merge libblock/Makefile.am

cpukit/Makefile.am

@@ -31,6 +31,36 @@ libcpukit_a_SOURCES += dtc/libfdt/fdt_rw.c
 libcpukit_a_SOURCES += dtc/libfdt/fdt_strerror.c
 libcpukit_a_SOURCES += dtc/libfdt/fdt_sw.c
 libcpukit_a_SOURCES += dtc/libfdt/fdt_wip.c
+libcpukit_a_SOURCES += libblock/src/bdbuf.c
+libcpukit_a_SOURCES += libblock/src/bdpart-create.c
+libcpukit_a_SOURCES += libblock/src/bdpart-dump.c
+libcpukit_a_SOURCES += libblock/src/bdpart-mount.c
+libcpukit_a_SOURCES += libblock/src/bdpart-read.c
+libcpukit_a_SOURCES += libblock/src/bdpart-register.c
+libcpukit_a_SOURCES += libblock/src/bdpart-sort.c
+libcpukit_a_SOURCES += libblock/src/bdpart-write.c
+libcpukit_a_SOURCES += libblock/src/blkdev-blkstats.c
+libcpukit_a_SOURCES += libblock/src/blkdev.c
+libcpukit_a_SOURCES += libblock/src/blkdev-imfs.c
+libcpukit_a_SOURCES += libblock/src/blkdev-ioctl.c
+libcpukit_a_SOURCES += libblock/src/blkdev-ops.c
+libcpukit_a_SOURCES += libblock/src/blkdev-print-stats.c
+libcpukit_a_SOURCES += libblock/src/diskdevs.c
+libcpukit_a_SOURCES += libblock/src/diskdevs-init.c
+libcpukit_a_SOURCES += libblock/src/flashdisk.c
+libcpukit_a_SOURCES += libblock/src/ide_part_table.c
+libcpukit_a_SOURCES += libblock/src/media.c
+libcpukit_a_SOURCES += libblock/src/media-desc.c
+libcpukit_a_SOURCES += libblock/src/media-dev-ident.c
+libcpukit_a_SOURCES += libblock/src/media-path.c
+libcpukit_a_SOURCES += libblock/src/media-server.c
+libcpukit_a_SOURCES += libblock/src/nvdisk.c
+libcpukit_a_SOURCES += libblock/src/nvdisk-sram.c
+libcpukit_a_SOURCES += libblock/src/ramdisk-config.c
+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 += sapi/src/chainappendnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetwait.c
@@ -105,7 +135,7 @@ all-local: generate-vc-key
 # librtemscpu
 _SUBDIRS = . score rtems posix
 _SUBDIRS += libcrypt
-_SUBDIRS += libcsupport libblock libfs
+_SUBDIRS += libcsupport libfs
 _SUBDIRS += libdrvmgr
 _SUBDIRS += libnetworking librpc
 _SUBDIRS += libpci

cpukit/configure.ac

@@ -497,7 +497,6 @@ score/cpu/v850/Makefile
 score/cpu/x86_64/Makefile
 score/cpu/no_cpu/Makefile
 posix/Makefile
-libblock/Makefile
 libdrvmgr/Makefile
 libfs/Makefile
 libfs/src/nfsclient/Makefile

cpukit/libblock/Makefile.am

@@ -1,40 +0,0 @@
-include $(top_srcdir)/automake/multilib.am
-include $(top_srcdir)/automake/compile.am
-
-noinst_LIBRARIES = libblock.a
-libblock_a_SOURCES = src/bdbuf.c \
-    src/blkdev.c \
-    src/blkdev-imfs.c \
-    src/blkdev-ioctl.c \
-    src/blkdev-ops.c \
-    src/blkdev-print-stats.c \
-    src/blkdev-blkstats.c \
-    src/diskdevs.c \
-    src/diskdevs-init.c \
-    src/flashdisk.c \
-    src/ramdisk-driver.c \
-    src/ramdisk-init.c \
-    src/ramdisk-config.c \
-    src/ramdisk-register.c \
-    src/ide_part_table.c \
-    src/nvdisk.c \
-    src/nvdisk-sram.c \
-    src/bdpart-create.c \
-    src/bdpart-dump.c \
-    src/bdpart-mount.c \
-    src/bdpart-read.c \
-    src/bdpart-register.c \
-    src/bdpart-sort.c \
-    src/bdpart-write.c \
-    src/media-path.c \
-    src/media.c \
-    src/media-server.c \
-    src/media-desc.c \
-    src/media-dev-ident.c \
-    src/sparse-disk.c \
-    include/rtems/bdbuf.h include/rtems/blkdev.h \
-    include/rtems/diskdevs.h include/rtems/flashdisk.h \
-    include/rtems/ramdisk.h include/rtems/nvdisk.h include/rtems/nvdisk-sram.h \
-    include/rtems/ide_part_table.h
-
-include $(top_srcdir)/automake/local.am

cpukit/wrapup/Makefile.am

@@ -27,7 +27,6 @@ TMP_LIBS += ../libcrypt/libcrypt.a
 TMP_LIBS += ../libstdthreads/libstdthreads.a
 TMP_LIBS += ../libcsupport/libcsupport.a
 TMP_LIBS += ../libcsupport/libcalloc.a
-TMP_LIBS += ../libblock/libblock.a
 if LIBDOSFS
 TMP_LIBS += ../libfs/libdosfs.a
 endif