build-sys: convert disk-utils/ to module
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
f9a20f0b58
commit
54dbc8cf69
|
@ -27,7 +27,6 @@ MAN_DIRS = man/ru
|
|||
|
||||
SUBDIRS = \
|
||||
$(MAN_DIRS) \
|
||||
disk-utils \
|
||||
fdisk \
|
||||
po \
|
||||
tests
|
||||
|
@ -62,6 +61,7 @@ include login-utils/Makemodule.am
|
|||
include mount-deprecated/Makemodule.am
|
||||
include sys-utils/Makemodule.am
|
||||
include misc-utils/Makemodule.am
|
||||
include disk-utils/Makemodule.am
|
||||
|
||||
# Arrange so that .tarball-version appears only in the distribution
|
||||
# tarball, and never in a checked-out repository.
|
||||
|
|
|
@ -928,6 +928,11 @@ UL_REQUIRES_HAVE([wdctl], [linux_watchdog_h], [linux/watchdog.h header file])
|
|||
AM_CONDITIONAL(BUILD_WDCTL, test "x$build_wdctl" = xyes)
|
||||
|
||||
|
||||
UL_BUILD_INIT([swaplabel], [check])
|
||||
UL_REQUIRES_BUILD([swaplabel], [libblkid])
|
||||
AM_CONDITIONAL(BUILD_SWAPLABEL, test "x$build_swaplabel" = xyes)
|
||||
|
||||
|
||||
UL_BUILD_INIT([prlimit], [check])
|
||||
UL_REQUIRES_LINUX([prlimit])
|
||||
UL_REQUIRES_SYSCALL_CHECK([prlimit], [UL_CHECK_SYSCALL([prlimit64])], [prlimit64])
|
||||
|
@ -1285,7 +1290,6 @@ AC_CONFIG_HEADERS(config.h)
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
disk-utils/Makefile
|
||||
fdisk/Makefile
|
||||
libblkid/blkid.pc
|
||||
libblkid/docs/Makefile
|
||||
|
|
|
@ -1,114 +0,0 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
utils_common = $(top_srcdir)/lib/blkdev.c
|
||||
if LINUX
|
||||
utils_common += $(top_srcdir)/lib/linux_version.c
|
||||
endif
|
||||
|
||||
if BUILD_LIBUUID
|
||||
uuid_cflags = -I$(ul_libuuid_srcdir)
|
||||
uuid_ldadd = $(ul_libuuid_la)
|
||||
endif
|
||||
|
||||
dist_man_MANS = \
|
||||
fsck.minix.8 \
|
||||
isosize.8 \
|
||||
mkfs.8 \
|
||||
mkfs.bfs.8 \
|
||||
mkfs.minix.8 \
|
||||
mkswap.8
|
||||
|
||||
sbin_PROGRAMS = \
|
||||
fsck.minix \
|
||||
mkfs \
|
||||
mkfs.bfs \
|
||||
mkfs.minix \
|
||||
mkswap
|
||||
|
||||
fsck_minix_SOURCES = \
|
||||
fsck.minix.c \
|
||||
minix_programs.h \
|
||||
$(top_srcdir)/lib/ismounted.c
|
||||
|
||||
mkfs_minix_SOURCES = \
|
||||
minix_programs.h \
|
||||
mkfs.minix.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(utils_common)
|
||||
|
||||
mkfs_bfs_SOURCES = \
|
||||
mkfs.bfs.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(utils_common)
|
||||
|
||||
swaplabel_SOURCES = swaplabel.c $(utils_common)
|
||||
swaplabel_LDADD = $(uuid_ldadd)
|
||||
swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
||||
|
||||
mkswap_SOURCES = \
|
||||
mkswap.c \
|
||||
$(top_srcdir)/lib/ismounted.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/wholedisk.c \
|
||||
$(utils_common)
|
||||
mkswap_LDADD = $(uuid_ldadd)
|
||||
mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
|
||||
|
||||
isosize_SOURCES = isosize.c $(top_srcdir)/lib/strutils.c
|
||||
usrbin_exec_PROGRAMS = isosize
|
||||
usrsbin_exec_PROGRAMS =
|
||||
|
||||
if LINUX
|
||||
dist_man_MANS += fdformat.8 blockdev.8
|
||||
sbin_PROGRAMS += blockdev
|
||||
usrsbin_exec_PROGRAMS += fdformat
|
||||
blockdev_SOURCES = blockdev.c $(utils_common)
|
||||
endif
|
||||
|
||||
if BUILD_FSCK
|
||||
sbin_PROGRAMS += fsck
|
||||
dist_man_MANS += fsck.8
|
||||
fsck_SOURCES = fsck.c
|
||||
fsck_LDADD = $(ul_libmount_la) $(ul_libblkid_la)
|
||||
fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
|
||||
endif
|
||||
|
||||
if BUILD_LIBBLKID
|
||||
sbin_PROGRAMS += swaplabel
|
||||
dist_man_MANS += swaplabel.8
|
||||
swaplabel_LDADD += $(ul_libblkid_la)
|
||||
swaplabel_CFLAGS += -I$(ul_libblkid_incdir)
|
||||
mkswap_LDADD += $(ul_libblkid_la)
|
||||
mkswap_CFLAGS += -I$(ul_libblkid_incdir)
|
||||
endif
|
||||
|
||||
if BUILD_ELVTUNE
|
||||
sbin_PROGRAMS += elvtune
|
||||
dist_man_MANS += elvtune.8
|
||||
elvtune_SOURCES = elvtune.c $(top_srcdir)/lib/linux_version.c
|
||||
endif
|
||||
|
||||
if BUILD_RAW
|
||||
sbin_PROGRAMS += raw
|
||||
dist_man_MANS += raw.8
|
||||
endif
|
||||
|
||||
if BUILD_CRAMFS
|
||||
cramfs_common = \
|
||||
$(utils_common) \
|
||||
cramfs.h \
|
||||
cramfs_common.c
|
||||
sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
|
||||
fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
|
||||
mkfs_cramfs_SOURCES = \
|
||||
mkfs.cramfs.c \
|
||||
$(cramfs_common) \
|
||||
$(top_srcdir)/lib/md5.c \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
fsck_cramfs_LDADD = -lz
|
||||
mkfs_cramfs_LDADD = -lz
|
||||
endif
|
||||
|
||||
if HAVE_SELINUX
|
||||
mkswap_LDADD += -lselinux
|
||||
endif
|
|
@ -0,0 +1,128 @@
|
|||
|
||||
lib_blkdev_sources = lib/blkdev.c
|
||||
if LINUX
|
||||
lib_blkdev_sources += lib/linux_version.c
|
||||
endif
|
||||
|
||||
|
||||
sbin_PROGRAMS += fsck.minix
|
||||
dist_man_MANS += disk-utils/fsck.minix.8
|
||||
fsck_minix_SOURCES = \
|
||||
disk-utils/fsck.minix.c \
|
||||
disk-utils/minix_programs.h \
|
||||
lib/ismounted.c
|
||||
|
||||
sbin_PROGRAMS += mkfs.minix
|
||||
dist_man_MANS += disk-utils/mkfs.minix.8
|
||||
mkfs_minix_SOURCES = \
|
||||
disk-utils/minix_programs.h \
|
||||
disk-utils/mkfs.minix.c \
|
||||
lib/strutils.c \
|
||||
$(lib_blkdev_sources)
|
||||
|
||||
sbin_PROGRAMS += mkfs
|
||||
dist_man_MANS += disk-utils/mkfs.8
|
||||
mkfs_SOURCES = disk-utils/mkfs.c
|
||||
|
||||
usrbin_exec_PROGRAMS += isosize
|
||||
dist_man_MANS += disk-utils/isosize.8
|
||||
isosize_SOURCES = disk-utils/isosize.c lib/strutils.c
|
||||
|
||||
sbin_PROGRAMS += mkfs.bfs
|
||||
dist_man_MANS += disk-utils/mkfs.bfs.8
|
||||
mkfs_bfs_SOURCES = \
|
||||
disk-utils/mkfs.bfs.c \
|
||||
lib/strutils.c \
|
||||
$(lib_blkdev_sources)
|
||||
|
||||
|
||||
sbin_PROGRAMS += mkswap
|
||||
dist_man_MANS += disk-utils/mkswap.8
|
||||
mkswap_SOURCES = \
|
||||
disk-utils/mkswap.c \
|
||||
lib/ismounted.c \
|
||||
lib/strutils.c \
|
||||
lib/wholedisk.c \
|
||||
$(lib_blkdev_sources)
|
||||
mkswap_CFLAGS = $(AM_CFLAGS)
|
||||
mkswap_LDADD =
|
||||
if BUILD_LIBUUID
|
||||
mkswap_CFLAGS += -I$(ul_libuuid_incdir)
|
||||
mkswap_LDADD += libuuid.la
|
||||
endif
|
||||
if BUILD_LIBBLKID
|
||||
mkswap_CFLAGS += -I$(ul_libblkid_incdir)
|
||||
mkswap_LDADD += libblkid.la
|
||||
endif
|
||||
if HAVE_SELINUX
|
||||
mkswap_LDADD += -lselinux
|
||||
endif
|
||||
|
||||
|
||||
if BUILD_SWAPLABEL
|
||||
sbin_PROGRAMS += swaplabel
|
||||
dist_man_MANS += disk-utils/swaplabel.8
|
||||
swaplabel_SOURCES = disk-utils/swaplabel.c $(lib_blkdev_sources)
|
||||
|
||||
swaplabel_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
swaplabel_LDADD = libblkid.la
|
||||
|
||||
if BUILD_LIBUUID
|
||||
swaplabel_LDADD += $(uuid_ldadd)
|
||||
swaplabel_CFLAGS += -I$(ul_libuuid_incdir)
|
||||
endif
|
||||
endif #BUILD_SWAPLABEL
|
||||
|
||||
|
||||
if BUILD_FSCK
|
||||
sbin_PROGRAMS += fsck
|
||||
dist_man_MANS += disk-utils/fsck.8
|
||||
fsck_SOURCES = disk-utils/fsck.c
|
||||
fsck_LDADD = libmount.la libblkid.la
|
||||
fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
|
||||
endif
|
||||
|
||||
|
||||
if BUILD_ELVTUNE
|
||||
sbin_PROGRAMS += elvtune
|
||||
dist_man_MANS += disk-utils/elvtune.8
|
||||
elvtune_SOURCES = disk-utils/elvtune.c lib/linux_version.c
|
||||
endif
|
||||
|
||||
|
||||
if BUILD_RAW
|
||||
sbin_PROGRAMS += raw
|
||||
dist_man_MANS += disk-utils/raw.8
|
||||
raw_SOURCES = disk-utils/raw.c
|
||||
endif
|
||||
|
||||
|
||||
if BUILD_CRAMFS
|
||||
cramfs_common_sources = \
|
||||
disk-utils/cramfs.h \
|
||||
disk-utils/cramfs_common.c \
|
||||
$(lib_blkdev_sources)
|
||||
|
||||
sbin_PROGRAMS += fsck.cramfs
|
||||
fsck_cramfs_SOURCES = disk-utils/fsck.cramfs.c $(cramfs_common_sources)
|
||||
fsck_cramfs_LDADD = -lz
|
||||
|
||||
sbin_PROGRAMS += mkfs.cramfs
|
||||
mkfs_cramfs_SOURCES = \
|
||||
disk-utils/mkfs.cramfs.c \
|
||||
$(cramfs_common_sources) \
|
||||
lib/md5.c \
|
||||
lib/strutils.c
|
||||
mkfs_cramfs_LDADD = -lz
|
||||
endif
|
||||
|
||||
|
||||
if LINUX
|
||||
sbin_PROGRAMS += blockdev
|
||||
dist_man_MANS += disk-utils/blockdev.8
|
||||
blockdev_SOURCES = disk-utils/blockdev.c $(lib_blkdev_sources)
|
||||
|
||||
usrsbin_exec_PROGRAMS += fdformat
|
||||
dist_man_MANS += disk-utils/fdformat.8
|
||||
fdformat_SOURCES = disk-utils/fdformat.c
|
||||
endif # LINUX
|
Loading…
Reference in New Issue