build-sys: remove deprecated-mount/

Signed-off-by: Karel Zak <kzak@redhat.com>
util-linux · Mar 5, 2014 · 65acdc8 · 65acdc8
1 parent 4a44a54
commit 65acdc8
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 8,560 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -83,7 +83,6 @@ include schedutils/Makemodule.am
 include text-utils/Makemodule.am
 include term-utils/Makemodule.am
 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

diff --git a/configure.ac b/configure.ac
@@ -791,23 +791,12 @@ UL_REQUIRES_BUILD([fdisk], [libfdisk])
 AM_CONDITIONAL([BUILD_FDISK], [test "x$build_fdisk" = xyes])
 
 
-AC_ARG_ENABLE([deprecated-mount],
-  AS_HELP_STRING([--enable-deprecated-mount], [build old mount utilities]),
-  [], [enable_deprecated_mount=no]
-)
-UL_BUILD_INIT([deprecated_mount])
-UL_REQUIRES_LINUX([deprecated_mount])
-UL_REQUIRES_BUILD([deprecated_mount], [libblkid])
-AM_CONDITIONAL([BUILD_DEPRECATED_MOUNT], [test "x$build_deprecated_mount" = xyes])
-
-
 AC_ARG_ENABLE([mount],
   AS_HELP_STRING([--disable-mount], [do not build mount(8) and umount(8)]),
   [], [enable_mount=check]
 )
 UL_BUILD_INIT([mount])
 UL_REQUIRES_BUILD([mount], [libmount])
-UL_CONFLICTS_BUILD([mount], [deprecated_mount], [old deprecated mount version])
 AM_CONDITIONAL([BUILD_MOUNT], [test "x$build_mount" = xyes])
 
 

diff --git a/mount-deprecated/Makemodule.am b/mount-deprecated/Makemodule.am
diff --git a/mount-deprecated/devname.c b/mount-deprecated/devname.c
diff --git a/mount-deprecated/devname.h b/mount-deprecated/devname.h
diff --git a/mount-deprecated/fsprobe.c b/mount-deprecated/fsprobe.c
diff --git a/mount-deprecated/fsprobe.h b/mount-deprecated/fsprobe.h