--- cpukit/Makefile.am | 32 +++++++++++++++++++++++++++++++- cpukit/configure.ac | 1 - cpukit/libblock/Makefile.am | 40 ---------------------------------------- cpukit/wrapup/Makefile.am | 1 - 4 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 cpukit/libblock/Makefile.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index fec24cb2dc..12f87f8d65 100644 --- a/cpukit/Makefile.am +++ b/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 @@ -108,7 +138,7 @@ wrapup: $(builddir)/libcpukit.a # librtemscpu _SUBDIRS = . score rtems posix _SUBDIRS += libcrypt -_SUBDIRS += libcsupport libblock libfs +_SUBDIRS += libcsupport libfs _SUBDIRS += libdrvmgr _SUBDIRS += libnetworking librpc _SUBDIRS += libpci diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 0120bc193b..c7c4e6396b 100644 --- a/cpukit/configure.ac +++ b/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 diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am deleted file mode 100644 index cafd1fcba0..0000000000 --- a/cpukit/libblock/Makefile.am +++ /dev/null @@ -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 diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 014018349a..ddc14fc8a7 100644 --- a/cpukit/wrapup/Makefile.am +++ b/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 -- 2.13.7 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
