build-sys: convert mount/ to module, rename to mount-deprecated/
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
ffeb280566
commit
d2feb47fb1
|
@ -48,11 +48,6 @@ if BUILD_PARTX
|
|||
SUBDIRS += partx
|
||||
endif
|
||||
|
||||
if BUILD_MOUNT
|
||||
SUBDIRS += mount
|
||||
endif
|
||||
|
||||
|
||||
AUTOMAKE_OPTIONS = gnu
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
|
@ -74,6 +69,7 @@ include schedutils/Makemodule.am
|
|||
include text-utils/Makemodule.am
|
||||
include term-utils/Makemodule.am
|
||||
include login-utils/Makemodule.am
|
||||
include mount-deprecated/Makemodule.am
|
||||
|
||||
# Arrange so that .tarball-version appears only in the distribution
|
||||
# tarball, and never in a checked-out repository.
|
||||
|
|
|
@ -14,7 +14,7 @@ cd $srcdir
|
|||
DIE=0
|
||||
HAS_GTKDOC=1
|
||||
|
||||
test -f mount/mount.c || {
|
||||
test -f sys-utils/mount.c || {
|
||||
echo
|
||||
echo "You must run this script in the top-level util-linux directory"
|
||||
echo
|
||||
|
|
|
@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wn
|
|||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
|
||||
[AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
|
||||
|
||||
AC_CONFIG_SRCDIR(mount/mount.c)
|
||||
AC_CONFIG_SRCDIR(sys-utils/mount.c)
|
||||
AC_PREFIX_DEFAULT([/usr])
|
||||
|
||||
dnl version details from <major>.<minor>[-<suffix>]
|
||||
|
@ -1316,7 +1316,6 @@ libuuid/uuid.pc
|
|||
man/ru/Makefile
|
||||
misc-utils/Makefile
|
||||
misc-utils/uuidd.service
|
||||
mount/Makefile
|
||||
partx/Makefile
|
||||
po/Makefile.in
|
||||
sys-utils/Makefile
|
||||
|
|
|
@ -0,0 +1,99 @@
|
|||
if BUILD_MOUNT
|
||||
|
||||
bin_PROGRAMS += mount umount
|
||||
dist_man_MANS += \
|
||||
mount-deprecated/mount.8 \
|
||||
mount-deprecated/umount.8
|
||||
|
||||
mount_common_sources = \
|
||||
mount-deprecated/sundries.c \
|
||||
mount-deprecated/sundries.h \
|
||||
mount-deprecated/fstab.h \
|
||||
mount-deprecated/mount_mntent.h \
|
||||
mount-deprecated/mount_constants.h \
|
||||
mount-deprecated/getusername.h \
|
||||
mount-deprecated/fsprobe.h \
|
||||
mount-deprecated/devname.c \
|
||||
mount-deprecated/devname.h \
|
||||
mount-deprecated/fstab.c \
|
||||
mount-deprecated/getusername.c \
|
||||
mount-deprecated/mount_mntent.c \
|
||||
mount-deprecated/fsprobe.c \
|
||||
\
|
||||
lib/canonicalize.c \
|
||||
lib/at.c \
|
||||
lib/blkdev.c \
|
||||
lib/env.c \
|
||||
lib/linux_version.c \
|
||||
lib/loopdev.c \
|
||||
lib/mangle.c \
|
||||
lib/strutils.c \
|
||||
lib/xgetpass.c \
|
||||
lib/sysfs.c
|
||||
|
||||
mount_SOURCES = \
|
||||
mount-deprecated/mount.c \
|
||||
$(mount_common_sources) \
|
||||
lib/setproctitle.c
|
||||
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||
mount_LDADD = libblkid.la
|
||||
|
||||
umount_SOURCES = \
|
||||
mount-deprecated/umount.c \
|
||||
$(mount_common_sources)
|
||||
umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||
umount_LDADD = libblkid.la
|
||||
|
||||
|
||||
|
||||
mount_static_LDADD =
|
||||
|
||||
if HAVE_STATIC_MOUNT
|
||||
bin_PROGRAMS += mount.static
|
||||
mount_static_SOURCES = $(mount_SOURCES)
|
||||
mount_static_CFLAGS = $(mount_CFLAGS)
|
||||
mount_static_LDFLAGS = -all-static
|
||||
mount_static_LDADD += libblkid.la
|
||||
endif
|
||||
|
||||
if HAVE_STATIC_UMOUNT
|
||||
bin_PROGRAMS += umount.static
|
||||
umount_static_SOURCES = $(umount_SOURCES)
|
||||
umount_static_CFLAGS = $(umount_CFLAGS)
|
||||
umount_static_LDFLAGS = -all-static
|
||||
umount_static_LDADD = libblkid.la
|
||||
endif
|
||||
|
||||
if HAVE_SELINUX
|
||||
mount_LDADD += $(SELINUX_LIBS)
|
||||
mount_static_LDADD += $(SELINUX_LIBS_STATIC)
|
||||
endif
|
||||
|
||||
# hybrid mount -- old mount + new code from libmount for mtab management
|
||||
#
|
||||
if BUILD_LIBMOUNT_MOUNT
|
||||
mount_LDADD += libmount.la
|
||||
mount_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||
umount_LDADD += libmount.la
|
||||
umount_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||
if HAVE_STATIC_MOUNT
|
||||
mount_static_LDADD += libmount.la
|
||||
mount_static_CFLAGS += -I$(ul_libmount_incdir)
|
||||
endif
|
||||
if HAVE_STATIC_UMOUNT
|
||||
umount_static_LDADD += libmount.la
|
||||
umount_static_CFLAGS += -I$(ul_libmount_incdir)
|
||||
endif
|
||||
endif
|
||||
|
||||
if MAKEINSTALL_DO_SETUID
|
||||
install-exec-hook-mount:
|
||||
chmod 4755 $(DESTDIR)$(bindir)/mount
|
||||
chmod 4755 $(DESTDIR)$(bindir)/umount
|
||||
|
||||
INSTALL_EXEC_HOOKS += install-exec-hook-mount
|
||||
endif
|
||||
|
||||
endif # BUILD_MOUNT
|
|
@ -12,4 +12,3 @@ spec_to_devname(const char *spec)
|
|||
return xstrdup(spec);
|
||||
return fsprobe_get_devname_by_spec(spec);
|
||||
}
|
||||
|
|
@ -139,4 +139,3 @@ fsprobe_get_devname_by_label(const char *label)
|
|||
{
|
||||
return blkid_evaluate_tag("LABEL", label, &blcache);
|
||||
}
|
||||
|
|
@ -1168,4 +1168,3 @@ main(int argc, char **argv)
|
|||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -2855,4 +2855,3 @@ command existed in Version 5 AT&T UNIX.
|
|||
.SH AVAILABILITY
|
||||
The mount command is part of the util-linux package and is available from
|
||||
ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
|
||||
|
|
@ -298,4 +298,3 @@ char *canonicalize (const char *path)
|
|||
die(EX_SYSERR, _("not enough memory"));
|
||||
return res;
|
||||
}
|
||||
|
|
@ -53,4 +53,3 @@ char *canonicalize_spec (const char *path);
|
|||
#define EX_SOMEOK 64 /* some mount succeeded */
|
||||
|
||||
#endif /* SUNDRIES_H */
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
bin_PROGRAMS = mount umount
|
||||
dist_man_MANS = mount.8 umount.8
|
||||
|
||||
# generic sources for all programs (mount, umount)
|
||||
srcs_common = \
|
||||
sundries.c \
|
||||
$(top_srcdir)/lib/canonicalize.c \
|
||||
sundries.h
|
||||
|
||||
# generic header for mount and umount
|
||||
hdrs_mount = fstab.h mount_mntent.h mount_constants.h getusername.h fsprobe.h
|
||||
|
||||
# generic sources for mount and umount
|
||||
srcs_mount = \
|
||||
$(srcs_common) \
|
||||
$(hdrs_mount) \
|
||||
devname.c \
|
||||
devname.h \
|
||||
fstab.c \
|
||||
getusername.c \
|
||||
mount_mntent.c \
|
||||
fsprobe.c \
|
||||
$(top_srcdir)/lib/at.c \
|
||||
$(top_srcdir)/lib/blkdev.c \
|
||||
$(top_srcdir)/lib/env.c \
|
||||
$(top_srcdir)/lib/linux_version.c \
|
||||
$(top_srcdir)/lib/loopdev.c \
|
||||
$(top_srcdir)/lib/mangle.c \
|
||||
$(top_srcdir)/lib/strutils.c \
|
||||
$(top_srcdir)/lib/xgetpass.c \
|
||||
$(top_srcdir)/lib/sysfs.c
|
||||
|
||||
# generic flags for all programs
|
||||
# -- note that pkg-config autoconf macros (pkg.m4) does not differentiate
|
||||
# between CFLAGS and CPPFLAGS, we follow this behaviour and use CFLAGS only.
|
||||
ldadd_common = $(ul_libblkid_la)
|
||||
ldadd_static = $(ul_libblkid_la)
|
||||
cflags_common = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
|
||||
ldflags_static = -all-static
|
||||
|
||||
mount_SOURCES = \
|
||||
mount.c \
|
||||
$(srcs_mount) \
|
||||
$(top_srcdir)/lib/setproctitle.c
|
||||
mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
|
||||
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||
mount_LDADD = $(ldadd_common)
|
||||
|
||||
umount_SOURCES = umount.c $(srcs_mount)
|
||||
umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common)
|
||||
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||
umount_LDADD = $(ldadd_common)
|
||||
|
||||
mount_static_LDADD =
|
||||
|
||||
if HAVE_STATIC_MOUNT
|
||||
bin_PROGRAMS += mount.static
|
||||
mount_static_SOURCES = $(mount_SOURCES)
|
||||
mount_static_CFLAGS = $(cflags_common)
|
||||
mount_static_LDFLAGS = $(ldflags_static)
|
||||
mount_static_LDADD += $(ldadd_static)
|
||||
endif
|
||||
|
||||
if HAVE_STATIC_UMOUNT
|
||||
bin_PROGRAMS += umount.static
|
||||
umount_static_SOURCES = $(umount_SOURCES)
|
||||
umount_static_CFLAGS = $(cflags_common)
|
||||
umount_static_LDFLAGS = $(ldflags_static)
|
||||
umount_static_LDADD = $(ldadd_static)
|
||||
endif
|
||||
|
||||
if HAVE_SELINUX
|
||||
mount_LDADD += $(SELINUX_LIBS)
|
||||
mount_static_LDADD += $(SELINUX_LIBS_STATIC)
|
||||
endif
|
||||
|
||||
if BUILD_LIBMOUNT_MOUNT
|
||||
mount_LDADD += $(ul_libmount_la)
|
||||
mount_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||
umount_LDADD += $(ul_libmount_la)
|
||||
umount_CFLAGS += $(AM_CFLAGS) -I$(ul_libmount_incdir)
|
||||
if HAVE_STATIC_MOUNT
|
||||
mount_static_LDADD += $(ul_libmount_la)
|
||||
mount_static_CFLAGS += -I$(ul_libmount_incdir)
|
||||
endif
|
||||
if HAVE_STATIC_UMOUNT
|
||||
umount_static_LDADD += $(ul_libmount_la)
|
||||
umount_static_CFLAGS += -I$(ul_libmount_incdir)
|
||||
endif
|
||||
endif
|
||||
|
||||
if !BUILD_LIBMOUNT_MOUNT
|
||||
noinst_PROGRAMS = mtab_lock_test
|
||||
mtab_lock_test_SOURCES = \
|
||||
fstab.c \
|
||||
$(hdrs_mount) \
|
||||
$(srcs_common) \
|
||||
$(top_srcdir)/lib/strutils.c
|
||||
mtab_lock_test_CPPFLAGS = -DMAIN_TEST_MTABLOCK $(AM_CPPFLAGS)
|
||||
endif
|
||||
|
||||
install-exec-hook:
|
||||
if MAKEINSTALL_DO_SETUID
|
||||
chmod 4755 $(DESTDIR)$(bindir)/mount
|
||||
chmod 4755 $(DESTDIR)$(bindir)/umount
|
||||
endif
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (C) 2011 Karel Zak <kzak@redhat.com>
|
||||
#
|
||||
|
||||
test -f mount/mount.c || {
|
||||
test -f sys-utils/mount.c || {
|
||||
echo
|
||||
echo "You must run this script in the top-level util-linux directory"
|
||||
echo
|
||||
|
|
Loading…
Reference in New Issue