[Pkg-loop-aes-commits] [SCM] Debian loop-AES packaging branch, upstream, updated. upstream/3.2f-2-gbc1f06b

Sat Dec 12 13:43:04 UTC 2009

The following commit has been merged in the upstream branch:
commit bc1f06bd4fb79819f6fe2a272e6f7fa7f055f8db
Author: Max Vozeler <max at hinterhof.net>
Date:   Sat Dec 12 14:31:32 2009 +0100

    Imported Upstream version 3.2h

diff --git a/ChangeLog b/ChangeLog
index b02c9f5..54b2768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -546,3 +546,7 @@ loop-AES-v3.2g    June 26 2009
       util-linux-ng version was not affected. Bug reported by Phil Grundig.
     - Worked around block layer interface breakage on linux-2.6.31-rc1
       kernel.
+
+loop-AES-v3.2h    October 11 2009
+    - Worked around block layer interface breakage on linux-2.6.32-rc
+      kernels.
diff --git a/README b/README
index b5fe1ae..72f2424 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Written by Jari Ruusu <jariruusu at users.sourceforge.net>, June 26 2009
+Written by Jari Ruusu <jariruusu at users.sourceforge.net>, October 11 2009
 
 Copyright 2001-2009 by Jari Ruusu.
 Redistribution of this file is permitted under the GNU Public License.
@@ -403,11 +403,14 @@ losetup, swapon, swapoff and their man pages:
 
 Or alternatively, if your distro is using util-linux-ng version:
 
-    bzip2 -d -c util-linux-ng-2.15.1.tar.bz2 | tar xvf -
-    cd util-linux-ng-2.15.1
-    patch -p1 </PATH/TO/LOOP-AES/util-linux-ng-2.15.1.diff
+    bzip2 -d -c util-linux-ng-2.16.1.tar.bz2 | tar xvf -
+    cd util-linux-ng-2.16.1
+    patch -p1 </PATH/TO/LOOP-AES/util-linux-ng-2.16.1.diff
     CFLAGS="-O2 -Wall" ./configure
-    make SUBDIRS=mount
+    make
+
+In some cases it may be necessary to add --disable-shared --enable-static
+parameters to util-linux-ng ./configure command.
 
 For either version of util-linux:
 
@@ -459,9 +462,9 @@ gpg sources are available from:
 These commands, as root user, will recompile and install gpg and gpgv and
 their man pages:
 
-    bzip2 -d -c gnupg-1.4.9.tar.bz2 | tar xvf -
-    cd gnupg-1.4.9
-    patch -p1 </PATH/TO/LOOP-AES/gnupg-1.4.9.diff
+    bzip2 -d -c gnupg-1.4.10.tar.bz2 | tar xvf -
+    cd gnupg-1.4.10
+    patch -p1 </PATH/TO/LOOP-AES/gnupg-1.4.10.diff
     CFLAGS="-O2" LDFLAGS="-static -s" ./configure --prefix=/usr --enable-static-rnd=linux
     make
     rm -f /usr/share/man/man1/{gpg,gpgv}.1.gz
diff --git a/dkms.conf b/dkms.conf
index 09aff43..b5461c5 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,7 +1,7 @@
 # dkms.conf for Dynamic Kernel Module Support
 # http://linux.dell.com/dkms/dkms.html for more info
 
-PACKAGE_VERSION=v3.2g
+PACKAGE_VERSION=v3.2h
 PACKAGE_NAME="loop-AES"
 CLEAN="make clean"
 
diff --git a/gnupg-1.4.9.diff b/gnupg-1.4.10.diff
similarity index 72%
rename from gnupg-1.4.9.diff
rename to gnupg-1.4.10.diff
index a7e4206..f5557e4 100644
--- a/gnupg-1.4.9.diff
+++ b/gnupg-1.4.10.diff
@@ -1,5 +1,5 @@
---- gnupg-1.4.9/g10/gpg.c.old	2008-03-20 11:06:43.000000000 +0200
-+++ gnupg-1.4.9/g10/gpg.c	2008-03-28 14:44:50.000000000 +0200
+--- gnupg-1.4.10/g10/gpg.c.old	2009-08-03 19:37:12.000000000 +0300
++++ gnupg-1.4.10/g10/gpg.c	2009-09-03 16:55:40.000000000 +0300
 @@ -1892,7 +1892,7 @@
      opt.cert_digest_algo = 0;
      opt.compress_algo = -1; /* defaults to DEFAULT_COMPRESS_ALGO */
diff --git a/kernel-2.6.30.diff b/kernel-2.6.31.diff
similarity index 98%
rename from kernel-2.6.30.diff
rename to kernel-2.6.31.diff
index 02fd391..97718de 100644
--- a/kernel-2.6.30.diff
+++ b/kernel-2.6.31.diff
@@ -3,9 +3,9 @@ include/linux/loop.h source files must be removed:
 
     rm -f drivers/block/loop.c include/linux/loop.h
 
-diff -urN linux-2.6.30-noloop/drivers/block/Kconfig linux-2.6.30-AES/drivers/block/Kconfig
---- linux-2.6.30-noloop/drivers/block/Kconfig	2009-06-24 20:09:55.000000000 +0300
-+++ linux-2.6.30-AES/drivers/block/Kconfig	2009-06-24 20:26:12.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/block/Kconfig linux-2.6.31-AES/drivers/block/Kconfig
+--- linux-2.6.31-noloop/drivers/block/Kconfig	2009-10-08 13:51:24.000000000 +0300
++++ linux-2.6.31-AES/drivers/block/Kconfig	2009-10-10 17:02:08.000000000 +0300
 @@ -240,14 +240,6 @@
  	  bits of, say, a sound file). This is also safe if the file resides
  	  on a remote file server.
@@ -31,6 +31,13 @@ diff -urN linux-2.6.30-noloop/drivers/block/Kconfig linux-2.6.30-AES/drivers/blo
 -	select CRYPTO_CBC
 +config BLK_DEV_LOOP_AES
 +	bool "AES encrypted loop device support"
++	depends on BLK_DEV_LOOP
++	---help---
++	  If you want to use AES encryption algorithm to encrypt loop
++	  devices, say Y here. If you don't know what to do here, say N.
++
++config BLK_DEV_LOOP_KEYSCRUB
++	bool "loop encryption key scrubbing support"
  	depends on BLK_DEV_LOOP
  	---help---
 -	  Say Y here if you want to be able to use the ciphers that are 
@@ -41,13 +48,6 @@ diff -urN linux-2.6.30-noloop/drivers/block/Kconfig linux-2.6.30-AES/drivers/blo
 -	  ext3 or Reiserfs. Please use the Device Mapper crypto module
 -	  instead, which can be configured to be on-disk compatible with the
 -	  cryptoloop device.
-+	  If you want to use AES encryption algorithm to encrypt loop
-+	  devices, say Y here. If you don't know what to do here, say N.
-+
-+config BLK_DEV_LOOP_KEYSCRUB
-+	bool "loop encryption key scrubbing support"
-+	depends on BLK_DEV_LOOP
-+	---help---
 +	  Loop encryption key scrubbing moves and inverts key bits in
 +	  kernel RAM so that the thin oxide which forms the storage
 +	  capacitor dielectric of DRAM cells is not permitted to develop
@@ -66,9 +66,9 @@ diff -urN linux-2.6.30-noloop/drivers/block/Kconfig linux-2.6.30-AES/drivers/blo
  
  config BLK_DEV_NBD
  	tristate "Network block device support"
-diff -urN linux-2.6.30-noloop/drivers/block/Makefile linux-2.6.30-AES/drivers/block/Makefile
---- linux-2.6.30-noloop/drivers/block/Makefile	2009-06-24 20:09:55.000000000 +0300
-+++ linux-2.6.30-AES/drivers/block/Makefile	2009-06-24 20:26:12.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/block/Makefile linux-2.6.31-AES/drivers/block/Makefile
+--- linux-2.6.31-noloop/drivers/block/Makefile	2009-10-08 13:51:24.000000000 +0300
++++ linux-2.6.31-AES/drivers/block/Makefile	2009-10-10 17:02:08.000000000 +0300
 @@ -1,6 +1,11 @@
  #
  # Makefile for the kernel block device drivers.
@@ -81,10 +81,10 @@ diff -urN linux-2.6.30-noloop/drivers/block/Makefile linux-2.6.30-AES/drivers/bl
  # 12 June 2000, Christoph Hellwig <hch at infradead.org>
  # Rewritten to use lists instead of if-statements.
  # 
-diff -urN linux-2.6.30-noloop/drivers/block/loop.c linux-2.6.30-AES/drivers/block/loop.c
---- linux-2.6.30-noloop/drivers/block/loop.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/block/loop.c	2009-06-25 20:46:59.000000000 +0300
-@@ -0,0 +1,2943 @@
+diff -urN linux-2.6.31-noloop/drivers/block/loop.c linux-2.6.31-AES/drivers/block/loop.c
+--- linux-2.6.31-noloop/drivers/block/loop.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/block/loop.c	2009-10-10 17:04:04.000000000 +0300
+@@ -0,0 +1,2946 @@
 +/*
 + *  linux/drivers/block/loop.c
 + *
@@ -1389,7 +1389,7 @@ diff -urN linux-2.6.30-noloop/drivers/block/loop.c linux-2.6.30-AES/drivers/bloc
 +	/* read-ahead bit needs to be cleared to work around kernel bug */
 +	/* that causes I/O errors on -EWOULDBLOCK I/O elevator failures */
 +	bio->bi_rw = orig_bio->bi_rw & ~((1 << BIO_RW_BARRIER) | (1 << BIO_RW_AHEAD));
-+	if (bio_barrier(orig_bio)) {
++	if (orig_bio->bi_rw & (1 << BIO_RW_BARRIER)) {
 +		if(merge->bi_idx == (orig_bio->bi_vcnt - 1)) {
 +#if LINUX_VERSION_CODE >= 0x20609
 +			setBarr2:
@@ -1417,10 +1417,13 @@ diff -urN linux-2.6.30-noloop/drivers/block/loop.c linux-2.6.30-AES/drivers/bloc
 +	}
 +#endif
 +#endif
-+#if defined(BIO_RW_SYNC)
-+	bio->bi_rw &= ~(1 << BIO_RW_SYNC);
-+	if (bio_sync(orig_bio) && (merge->bi_idx == (orig_bio->bi_vcnt - 1)))
-+		bio->bi_rw |= (1 << BIO_RW_SYNC);
++#if defined(BIO_RW_SYNC) || defined(BIO_RW_SYNCIO) || (LINUX_VERSION_CODE >= 0x20620)
++#if !defined(BIO_RW_SYNCIO) && defined(BIO_RW_SYNC)
++# define BIO_RW_SYNCIO BIO_RW_SYNC
++#endif
++	bio->bi_rw &= ~(1 << BIO_RW_SYNCIO);
++	if ((orig_bio->bi_rw & (1 << BIO_RW_SYNCIO)) && (merge->bi_idx == (orig_bio->bi_vcnt - 1)))
++		bio->bi_rw |= (1 << BIO_RW_SYNCIO);
 +#endif
 +	bio->bi_vcnt = 1;
 +	bio->bi_idx = 0;
@@ -1733,7 +1736,7 @@ diff -urN linux-2.6.30-noloop/drivers/block/loop.c linux-2.6.30-AES/drivers/bloc
 +	old_bio->bi_hw_front_size = 0;
 +#endif
 +#endif
-+	if(test_and_clear_bit(0, &lo->lo_bio_flag) || bio_barrier(old_bio)) {
++	if(test_and_clear_bit(0, &lo->lo_bio_flag) || (old_bio->bi_rw & (1 << BIO_RW_BARRIER))) {
 +		atomic_inc(&lo->lo_bio_barr);
 +#if LINUX_VERSION_CODE >= 0x20609
 +#if (LINUX_VERSION_CODE >= 0x2061c) || ((LINUX_VERSION_CODE >= 0x2061b) && !defined(BIOVEC_VIRT_START_SIZE))
@@ -3028,9 +3031,9 @@ diff -urN linux-2.6.30-noloop/drivers/block/loop.c linux-2.6.30-AES/drivers/bloc
 +}
 +EXPORT_SYMBOL(loop_add_keyscrub_fn);
 +#endif
-diff -urN linux-2.6.30-noloop/drivers/misc/Makefile linux-2.6.30-AES/drivers/misc/Makefile
---- linux-2.6.30-noloop/drivers/misc/Makefile	2009-06-24 20:10:25.000000000 +0300
-+++ linux-2.6.30-AES/drivers/misc/Makefile	2009-06-24 20:26:12.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/Makefile linux-2.6.31-AES/drivers/misc/Makefile
+--- linux-2.6.31-noloop/drivers/misc/Makefile	2009-10-08 13:51:47.000000000 +0300
++++ linux-2.6.31-AES/drivers/misc/Makefile	2009-10-10 17:02:08.000000000 +0300
 @@ -2,6 +2,27 @@
  # Makefile for misc devices that really don't fit anywhere else.
  #
@@ -3059,9 +3062,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/Makefile linux-2.6.30-AES/drivers/mis
  obj-$(CONFIG_IBM_ASM)		+= ibmasm/
  obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/
  obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o
-diff -urN linux-2.6.30-noloop/drivers/misc/aes-amd64.S linux-2.6.30-AES/drivers/misc/aes-amd64.S
---- linux-2.6.30-noloop/drivers/misc/aes-amd64.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/aes-amd64.S	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/aes-amd64.S linux-2.6.31-AES/drivers/misc/aes-amd64.S
+--- linux-2.6.31-noloop/drivers/misc/aes-amd64.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/aes-amd64.S	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,897 @@
 +//
 +// Copyright (c) 2001, Dr Brian Gladman <brg at gladman.uk.net>, Worcester, UK.
@@ -3960,9 +3963,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/aes-amd64.S linux-2.6.30-AES/drivers/
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"", at progbits
 +#endif
-diff -urN linux-2.6.30-noloop/drivers/misc/aes-x86.S linux-2.6.30-AES/drivers/misc/aes-x86.S
---- linux-2.6.30-noloop/drivers/misc/aes-x86.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/aes-x86.S	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/aes-x86.S linux-2.6.31-AES/drivers/misc/aes-x86.S
+--- linux-2.6.31-noloop/drivers/misc/aes-x86.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/aes-x86.S	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,927 @@
 +//
 +// Copyright (c) 2001, Dr Brian Gladman <brg at gladman.uk.net>, Worcester, UK.
@@ -4891,9 +4894,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/aes-x86.S linux-2.6.30-AES/drivers/mi
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"", at progbits
 +#endif
-diff -urN linux-2.6.30-noloop/drivers/misc/aes.c linux-2.6.30-AES/drivers/misc/aes.c
---- linux-2.6.30-noloop/drivers/misc/aes.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/aes.c	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/aes.c linux-2.6.31-AES/drivers/misc/aes.c
+--- linux-2.6.31-noloop/drivers/misc/aes.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/aes.c	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,1479 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -6374,9 +6377,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/aes.c linux-2.6.30-AES/drivers/misc/a
 +
 +    state_out(out_blk, b0);
 +}
-diff -urN linux-2.6.30-noloop/drivers/misc/aes.h linux-2.6.30-AES/drivers/misc/aes.h
---- linux-2.6.30-noloop/drivers/misc/aes.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/aes.h	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/aes.h linux-2.6.31-AES/drivers/misc/aes.h
+--- linux-2.6.31-noloop/drivers/misc/aes.h	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/aes.h	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,112 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -6490,9 +6493,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/aes.h linux-2.6.30-AES/drivers/misc/a
 +// if their parameters have not changed.
 +
 +#endif  // _AES_H
-diff -urN linux-2.6.30-noloop/drivers/misc/crypto-ksym.c linux-2.6.30-AES/drivers/misc/crypto-ksym.c
---- linux-2.6.30-noloop/drivers/misc/crypto-ksym.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/crypto-ksym.c	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/crypto-ksym.c linux-2.6.31-AES/drivers/misc/crypto-ksym.c
+--- linux-2.6.31-noloop/drivers/misc/crypto-ksym.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/crypto-ksym.c	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,7 @@
 +#include <linux/module.h>
 +#include "aes.h"
@@ -6501,9 +6504,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/crypto-ksym.c linux-2.6.30-AES/driver
 +EXPORT_SYMBOL(aes_encrypt);
 +EXPORT_SYMBOL(aes_decrypt);
 +EXPORT_SYMBOL(md5_transform_CPUbyteorder);
-diff -urN linux-2.6.30-noloop/drivers/misc/md5-amd64.S linux-2.6.30-AES/drivers/misc/md5-amd64.S
---- linux-2.6.30-noloop/drivers/misc/md5-amd64.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/md5-amd64.S	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/md5-amd64.S linux-2.6.31-AES/drivers/misc/md5-amd64.S
+--- linux-2.6.31-noloop/drivers/misc/md5-amd64.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/md5-amd64.S	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,204 @@
 +//
 +//  md5-amd64.S
@@ -6709,9 +6712,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/md5-amd64.S linux-2.6.30-AES/drivers/
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"", at progbits
 +#endif
-diff -urN linux-2.6.30-noloop/drivers/misc/md5-x86.S linux-2.6.30-AES/drivers/misc/md5-x86.S
---- linux-2.6.30-noloop/drivers/misc/md5-x86.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/md5-x86.S	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/md5-x86.S linux-2.6.31-AES/drivers/misc/md5-x86.S
+--- linux-2.6.31-noloop/drivers/misc/md5-x86.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/md5-x86.S	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,211 @@
 +//
 +//  md5-x86.S
@@ -6924,9 +6927,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/md5-x86.S linux-2.6.30-AES/drivers/mi
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"", at progbits
 +#endif
-diff -urN linux-2.6.30-noloop/drivers/misc/md5.c linux-2.6.30-AES/drivers/misc/md5.c
---- linux-2.6.30-noloop/drivers/misc/md5.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/md5.c	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/md5.c linux-2.6.31-AES/drivers/misc/md5.c
+--- linux-2.6.31-noloop/drivers/misc/md5.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/md5.c	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,106 @@
 +/*
 + * MD5 Message Digest Algorithm (RFC1321).
@@ -7034,9 +7037,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/md5.c linux-2.6.30-AES/drivers/misc/m
 +    hash[2] += c;
 +    hash[3] += d;
 +}
-diff -urN linux-2.6.30-noloop/drivers/misc/md5.h linux-2.6.30-AES/drivers/misc/md5.h
---- linux-2.6.30-noloop/drivers/misc/md5.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/drivers/misc/md5.h	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/drivers/misc/md5.h linux-2.6.31-AES/drivers/misc/md5.h
+--- linux-2.6.31-noloop/drivers/misc/md5.h	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/drivers/misc/md5.h	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,10 @@
 +/* md5.h */
 +
@@ -7048,9 +7051,9 @@ diff -urN linux-2.6.30-noloop/drivers/misc/md5.h linux-2.6.30-AES/drivers/misc/m
 + asmlinkage
 +#endif
 +extern void md5_transform_CPUbyteorder(u_int32_t *, u_int32_t const *);
-diff -urN linux-2.6.30-noloop/include/linux/loop.h linux-2.6.30-AES/include/linux/loop.h
---- linux-2.6.30-noloop/include/linux/loop.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.30-AES/include/linux/loop.h	2009-06-24 20:26:13.000000000 +0300
+diff -urN linux-2.6.31-noloop/include/linux/loop.h linux-2.6.31-AES/include/linux/loop.h
+--- linux-2.6.31-noloop/include/linux/loop.h	1970-01-01 02:00:00.000000000 +0200
++++ linux-2.6.31-AES/include/linux/loop.h	2009-10-10 17:02:08.000000000 +0300
 @@ -0,0 +1,167 @@
 +#ifndef _LINUX_LOOP_H
 +#define _LINUX_LOOP_H
diff --git a/loop.c-2.6.patched b/loop.c-2.6.patched
index 035a215..76aa2d4 100644
--- a/loop.c-2.6.patched
+++ b/loop.c-2.6.patched
@@ -586,7 +586,7 @@ static struct bio *loop_get_buffer(struct loop_device *lo, struct bio *orig_bio,
 	/* read-ahead bit needs to be cleared to work around kernel bug */
 	/* that causes I/O errors on -EWOULDBLOCK I/O elevator failures */
 	bio->bi_rw = orig_bio->bi_rw & ~((1 << BIO_RW_BARRIER) | (1 << BIO_RW_AHEAD));
-	if (bio_barrier(orig_bio)) {
+	if (orig_bio->bi_rw & (1 << BIO_RW_BARRIER)) {
 		if(merge->bi_idx == (orig_bio->bi_vcnt - 1)) {
 #if LINUX_VERSION_CODE >= 0x20609
 			setBarr2:
@@ -614,10 +614,13 @@ static struct bio *loop_get_buffer(struct loop_device *lo, struct bio *orig_bio,
 	}
 #endif
 #endif
-#if defined(BIO_RW_SYNC)
-	bio->bi_rw &= ~(1 << BIO_RW_SYNC);
-	if (bio_sync(orig_bio) && (merge->bi_idx == (orig_bio->bi_vcnt - 1)))
-		bio->bi_rw |= (1 << BIO_RW_SYNC);
+#if defined(BIO_RW_SYNC) || defined(BIO_RW_SYNCIO) || (LINUX_VERSION_CODE >= 0x20620)
+#if !defined(BIO_RW_SYNCIO) && defined(BIO_RW_SYNC)
+# define BIO_RW_SYNCIO BIO_RW_SYNC
+#endif
+	bio->bi_rw &= ~(1 << BIO_RW_SYNCIO);
+	if ((orig_bio->bi_rw & (1 << BIO_RW_SYNCIO)) && (merge->bi_idx == (orig_bio->bi_vcnt - 1)))
+		bio->bi_rw |= (1 << BIO_RW_SYNCIO);
 #endif
 	bio->bi_vcnt = 1;
 	bio->bi_idx = 0;
@@ -932,7 +935,7 @@ static int loop_make_request_real(struct request_queue *q, struct bio *old_bio)
 	old_bio->bi_hw_front_size = 0;
 #endif
 #endif
-	if(test_and_clear_bit(0, &LDE_lo_bio_flag) || bio_barrier(old_bio)) {
+	if(test_and_clear_bit(0, &LDE_lo_bio_flag) || (old_bio->bi_rw & (1 << BIO_RW_BARRIER))) {
 		atomic_inc(&LDE_lo_bio_barr);
 #if LINUX_VERSION_CODE >= 0x20609
 #if (LINUX_VERSION_CODE >= 0x2061c) || ((LINUX_VERSION_CODE >= 0x2061b) && !defined(BIOVEC_VIRT_START_SIZE))
diff --git a/util-linux-ng-2.15.1.diff b/util-linux-ng-2.16.1.diff
similarity index 91%
rename from util-linux-ng-2.15.1.diff
rename to util-linux-ng-2.16.1.diff
index a6cd0b5..b8b51fe 100644
--- a/util-linux-ng-2.15.1.diff
+++ b/util-linux-ng-2.16.1.diff
@@ -7,9 +7,9 @@ mount/Makefile.in is a generated file. You can ignore patch failures on that
 file if you generate it again by running the ./autogen.sh script. That
 ./autogen.sh script needs recent versions of autohell tools.
 
-diff -urN util-linux-ng-2.15.1/mount/Makefile.am util-linux-ng-2.15.1-AES/mount/Makefile.am
---- util-linux-ng-2.15.1/mount/Makefile.am	2009-06-10 14:25:20.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/Makefile.am	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/Makefile.am util-linux-ng-2.16.1-AES/mount/Makefile.am
+--- util-linux-ng-2.16.1/mount/Makefile.am	2009-07-04 02:20:07.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/Makefile.am	2009-10-10 18:02:39.000000000 +0300
 @@ -14,7 +14,7 @@
  	lomount.h getusername.h loop.h
  
@@ -46,21 +46,22 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.am util-linux-ng-2.15.1-AES/mount/
  losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
  
  mount_static_LDADD =
-diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/Makefile.in
---- util-linux-ng-2.15.1/mount/Makefile.in	2009-06-10 15:43:42.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/Makefile.in	2009-06-24 18:34:31.000000000 +0300
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
+diff -urN util-linux-ng-2.16.1/mount/Makefile.in util-linux-ng-2.16.1-AES/mount/Makefile.in
+--- util-linux-ng-2.16.1/mount/Makefile.in	2009-09-07 12:22:18.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/Makefile.in	2009-10-10 18:10:35.000000000 +0300
+@@ -1,9 +1,8 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+-# Inc.
 +# 2003, 2004, 2005  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,11 +15,15 @@
+@@ -16,12 +15,15 @@
  @SET_MAKE@
  
  
@@ -68,15 +69,28 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
+-pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
+-pkglibexecdir = $(libexecdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
 +top_builddir = ..
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -80,72 +84,79 @@
+@@ -69,77 +71,85 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-CONFIG_CLEAN_VPATH_FILES =
+ @HAVE_STATIC_MOUNT_TRUE at am__EXEEXT_1 = mount.static$(EXEEXT)
+ @HAVE_STATIC_UMOUNT_TRUE at am__EXEEXT_2 = umount.static$(EXEEXT)
+ @HAVE_STATIC_LOSETUP_TRUE at am__EXEEXT_3 = losetup.static$(EXEEXT)
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
+ 	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
  am__objects_1 = losetup-sundries.$(OBJEXT) losetup-xmalloc.$(OBJEXT) \
  	losetup-canonicalize.$(OBJEXT)
@@ -127,27 +141,20 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	mount-setproctitle.$(OBJEXT)
  mount_OBJECTS = $(am_mount_OBJECTS)
 -am__DEPENDENCIES_1 =
-- at BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE at am__DEPENDENCIES_2 =  \
-- at BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@	$(am__DEPENDENCIES_1)
-- at HAVE_VOLUME_ID_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
--am__DEPENDENCIES_4 = $(am__append_5) $(am__DEPENDENCIES_2) \
--	$(am__DEPENDENCIES_3)
-- at HAVE_SELINUX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
--mount_DEPENDENCIES = $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+- at BUILD_LIBBLKID_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+-am__DEPENDENCIES_3 = $(am__append_5) $(am__DEPENDENCIES_2)
+- at HAVE_SELINUX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+-mount_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4)
 -mount_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 -	--mode=link $(CCLD) $(mount_CFLAGS) $(CFLAGS) $(mount_LDFLAGS) \
 -	$(LDFLAGS) -o $@
-+am__DEPENDENCIES_1 = $(top_builddir)/libs/blkid/src/libblkid.la
-+ at BUILD_LIBBLKID_TRUE@@HAVE_BLKID_TRUE at am__DEPENDENCIES_2 =  \
-+ at BUILD_LIBBLKID_TRUE@@HAVE_BLKID_TRUE@	$(am__DEPENDENCIES_1)
++am__DEPENDENCIES_1 = $(top_builddir)/shlibs/blkid/src/libblkid.la
++ at BUILD_LIBBLKID_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 +am__DEPENDENCIES_3 =
-+ at BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE at am__DEPENDENCIES_4 =  \
-+ at BUILD_LIBBLKID_FALSE@@HAVE_BLKID_TRUE@	$(am__DEPENDENCIES_3)
-+ at HAVE_VOLUME_ID_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_3)
-+am__DEPENDENCIES_6 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
-+	$(am__DEPENDENCIES_5)
-+ at HAVE_SELINUX_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_3)
-+mount_DEPENDENCIES = $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7)
++ at BUILD_LIBBLKID_FALSE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
++am__DEPENDENCIES_5 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4)
++ at HAVE_SELINUX_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_3)
++mount_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6)
  am__mount_static_SOURCES_DIST = mount.c fstab.c mount_mntent.c \
 -	getusername.c lomount.c devname.c devname.h sundries.c \
 -	xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h fstab.h \
@@ -177,21 +184,20 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	mount_static-setproctitle.$(OBJEXT)
  @HAVE_STATIC_MOUNT_TRUE at am_mount_static_OBJECTS = $(am__objects_9)
  mount_static_OBJECTS = $(am_mount_static_OBJECTS)
--am__DEPENDENCIES_6 = $(am__append_6) $(am__DEPENDENCIES_2) \
--	$(am__DEPENDENCIES_3)
-- at HAVE_STATIC_MOUNT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
--mount_static_DEPENDENCIES = $(am__DEPENDENCIES_7) \
--	$(am__DEPENDENCIES_5)
+-am__DEPENDENCIES_5 = $(am__append_6) $(am__DEPENDENCIES_2)
+- at HAVE_STATIC_MOUNT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
+-mount_static_DEPENDENCIES = $(am__DEPENDENCIES_6) \
+-	$(am__DEPENDENCIES_4)
 -mount_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mount_static_CFLAGS) \
 -	$(CFLAGS) $(mount_static_LDFLAGS) $(LDFLAGS) -o $@
-+ at HAVE_STATIC_MOUNT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_6)
-+mount_static_DEPENDENCIES = $(am__DEPENDENCIES_8) \
-+	$(am__DEPENDENCIES_7)
++ at HAVE_STATIC_MOUNT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_5)
++mount_static_DEPENDENCIES = $(am__DEPENDENCIES_7) \
++	$(am__DEPENDENCIES_6)
  am__objects_10 = mtab_lock_test-sundries.$(OBJEXT) \
  	mtab_lock_test-xmalloc.$(OBJEXT) \
  	mtab_lock_test-canonicalize.$(OBJEXT)
-@@ -153,64 +164,56 @@
+@@ -147,65 +157,56 @@
  	$(am__objects_10) $(am__objects_5)
  mtab_lock_test_OBJECTS = $(am_mtab_lock_test_OBJECTS)
  mtab_lock_test_LDADD = $(LDADD)
@@ -203,11 +209,11 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +	swapon-blkdev.$(OBJEXT) swapon-fsprobe.$(OBJEXT) \
 +	swapon-canonicalize.$(OBJEXT)
  swapon_OBJECTS = $(am_swapon_OBJECTS)
--swapon_DEPENDENCIES = $(am__DEPENDENCIES_4)
+-swapon_DEPENDENCIES = $(am__DEPENDENCIES_3)
 -swapon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 -	--mode=link $(CCLD) $(swapon_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 -	$(LDFLAGS) -o $@
-+swapon_DEPENDENCIES = $(am__DEPENDENCIES_6)
++swapon_DEPENDENCIES = $(am__DEPENDENCIES_5)
  am__objects_11 = umount-sundries.$(OBJEXT) umount-xmalloc.$(OBJEXT) \
  	umount-canonicalize.$(OBJEXT)
  am__objects_12 = umount-fstab.$(OBJEXT) umount-mount_mntent.$(OBJEXT) \
@@ -223,11 +229,11 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +am_umount_OBJECTS = umount-umount.$(OBJEXT) $(am__objects_12) \
 +	umount-loumount.$(OBJEXT)
  umount_OBJECTS = $(am_umount_OBJECTS)
--umount_DEPENDENCIES = $(am__DEPENDENCIES_4)
+-umount_DEPENDENCIES = $(am__DEPENDENCIES_3)
 -umount_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 -	--mode=link $(CCLD) $(umount_CFLAGS) $(CFLAGS) \
 -	$(umount_LDFLAGS) $(LDFLAGS) -o $@
-+umount_DEPENDENCIES = $(am__DEPENDENCIES_6)
++umount_DEPENDENCIES = $(am__DEPENDENCIES_5)
  am__umount_static_SOURCES_DIST = umount.c fstab.c mount_mntent.c \
 -	getusername.c lomount.c devname.c devname.h sundries.c \
 -	xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h fstab.h \
@@ -254,7 +260,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  @HAVE_STATIC_UMOUNT_TRUE at am_umount_static_OBJECTS = $(am__objects_15)
  umount_static_OBJECTS = $(am_umount_static_OBJECTS)
  @HAVE_STATIC_UMOUNT_TRUE at umount_static_DEPENDENCIES =  \
- @HAVE_STATIC_UMOUNT_TRUE@	$(am__DEPENDENCIES_6)
+ @HAVE_STATIC_UMOUNT_TRUE@	$(am__DEPENDENCIES_5)
 -umount_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(umount_static_CFLAGS) \
 -	$(CFLAGS) $(umount_static_LDFLAGS) $(LDFLAGS) -o $@
@@ -262,6 +268,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
+-am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -279,7 +286,35 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  SOURCES = $(losetup_SOURCES) $(losetup_static_SOURCES) \
  	$(mount_SOURCES) $(mount_static_SOURCES) \
  	$(mtab_lock_test_SOURCES) $(swapon_SOURCES) $(umount_SOURCES) \
-@@ -228,8 +231,28 @@
+@@ -214,27 +215,6 @@
+ 	$(mount_SOURCES) $(am__mount_static_SOURCES_DIST) \
+ 	$(mtab_lock_test_SOURCES) $(swapon_SOURCES) $(umount_SOURCES) \
+ 	$(am__umount_static_SOURCES_DIST)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+-    *) f=$$p;; \
+-  esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+-  for p in $$list; do echo "$$p $$p"; done | \
+-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+-    if (++n[$$2] == $(am__install_max)) \
+-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+-    END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ man5dir = $(mandir)/man5
+ man8dir = $(mandir)/man8
+ NROFF = nroff
+@@ -244,8 +224,28 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -308,7 +343,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
-@@ -238,6 +261,46 @@
+@@ -254,6 +254,52 @@
  BLKID_CFLAGS = @BLKID_CFLAGS@
  BLKID_LIBS = @BLKID_LIBS@
  BLKID_LIBS_STATIC = @BLKID_LIBS_STATIC@
@@ -330,6 +365,8 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +BUILD_LAST_TRUE = @BUILD_LAST_TRUE@
 +BUILD_LIBBLKID_FALSE = @BUILD_LIBBLKID_FALSE@
 +BUILD_LIBBLKID_TRUE = @BUILD_LIBBLKID_TRUE@
++BUILD_LIBUUID_FALSE = @BUILD_LIBUUID_FALSE@
++BUILD_LIBUUID_TRUE = @BUILD_LIBUUID_TRUE@
 +BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@
 +BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@
 +BUILD_MESG_FALSE = @BUILD_MESG_FALSE@
@@ -348,6 +385,10 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +BUILD_RESET_TRUE = @BUILD_RESET_TRUE@
 +BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@
 +BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@
++BUILD_SWITCH_ROOT_FALSE = @BUILD_SWITCH_ROOT_FALSE@
++BUILD_SWITCH_ROOT_TRUE = @BUILD_SWITCH_ROOT_TRUE@
++BUILD_UUIDD_FALSE = @BUILD_UUIDD_FALSE@
++BUILD_UUIDD_TRUE = @BUILD_UUIDD_TRUE@
 +BUILD_WALL_FALSE = @BUILD_WALL_FALSE@
 +BUILD_WALL_TRUE = @BUILD_WALL_TRUE@
 +BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@
@@ -355,7 +396,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
  CFLAGS = @CFLAGS@
-@@ -256,7 +319,48 @@
+@@ -272,7 +318,46 @@
  FGREP = @FGREP@
  GMSGFMT = @GMSGFMT@
  GREP = @GREP@
@@ -400,15 +441,13 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +HAVE_UTIL_TRUE = @HAVE_UTIL_TRUE@
 +HAVE_UUID_FALSE = @HAVE_UUID_FALSE@
 +HAVE_UUID_TRUE = @HAVE_UUID_TRUE@
-+HAVE_VOLUME_ID_FALSE = @HAVE_VOLUME_ID_FALSE@
-+HAVE_VOLUME_ID_TRUE = @HAVE_VOLUME_ID_TRUE@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -270,17 +374,22 @@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
+@@ -289,17 +374,22 @@
  LIBTOOL = @LIBTOOL@
+ LIBUUID_VERSION = @LIBUUID_VERSION@
+ LIBUUID_VERSION_INFO = @LIBUUID_VERSION_INFO@
 +LINUX_FALSE = @LINUX_FALSE@
 +LINUX_TRUE = @LINUX_TRUE@
  LIPO = @LIPO@
@@ -429,7 +468,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  NM = @NM@
  NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
-@@ -307,18 +416,20 @@
+@@ -326,17 +416,19 @@
  SUID_CFLAGS = @SUID_CFLAGS@
  SUID_LDFLAGS = @SUID_LDFLAGS@
  USE_NLS = @USE_NLS@
@@ -437,11 +476,10 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +USE_SLANG_TRUE = @USE_SLANG_TRUE@
 +USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@
 +USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@
+ UUID_CFLAGS = @UUID_CFLAGS@
+ UUID_LIBS = @UUID_LIBS@
  VERSION = @VERSION@
  VOLID = @VOLID@
- VOLUME_ID_CFLAGS = @VOLUME_ID_CFLAGS@
- VOLUME_ID_LIBS = @VOLUME_ID_LIBS@
- VOLUME_ID_LIBS_STATIC = @VOLUME_ID_LIBS_STATIC@
  XGETTEXT = @XGETTEXT@
 -abs_builddir = @abs_builddir@
 -abs_srcdir = @abs_srcdir@
@@ -454,7 +492,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -330,7 +441,6 @@
+@@ -348,7 +440,6 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -462,7 +500,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -360,12 +470,8 @@
+@@ -378,12 +469,8 @@
  psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -472,10 +510,10 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 -top_build_prefix = @top_build_prefix@
 -top_builddir = @top_builddir@
 -top_srcdir = @top_srcdir@
- 
- # The original default vaues of bindir and sbindir:
- usrbinexecdir = ${exec_prefix}/bin
-@@ -400,7 +506,7 @@
+ usrbin_execdir = @usrbin_execdir@
+ usrlib_execdir = @usrlib_execdir@
+ usrsbin_execdir = @usrsbin_execdir@
+@@ -422,7 +509,7 @@
  
  
  # generic sources for mount and umount
@@ -484,7 +522,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	$(srcs_common) $(hdrs_mount) ../lib/env.c ../lib/linux_version.c \
  	../lib/blkdev.c ../lib/fsprobe.c
  
-@@ -414,20 +520,20 @@
+@@ -436,20 +523,20 @@
  
  # generic libtool options for all static programs
  ldflags_static = "-all-static"
@@ -492,7 +530,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +mount_SOURCES = mount.c $(srcs_mount) lomount.c loumount.c loop.c sha512.c rmd160.c aes.c ../lib/setproctitle.c
  mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common)
  mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
- mount_LDADD = $(ldadd_common) $(am__append_14)
+ mount_LDADD = $(ldadd_common) $(am__append_11)
 -umount_SOURCES = umount.c $(srcs_mount)
 +umount_SOURCES = umount.c $(srcs_mount) loumount.c
  umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common)
@@ -507,9 +545,9 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 -losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h
 +losetup_SOURCES = lomount.c loumount.c loop.c sha512.c rmd160.c aes.c $(srcs_common) loop.h lomount.h
  losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
- mount_static_LDADD = $(am__append_2) $(am__append_15)
+ mount_static_LDADD = $(am__append_2) $(am__append_12)
  @HAVE_STATIC_MOUNT_TRUE at mount_static_SOURCES = $(mount_SOURCES)
-@@ -450,8 +556,8 @@
+@@ -472,14 +559,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -520,46 +558,162 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	      exit 1;; \
  	  esac; \
  	done; \
-@@ -477,15 +583,15 @@
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mount/Makefile'; \
+-	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign mount/Makefile
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  mount/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  mount/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -497,126 +584,93 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(am__aclocal_m4_deps):
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 -	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+-	for p in $$list; do echo "$$p $$p"; done | \
+-	sed 's/$(EXEEXT)$$//' | \
+-	while read p p1; do if test -f $$p || test -f $$p1; \
+-	  then echo "$$p"; echo "$$p"; else :; fi; \
+-	done | \
+-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+-	sed 'N;N;N;s,\n, ,g' | \
+-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+-	    else { print "f", $$3 "/" $$4, $$1; } } \
+-	  END { for (d in files) print "f", d, files[d] }' | \
+-	while read type dir files; do \
+-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-	    test -z "$$files" || { \
+-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+-	    } \
+-	; done
 +	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
- 	     || test -f $$p1 \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 +	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
 +	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
-@@ -512,15 +618,15 @@
- 	done
++	  else :; fi; \
++	done
+ 
+ uninstall-binPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+-	files=`for p in $$list; do echo "$$p"; done | \
+-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+-	      -e 's/$$/$(EXEEXT)/' `; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	done
+ 
+ clean-binPROGRAMS:
+-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list || exit $$?; \
+-	test -n "$(EXEEXT)" || exit 0; \
+-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
+ 
+ clean-noinstPROGRAMS:
+-	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list || exit $$?; \
+-	test -n "$(EXEEXT)" || exit 0; \
+-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list
++	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
  install-sbinPROGRAMS: $(sbin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 -	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+-	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+-	for p in $$list; do echo "$$p $$p"; done | \
+-	sed 's/$(EXEEXT)$$//' | \
+-	while read p p1; do if test -f $$p || test -f $$p1; \
+-	  then echo "$$p"; echo "$$p"; else :; fi; \
+-	done | \
+-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+-	sed 'N;N;N;s,\n, ,g' | \
+-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+-	    else { print "f", $$3 "/" $$4, $$1; } } \
+-	  END { for (d in files) print "f", d, files[d] }' | \
+-	while read type dir files; do \
+-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-	    test -z "$$files" || { \
+-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+-	    } \
+-	; done
 +	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
- 	     || test -f $$p1 \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
++	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 +	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
 +	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
-@@ -540,28 +646,28 @@
- 	done
++	  else :; fi; \
++	done
+ 
+ uninstall-sbinPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
+-	files=`for p in $$list; do echo "$$p"; done | \
+-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+-	      -e 's/$$/$(EXEEXT)/' `; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
++	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
++	done
+ 
+ clean-sbinPROGRAMS:
+-	@list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list || exit $$?; \
+-	test -n "$(EXEEXT)" || exit 0; \
+-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+-	echo " rm -f" $$list; \
+-	rm -f $$list
++	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
  losetup$(EXEEXT): $(losetup_OBJECTS) $(losetup_DEPENDENCIES) 
  	@rm -f losetup$(EXEEXT)
 -	$(LINK) $(losetup_OBJECTS) $(losetup_LDADD) $(LIBS)
@@ -595,7 +749,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -569,14 +675,25 @@
+@@ -624,14 +678,25 @@
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -621,7 +775,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-blkdev.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-canonicalize.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-devname.Po at am__quote@
-@@ -586,11 +703,16 @@
+@@ -641,11 +706,16 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-getusername.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-linux_version.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount-lomount.Po at am__quote@
@@ -638,7 +792,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-blkdev.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-canonicalize.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-devname.Po at am__quote@
-@@ -600,9 +722,13 @@
+@@ -655,9 +725,13 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-getusername.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-linux_version.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-lomount.Po at am__quote@
@@ -652,7 +806,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-sundries.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mount_static-xmalloc.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mtab_lock_test-canonicalize.Po at am__quote@
-@@ -613,6 +739,8 @@
+@@ -668,6 +742,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/swapon-canonicalize.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/swapon-fsprobe.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/swapon-linux_version.Po at am__quote@
@@ -661,7 +815,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/swapon-swapon.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-blkdev.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-canonicalize.Po at am__quote@
-@@ -622,7 +750,7 @@
+@@ -677,7 +753,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-fstab.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-getusername.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-linux_version.Po at am__quote@
@@ -670,7 +824,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-mount_mntent.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-sundries.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount-umount.Po at am__quote@
-@@ -635,1035 +763,1347 @@
+@@ -690,1201 +766,1508 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount_static-fstab.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount_static-getusername.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umount_static-linux_version.Po at am__quote@
@@ -683,7 +837,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  .c.o:
 - at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -692,7 +846,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  .c.obj:
 - at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -701,7 +855,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  .c.lo:
 - at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@@ -710,7 +864,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-lomount.o: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.o -MD -MP -MF $(DEPDIR)/losetup-lomount.Tpo -c -o losetup-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-lomount.Tpo $(DEPDIR)/losetup-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-lomount.Tpo $(DEPDIR)/losetup-lomount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.o -MD -MP -MF "$(DEPDIR)/losetup-lomount.Tpo" -c -o losetup-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-lomount.Tpo" "$(DEPDIR)/losetup-lomount.Po"; else rm -f "$(DEPDIR)/losetup-lomount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='losetup-lomount.o' libtool=no @AMDEPBACKSLASH@
@@ -719,7 +873,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-lomount.obj: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.obj -MD -MP -MF $(DEPDIR)/losetup-lomount.Tpo -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-lomount.Tpo $(DEPDIR)/losetup-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-lomount.Tpo $(DEPDIR)/losetup-lomount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-lomount.obj -MD -MP -MF "$(DEPDIR)/losetup-lomount.Tpo" -c -o losetup-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-lomount.Tpo" "$(DEPDIR)/losetup-lomount.Po"; else rm -f "$(DEPDIR)/losetup-lomount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='losetup-lomount.obj' libtool=no @AMDEPBACKSLASH@
@@ -798,7 +952,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +
  losetup-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.o -MD -MP -MF $(DEPDIR)/losetup-sundries.Tpo -c -o losetup-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-sundries.Tpo $(DEPDIR)/losetup-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-sundries.Tpo $(DEPDIR)/losetup-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.o -MD -MP -MF "$(DEPDIR)/losetup-sundries.Tpo" -c -o losetup-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-sundries.Tpo" "$(DEPDIR)/losetup-sundries.Po"; else rm -f "$(DEPDIR)/losetup-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='losetup-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -807,7 +961,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.obj -MD -MP -MF $(DEPDIR)/losetup-sundries.Tpo -c -o losetup-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-sundries.Tpo $(DEPDIR)/losetup-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-sundries.Tpo $(DEPDIR)/losetup-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-sundries.obj -MD -MP -MF "$(DEPDIR)/losetup-sundries.Tpo" -c -o losetup-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-sundries.Tpo" "$(DEPDIR)/losetup-sundries.Po"; else rm -f "$(DEPDIR)/losetup-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='losetup-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -816,7 +970,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.o -MD -MP -MF $(DEPDIR)/losetup-xmalloc.Tpo -c -o losetup-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-xmalloc.Tpo $(DEPDIR)/losetup-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-xmalloc.Tpo $(DEPDIR)/losetup-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.o -MD -MP -MF "$(DEPDIR)/losetup-xmalloc.Tpo" -c -o losetup-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-xmalloc.Tpo" "$(DEPDIR)/losetup-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='losetup-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -825,7 +979,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.obj -MD -MP -MF $(DEPDIR)/losetup-xmalloc.Tpo -c -o losetup-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-xmalloc.Tpo $(DEPDIR)/losetup-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-xmalloc.Tpo $(DEPDIR)/losetup-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-xmalloc.obj -MD -MP -MF "$(DEPDIR)/losetup-xmalloc.Tpo" -c -o losetup-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-xmalloc.Tpo" "$(DEPDIR)/losetup-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='losetup-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -834,7 +988,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-canonicalize.o -MD -MP -MF $(DEPDIR)/losetup-canonicalize.Tpo -c -o losetup-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-canonicalize.Tpo $(DEPDIR)/losetup-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-canonicalize.Tpo $(DEPDIR)/losetup-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-canonicalize.o -MD -MP -MF "$(DEPDIR)/losetup-canonicalize.Tpo" -c -o losetup-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-canonicalize.Tpo" "$(DEPDIR)/losetup-canonicalize.Po"; else rm -f "$(DEPDIR)/losetup-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='losetup-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -843,7 +997,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-canonicalize.obj -MD -MP -MF $(DEPDIR)/losetup-canonicalize.Tpo -c -o losetup-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup-canonicalize.Tpo $(DEPDIR)/losetup-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup-canonicalize.Tpo $(DEPDIR)/losetup-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup-canonicalize.obj -MD -MP -MF "$(DEPDIR)/losetup-canonicalize.Tpo" -c -o losetup-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup-canonicalize.Tpo" "$(DEPDIR)/losetup-canonicalize.Po"; else rm -f "$(DEPDIR)/losetup-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='losetup-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -852,7 +1006,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-lomount.o: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.o -MD -MP -MF $(DEPDIR)/losetup_static-lomount.Tpo -c -o losetup_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-lomount.Tpo $(DEPDIR)/losetup_static-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-lomount.Tpo $(DEPDIR)/losetup_static-lomount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.o -MD -MP -MF "$(DEPDIR)/losetup_static-lomount.Tpo" -c -o losetup_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-lomount.Tpo" "$(DEPDIR)/losetup_static-lomount.Po"; else rm -f "$(DEPDIR)/losetup_static-lomount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='losetup_static-lomount.o' libtool=no @AMDEPBACKSLASH@
@@ -861,7 +1015,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-lomount.obj: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.obj -MD -MP -MF $(DEPDIR)/losetup_static-lomount.Tpo -c -o losetup_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-lomount.Tpo $(DEPDIR)/losetup_static-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-lomount.Tpo $(DEPDIR)/losetup_static-lomount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-lomount.obj -MD -MP -MF "$(DEPDIR)/losetup_static-lomount.Tpo" -c -o losetup_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-lomount.Tpo" "$(DEPDIR)/losetup_static-lomount.Po"; else rm -f "$(DEPDIR)/losetup_static-lomount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='losetup_static-lomount.obj' libtool=no @AMDEPBACKSLASH@
@@ -940,7 +1094,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +
  losetup_static-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.o -MD -MP -MF $(DEPDIR)/losetup_static-sundries.Tpo -c -o losetup_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-sundries.Tpo $(DEPDIR)/losetup_static-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-sundries.Tpo $(DEPDIR)/losetup_static-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.o -MD -MP -MF "$(DEPDIR)/losetup_static-sundries.Tpo" -c -o losetup_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-sundries.Tpo" "$(DEPDIR)/losetup_static-sundries.Po"; else rm -f "$(DEPDIR)/losetup_static-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='losetup_static-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -949,7 +1103,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.obj -MD -MP -MF $(DEPDIR)/losetup_static-sundries.Tpo -c -o losetup_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-sundries.Tpo $(DEPDIR)/losetup_static-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-sundries.Tpo $(DEPDIR)/losetup_static-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-sundries.obj -MD -MP -MF "$(DEPDIR)/losetup_static-sundries.Tpo" -c -o losetup_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-sundries.Tpo" "$(DEPDIR)/losetup_static-sundries.Po"; else rm -f "$(DEPDIR)/losetup_static-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='losetup_static-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -958,7 +1112,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.o -MD -MP -MF $(DEPDIR)/losetup_static-xmalloc.Tpo -c -o losetup_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-xmalloc.Tpo $(DEPDIR)/losetup_static-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-xmalloc.Tpo $(DEPDIR)/losetup_static-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.o -MD -MP -MF "$(DEPDIR)/losetup_static-xmalloc.Tpo" -c -o losetup_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-xmalloc.Tpo" "$(DEPDIR)/losetup_static-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup_static-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='losetup_static-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -967,7 +1121,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.obj -MD -MP -MF $(DEPDIR)/losetup_static-xmalloc.Tpo -c -o losetup_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-xmalloc.Tpo $(DEPDIR)/losetup_static-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-xmalloc.Tpo $(DEPDIR)/losetup_static-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-xmalloc.obj -MD -MP -MF "$(DEPDIR)/losetup_static-xmalloc.Tpo" -c -o losetup_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-xmalloc.Tpo" "$(DEPDIR)/losetup_static-xmalloc.Po"; else rm -f "$(DEPDIR)/losetup_static-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='losetup_static-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -976,7 +1130,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-canonicalize.o -MD -MP -MF $(DEPDIR)/losetup_static-canonicalize.Tpo -c -o losetup_static-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-canonicalize.Tpo $(DEPDIR)/losetup_static-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-canonicalize.Tpo $(DEPDIR)/losetup_static-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-canonicalize.o -MD -MP -MF "$(DEPDIR)/losetup_static-canonicalize.Tpo" -c -o losetup_static-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-canonicalize.Tpo" "$(DEPDIR)/losetup_static-canonicalize.Po"; else rm -f "$(DEPDIR)/losetup_static-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='losetup_static-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -985,7 +1139,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  losetup_static-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-canonicalize.obj -MD -MP -MF $(DEPDIR)/losetup_static-canonicalize.Tpo -c -o losetup_static-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/losetup_static-canonicalize.Tpo $(DEPDIR)/losetup_static-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/losetup_static-canonicalize.Tpo $(DEPDIR)/losetup_static-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(losetup_static_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT losetup_static-canonicalize.obj -MD -MP -MF "$(DEPDIR)/losetup_static-canonicalize.Tpo" -c -o losetup_static-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/losetup_static-canonicalize.Tpo" "$(DEPDIR)/losetup_static-canonicalize.Po"; else rm -f "$(DEPDIR)/losetup_static-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='losetup_static-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -994,7 +1148,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-mount.o: mount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.o -MD -MP -MF $(DEPDIR)/mount-mount.Tpo -c -o mount-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.o -MD -MP -MF "$(DEPDIR)/mount-mount.Tpo" -c -o mount-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-mount.Tpo" "$(DEPDIR)/mount-mount.Po"; else rm -f "$(DEPDIR)/mount-mount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount.c' object='mount-mount.o' libtool=no @AMDEPBACKSLASH@
@@ -1003,7 +1157,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-mount.obj: mount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.obj -MD -MP -MF $(DEPDIR)/mount-mount.Tpo -c -o mount-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-mount.Tpo $(DEPDIR)/mount-mount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount.obj -MD -MP -MF "$(DEPDIR)/mount-mount.Tpo" -c -o mount-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-mount.Tpo" "$(DEPDIR)/mount-mount.Po"; else rm -f "$(DEPDIR)/mount-mount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount.c' object='mount-mount.obj' libtool=no @AMDEPBACKSLASH@
@@ -1012,7 +1166,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-fstab.o: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.o -MD -MP -MF $(DEPDIR)/mount-fstab.Tpo -c -o mount-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-fstab.Tpo $(DEPDIR)/mount-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-fstab.Tpo $(DEPDIR)/mount-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.o -MD -MP -MF "$(DEPDIR)/mount-fstab.Tpo" -c -o mount-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-fstab.Tpo" "$(DEPDIR)/mount-fstab.Po"; else rm -f "$(DEPDIR)/mount-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='mount-fstab.o' libtool=no @AMDEPBACKSLASH@
@@ -1021,7 +1175,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-fstab.obj: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.obj -MD -MP -MF $(DEPDIR)/mount-fstab.Tpo -c -o mount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-fstab.Tpo $(DEPDIR)/mount-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-fstab.Tpo $(DEPDIR)/mount-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fstab.obj -MD -MP -MF "$(DEPDIR)/mount-fstab.Tpo" -c -o mount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-fstab.Tpo" "$(DEPDIR)/mount-fstab.Po"; else rm -f "$(DEPDIR)/mount-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='mount-fstab.obj' libtool=no @AMDEPBACKSLASH@
@@ -1030,7 +1184,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-mount_mntent.o: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.o -MD -MP -MF $(DEPDIR)/mount-mount_mntent.Tpo -c -o mount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-mount_mntent.Tpo $(DEPDIR)/mount-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-mount_mntent.Tpo $(DEPDIR)/mount-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.o -MD -MP -MF "$(DEPDIR)/mount-mount_mntent.Tpo" -c -o mount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-mount_mntent.Tpo" "$(DEPDIR)/mount-mount_mntent.Po"; else rm -f "$(DEPDIR)/mount-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='mount-mount_mntent.o' libtool=no @AMDEPBACKSLASH@
@@ -1039,7 +1193,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-mount_mntent.obj: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.obj -MD -MP -MF $(DEPDIR)/mount-mount_mntent.Tpo -c -o mount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-mount_mntent.Tpo $(DEPDIR)/mount-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-mount_mntent.Tpo $(DEPDIR)/mount-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-mount_mntent.obj -MD -MP -MF "$(DEPDIR)/mount-mount_mntent.Tpo" -c -o mount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-mount_mntent.Tpo" "$(DEPDIR)/mount-mount_mntent.Po"; else rm -f "$(DEPDIR)/mount-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='mount-mount_mntent.obj' libtool=no @AMDEPBACKSLASH@
@@ -1048,7 +1202,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-getusername.o: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.o -MD -MP -MF $(DEPDIR)/mount-getusername.Tpo -c -o mount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-getusername.Tpo $(DEPDIR)/mount-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-getusername.Tpo $(DEPDIR)/mount-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.o -MD -MP -MF "$(DEPDIR)/mount-getusername.Tpo" -c -o mount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-getusername.Tpo" "$(DEPDIR)/mount-getusername.Po"; else rm -f "$(DEPDIR)/mount-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='mount-getusername.o' libtool=no @AMDEPBACKSLASH@
@@ -1057,7 +1211,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-getusername.obj: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.obj -MD -MP -MF $(DEPDIR)/mount-getusername.Tpo -c -o mount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-getusername.Tpo $(DEPDIR)/mount-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-getusername.Tpo $(DEPDIR)/mount-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-getusername.obj -MD -MP -MF "$(DEPDIR)/mount-getusername.Tpo" -c -o mount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-getusername.Tpo" "$(DEPDIR)/mount-getusername.Po"; else rm -f "$(DEPDIR)/mount-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='mount-getusername.obj' libtool=no @AMDEPBACKSLASH@
@@ -1066,21 +1220,21 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
 -mount-lomount.o: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-lomount.o -MD -MP -MF $(DEPDIR)/mount-lomount.Tpo -c -o mount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-lomount.Tpo $(DEPDIR)/mount-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-lomount.Tpo $(DEPDIR)/mount-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='mount-lomount.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
 -
 -mount-lomount.obj: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-lomount.obj -MD -MP -MF $(DEPDIR)/mount-lomount.Tpo -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-lomount.Tpo $(DEPDIR)/mount-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-lomount.Tpo $(DEPDIR)/mount-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='mount-lomount.obj' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -c -o mount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
 -
  mount-devname.o: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-devname.o -MD -MP -MF $(DEPDIR)/mount-devname.Tpo -c -o mount-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-devname.Tpo $(DEPDIR)/mount-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-devname.Tpo $(DEPDIR)/mount-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-devname.o -MD -MP -MF "$(DEPDIR)/mount-devname.Tpo" -c -o mount-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-devname.Tpo" "$(DEPDIR)/mount-devname.Po"; else rm -f "$(DEPDIR)/mount-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='mount-devname.o' libtool=no @AMDEPBACKSLASH@
@@ -1089,7 +1243,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-devname.obj: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-devname.obj -MD -MP -MF $(DEPDIR)/mount-devname.Tpo -c -o mount-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-devname.Tpo $(DEPDIR)/mount-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-devname.Tpo $(DEPDIR)/mount-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-devname.obj -MD -MP -MF "$(DEPDIR)/mount-devname.Tpo" -c -o mount-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-devname.Tpo" "$(DEPDIR)/mount-devname.Po"; else rm -f "$(DEPDIR)/mount-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='mount-devname.obj' libtool=no @AMDEPBACKSLASH@
@@ -1098,7 +1252,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.o -MD -MP -MF $(DEPDIR)/mount-sundries.Tpo -c -o mount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.o -MD -MP -MF "$(DEPDIR)/mount-sundries.Tpo" -c -o mount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-sundries.Tpo" "$(DEPDIR)/mount-sundries.Po"; else rm -f "$(DEPDIR)/mount-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='mount-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -1107,7 +1261,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.obj -MD -MP -MF $(DEPDIR)/mount-sundries.Tpo -c -o mount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-sundries.Tpo $(DEPDIR)/mount-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-sundries.obj -MD -MP -MF "$(DEPDIR)/mount-sundries.Tpo" -c -o mount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-sundries.Tpo" "$(DEPDIR)/mount-sundries.Po"; else rm -f "$(DEPDIR)/mount-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='mount-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -1116,7 +1270,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.o -MD -MP -MF $(DEPDIR)/mount-xmalloc.Tpo -c -o mount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-xmalloc.Tpo $(DEPDIR)/mount-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-xmalloc.Tpo $(DEPDIR)/mount-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.o -MD -MP -MF "$(DEPDIR)/mount-xmalloc.Tpo" -c -o mount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-xmalloc.Tpo" "$(DEPDIR)/mount-xmalloc.Po"; else rm -f "$(DEPDIR)/mount-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='mount-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -1125,7 +1279,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.obj -MD -MP -MF $(DEPDIR)/mount-xmalloc.Tpo -c -o mount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-xmalloc.Tpo $(DEPDIR)/mount-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-xmalloc.Tpo $(DEPDIR)/mount-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-xmalloc.obj -MD -MP -MF "$(DEPDIR)/mount-xmalloc.Tpo" -c -o mount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-xmalloc.Tpo" "$(DEPDIR)/mount-xmalloc.Po"; else rm -f "$(DEPDIR)/mount-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='mount-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -1134,7 +1288,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-canonicalize.o -MD -MP -MF $(DEPDIR)/mount-canonicalize.Tpo -c -o mount-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-canonicalize.Tpo $(DEPDIR)/mount-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-canonicalize.Tpo $(DEPDIR)/mount-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-canonicalize.o -MD -MP -MF "$(DEPDIR)/mount-canonicalize.Tpo" -c -o mount-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-canonicalize.Tpo" "$(DEPDIR)/mount-canonicalize.Po"; else rm -f "$(DEPDIR)/mount-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='mount-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -1143,7 +1297,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-canonicalize.obj -MD -MP -MF $(DEPDIR)/mount-canonicalize.Tpo -c -o mount-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-canonicalize.Tpo $(DEPDIR)/mount-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-canonicalize.Tpo $(DEPDIR)/mount-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-canonicalize.obj -MD -MP -MF "$(DEPDIR)/mount-canonicalize.Tpo" -c -o mount-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-canonicalize.Tpo" "$(DEPDIR)/mount-canonicalize.Po"; else rm -f "$(DEPDIR)/mount-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='mount-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -1152,7 +1306,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-env.o: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.o -MD -MP -MF $(DEPDIR)/mount-env.Tpo -c -o mount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.o -MD -MP -MF "$(DEPDIR)/mount-env.Tpo" -c -o mount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-env.Tpo" "$(DEPDIR)/mount-env.Po"; else rm -f "$(DEPDIR)/mount-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='mount-env.o' libtool=no @AMDEPBACKSLASH@
@@ -1161,7 +1315,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-env.obj: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.obj -MD -MP -MF $(DEPDIR)/mount-env.Tpo -c -o mount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-env.Tpo $(DEPDIR)/mount-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-env.obj -MD -MP -MF "$(DEPDIR)/mount-env.Tpo" -c -o mount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-env.Tpo" "$(DEPDIR)/mount-env.Po"; else rm -f "$(DEPDIR)/mount-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='mount-env.obj' libtool=no @AMDEPBACKSLASH@
@@ -1170,7 +1324,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-linux_version.o: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.o -MD -MP -MF $(DEPDIR)/mount-linux_version.Tpo -c -o mount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-linux_version.Tpo $(DEPDIR)/mount-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-linux_version.Tpo $(DEPDIR)/mount-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.o -MD -MP -MF "$(DEPDIR)/mount-linux_version.Tpo" -c -o mount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-linux_version.Tpo" "$(DEPDIR)/mount-linux_version.Po"; else rm -f "$(DEPDIR)/mount-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='mount-linux_version.o' libtool=no @AMDEPBACKSLASH@
@@ -1179,7 +1333,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-linux_version.obj: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.obj -MD -MP -MF $(DEPDIR)/mount-linux_version.Tpo -c -o mount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-linux_version.Tpo $(DEPDIR)/mount-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-linux_version.Tpo $(DEPDIR)/mount-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-linux_version.obj -MD -MP -MF "$(DEPDIR)/mount-linux_version.Tpo" -c -o mount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-linux_version.Tpo" "$(DEPDIR)/mount-linux_version.Po"; else rm -f "$(DEPDIR)/mount-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='mount-linux_version.obj' libtool=no @AMDEPBACKSLASH@
@@ -1188,7 +1342,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-blkdev.o: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.o -MD -MP -MF $(DEPDIR)/mount-blkdev.Tpo -c -o mount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-blkdev.Tpo $(DEPDIR)/mount-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-blkdev.Tpo $(DEPDIR)/mount-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.o -MD -MP -MF "$(DEPDIR)/mount-blkdev.Tpo" -c -o mount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-blkdev.Tpo" "$(DEPDIR)/mount-blkdev.Po"; else rm -f "$(DEPDIR)/mount-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='mount-blkdev.o' libtool=no @AMDEPBACKSLASH@
@@ -1197,7 +1351,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-blkdev.obj: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.obj -MD -MP -MF $(DEPDIR)/mount-blkdev.Tpo -c -o mount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-blkdev.Tpo $(DEPDIR)/mount-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-blkdev.Tpo $(DEPDIR)/mount-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-blkdev.obj -MD -MP -MF "$(DEPDIR)/mount-blkdev.Tpo" -c -o mount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-blkdev.Tpo" "$(DEPDIR)/mount-blkdev.Po"; else rm -f "$(DEPDIR)/mount-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='mount-blkdev.obj' libtool=no @AMDEPBACKSLASH@
@@ -1206,7 +1360,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-fsprobe.o: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.o -MD -MP -MF $(DEPDIR)/mount-fsprobe.Tpo -c -o mount-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-fsprobe.Tpo $(DEPDIR)/mount-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-fsprobe.Tpo $(DEPDIR)/mount-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.o -MD -MP -MF "$(DEPDIR)/mount-fsprobe.Tpo" -c -o mount-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-fsprobe.Tpo" "$(DEPDIR)/mount-fsprobe.Po"; else rm -f "$(DEPDIR)/mount-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='mount-fsprobe.o' libtool=no @AMDEPBACKSLASH@
@@ -1215,7 +1369,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-fsprobe.obj: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.obj -MD -MP -MF $(DEPDIR)/mount-fsprobe.Tpo -c -o mount-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-fsprobe.Tpo $(DEPDIR)/mount-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-fsprobe.Tpo $(DEPDIR)/mount-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-fsprobe.obj -MD -MP -MF "$(DEPDIR)/mount-fsprobe.Tpo" -c -o mount-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-fsprobe.Tpo" "$(DEPDIR)/mount-fsprobe.Po"; else rm -f "$(DEPDIR)/mount-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='mount-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
@@ -1308,7 +1462,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +
  mount-setproctitle.o: ../lib/setproctitle.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.o -MD -MP -MF $(DEPDIR)/mount-setproctitle.Tpo -c -o mount-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-setproctitle.Tpo $(DEPDIR)/mount-setproctitle.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-setproctitle.Tpo $(DEPDIR)/mount-setproctitle.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.o -MD -MP -MF "$(DEPDIR)/mount-setproctitle.Tpo" -c -o mount-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-setproctitle.Tpo" "$(DEPDIR)/mount-setproctitle.Po"; else rm -f "$(DEPDIR)/mount-setproctitle.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/setproctitle.c' object='mount-setproctitle.o' libtool=no @AMDEPBACKSLASH@
@@ -1317,7 +1471,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount-setproctitle.obj: ../lib/setproctitle.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.obj -MD -MP -MF $(DEPDIR)/mount-setproctitle.Tpo -c -o mount-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount-setproctitle.Tpo $(DEPDIR)/mount-setproctitle.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount-setproctitle.Tpo $(DEPDIR)/mount-setproctitle.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_CFLAGS) $(CFLAGS) -MT mount-setproctitle.obj -MD -MP -MF "$(DEPDIR)/mount-setproctitle.Tpo" -c -o mount-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount-setproctitle.Tpo" "$(DEPDIR)/mount-setproctitle.Po"; else rm -f "$(DEPDIR)/mount-setproctitle.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/setproctitle.c' object='mount-setproctitle.obj' libtool=no @AMDEPBACKSLASH@
@@ -1326,7 +1480,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-mount.o: mount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount.o -MD -MP -MF $(DEPDIR)/mount_static-mount.Tpo -c -o mount_static-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-mount.Tpo $(DEPDIR)/mount_static-mount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-mount.Tpo $(DEPDIR)/mount_static-mount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount.o -MD -MP -MF "$(DEPDIR)/mount_static-mount.Tpo" -c -o mount_static-mount.o `test -f 'mount.c' || echo '$(srcdir)/'`mount.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-mount.Tpo" "$(DEPDIR)/mount_static-mount.Po"; else rm -f "$(DEPDIR)/mount_static-mount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount.c' object='mount_static-mount.o' libtool=no @AMDEPBACKSLASH@
@@ -1335,7 +1489,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-mount.obj: mount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount.obj -MD -MP -MF $(DEPDIR)/mount_static-mount.Tpo -c -o mount_static-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-mount.Tpo $(DEPDIR)/mount_static-mount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-mount.Tpo $(DEPDIR)/mount_static-mount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount.obj -MD -MP -MF "$(DEPDIR)/mount_static-mount.Tpo" -c -o mount_static-mount.obj `if test -f 'mount.c'; then $(CYGPATH_W) 'mount.c'; else $(CYGPATH_W) '$(srcdir)/mount.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-mount.Tpo" "$(DEPDIR)/mount_static-mount.Po"; else rm -f "$(DEPDIR)/mount_static-mount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount.c' object='mount_static-mount.obj' libtool=no @AMDEPBACKSLASH@
@@ -1344,7 +1498,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-fstab.o: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fstab.o -MD -MP -MF $(DEPDIR)/mount_static-fstab.Tpo -c -o mount_static-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-fstab.Tpo $(DEPDIR)/mount_static-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-fstab.Tpo $(DEPDIR)/mount_static-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fstab.o -MD -MP -MF "$(DEPDIR)/mount_static-fstab.Tpo" -c -o mount_static-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-fstab.Tpo" "$(DEPDIR)/mount_static-fstab.Po"; else rm -f "$(DEPDIR)/mount_static-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='mount_static-fstab.o' libtool=no @AMDEPBACKSLASH@
@@ -1353,7 +1507,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-fstab.obj: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fstab.obj -MD -MP -MF $(DEPDIR)/mount_static-fstab.Tpo -c -o mount_static-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-fstab.Tpo $(DEPDIR)/mount_static-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-fstab.Tpo $(DEPDIR)/mount_static-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fstab.obj -MD -MP -MF "$(DEPDIR)/mount_static-fstab.Tpo" -c -o mount_static-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-fstab.Tpo" "$(DEPDIR)/mount_static-fstab.Po"; else rm -f "$(DEPDIR)/mount_static-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='mount_static-fstab.obj' libtool=no @AMDEPBACKSLASH@
@@ -1362,7 +1516,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-mount_mntent.o: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount_mntent.o -MD -MP -MF $(DEPDIR)/mount_static-mount_mntent.Tpo -c -o mount_static-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-mount_mntent.Tpo $(DEPDIR)/mount_static-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-mount_mntent.Tpo $(DEPDIR)/mount_static-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount_mntent.o -MD -MP -MF "$(DEPDIR)/mount_static-mount_mntent.Tpo" -c -o mount_static-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-mount_mntent.Tpo" "$(DEPDIR)/mount_static-mount_mntent.Po"; else rm -f "$(DEPDIR)/mount_static-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='mount_static-mount_mntent.o' libtool=no @AMDEPBACKSLASH@
@@ -1371,7 +1525,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-mount_mntent.obj: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount_mntent.obj -MD -MP -MF $(DEPDIR)/mount_static-mount_mntent.Tpo -c -o mount_static-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-mount_mntent.Tpo $(DEPDIR)/mount_static-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-mount_mntent.Tpo $(DEPDIR)/mount_static-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-mount_mntent.obj -MD -MP -MF "$(DEPDIR)/mount_static-mount_mntent.Tpo" -c -o mount_static-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-mount_mntent.Tpo" "$(DEPDIR)/mount_static-mount_mntent.Po"; else rm -f "$(DEPDIR)/mount_static-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='mount_static-mount_mntent.obj' libtool=no @AMDEPBACKSLASH@
@@ -1380,7 +1534,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-getusername.o: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-getusername.o -MD -MP -MF $(DEPDIR)/mount_static-getusername.Tpo -c -o mount_static-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-getusername.Tpo $(DEPDIR)/mount_static-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-getusername.Tpo $(DEPDIR)/mount_static-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-getusername.o -MD -MP -MF "$(DEPDIR)/mount_static-getusername.Tpo" -c -o mount_static-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-getusername.Tpo" "$(DEPDIR)/mount_static-getusername.Po"; else rm -f "$(DEPDIR)/mount_static-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='mount_static-getusername.o' libtool=no @AMDEPBACKSLASH@
@@ -1389,7 +1543,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-getusername.obj: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-getusername.obj -MD -MP -MF $(DEPDIR)/mount_static-getusername.Tpo -c -o mount_static-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-getusername.Tpo $(DEPDIR)/mount_static-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-getusername.Tpo $(DEPDIR)/mount_static-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-getusername.obj -MD -MP -MF "$(DEPDIR)/mount_static-getusername.Tpo" -c -o mount_static-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-getusername.Tpo" "$(DEPDIR)/mount_static-getusername.Po"; else rm -f "$(DEPDIR)/mount_static-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='mount_static-getusername.obj' libtool=no @AMDEPBACKSLASH@
@@ -1398,21 +1552,21 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
 -mount_static-lomount.o: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-lomount.o -MD -MP -MF $(DEPDIR)/mount_static-lomount.Tpo -c -o mount_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-lomount.Tpo $(DEPDIR)/mount_static-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-lomount.Tpo $(DEPDIR)/mount_static-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='mount_static-lomount.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -c -o mount_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
 -
 -mount_static-lomount.obj: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-lomount.obj -MD -MP -MF $(DEPDIR)/mount_static-lomount.Tpo -c -o mount_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-lomount.Tpo $(DEPDIR)/mount_static-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-lomount.Tpo $(DEPDIR)/mount_static-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='mount_static-lomount.obj' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -c -o mount_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
 -
  mount_static-devname.o: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-devname.o -MD -MP -MF $(DEPDIR)/mount_static-devname.Tpo -c -o mount_static-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-devname.Tpo $(DEPDIR)/mount_static-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-devname.Tpo $(DEPDIR)/mount_static-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-devname.o -MD -MP -MF "$(DEPDIR)/mount_static-devname.Tpo" -c -o mount_static-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-devname.Tpo" "$(DEPDIR)/mount_static-devname.Po"; else rm -f "$(DEPDIR)/mount_static-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='mount_static-devname.o' libtool=no @AMDEPBACKSLASH@
@@ -1421,7 +1575,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-devname.obj: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-devname.obj -MD -MP -MF $(DEPDIR)/mount_static-devname.Tpo -c -o mount_static-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-devname.Tpo $(DEPDIR)/mount_static-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-devname.Tpo $(DEPDIR)/mount_static-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-devname.obj -MD -MP -MF "$(DEPDIR)/mount_static-devname.Tpo" -c -o mount_static-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-devname.Tpo" "$(DEPDIR)/mount_static-devname.Po"; else rm -f "$(DEPDIR)/mount_static-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='mount_static-devname.obj' libtool=no @AMDEPBACKSLASH@
@@ -1430,7 +1584,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-sundries.o -MD -MP -MF $(DEPDIR)/mount_static-sundries.Tpo -c -o mount_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-sundries.Tpo $(DEPDIR)/mount_static-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-sundries.Tpo $(DEPDIR)/mount_static-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-sundries.o -MD -MP -MF "$(DEPDIR)/mount_static-sundries.Tpo" -c -o mount_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-sundries.Tpo" "$(DEPDIR)/mount_static-sundries.Po"; else rm -f "$(DEPDIR)/mount_static-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='mount_static-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -1439,7 +1593,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-sundries.obj -MD -MP -MF $(DEPDIR)/mount_static-sundries.Tpo -c -o mount_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-sundries.Tpo $(DEPDIR)/mount_static-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-sundries.Tpo $(DEPDIR)/mount_static-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-sundries.obj -MD -MP -MF "$(DEPDIR)/mount_static-sundries.Tpo" -c -o mount_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-sundries.Tpo" "$(DEPDIR)/mount_static-sundries.Po"; else rm -f "$(DEPDIR)/mount_static-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='mount_static-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -1448,7 +1602,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-xmalloc.o -MD -MP -MF $(DEPDIR)/mount_static-xmalloc.Tpo -c -o mount_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-xmalloc.Tpo $(DEPDIR)/mount_static-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-xmalloc.Tpo $(DEPDIR)/mount_static-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-xmalloc.o -MD -MP -MF "$(DEPDIR)/mount_static-xmalloc.Tpo" -c -o mount_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-xmalloc.Tpo" "$(DEPDIR)/mount_static-xmalloc.Po"; else rm -f "$(DEPDIR)/mount_static-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='mount_static-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -1457,7 +1611,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-xmalloc.obj -MD -MP -MF $(DEPDIR)/mount_static-xmalloc.Tpo -c -o mount_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-xmalloc.Tpo $(DEPDIR)/mount_static-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-xmalloc.Tpo $(DEPDIR)/mount_static-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-xmalloc.obj -MD -MP -MF "$(DEPDIR)/mount_static-xmalloc.Tpo" -c -o mount_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-xmalloc.Tpo" "$(DEPDIR)/mount_static-xmalloc.Po"; else rm -f "$(DEPDIR)/mount_static-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='mount_static-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -1466,7 +1620,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-canonicalize.o -MD -MP -MF $(DEPDIR)/mount_static-canonicalize.Tpo -c -o mount_static-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-canonicalize.Tpo $(DEPDIR)/mount_static-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-canonicalize.Tpo $(DEPDIR)/mount_static-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-canonicalize.o -MD -MP -MF "$(DEPDIR)/mount_static-canonicalize.Tpo" -c -o mount_static-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-canonicalize.Tpo" "$(DEPDIR)/mount_static-canonicalize.Po"; else rm -f "$(DEPDIR)/mount_static-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='mount_static-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -1475,7 +1629,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-canonicalize.obj -MD -MP -MF $(DEPDIR)/mount_static-canonicalize.Tpo -c -o mount_static-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-canonicalize.Tpo $(DEPDIR)/mount_static-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-canonicalize.Tpo $(DEPDIR)/mount_static-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-canonicalize.obj -MD -MP -MF "$(DEPDIR)/mount_static-canonicalize.Tpo" -c -o mount_static-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-canonicalize.Tpo" "$(DEPDIR)/mount_static-canonicalize.Po"; else rm -f "$(DEPDIR)/mount_static-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='mount_static-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -1484,7 +1638,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-env.o: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-env.o -MD -MP -MF $(DEPDIR)/mount_static-env.Tpo -c -o mount_static-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-env.Tpo $(DEPDIR)/mount_static-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-env.Tpo $(DEPDIR)/mount_static-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-env.o -MD -MP -MF "$(DEPDIR)/mount_static-env.Tpo" -c -o mount_static-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-env.Tpo" "$(DEPDIR)/mount_static-env.Po"; else rm -f "$(DEPDIR)/mount_static-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='mount_static-env.o' libtool=no @AMDEPBACKSLASH@
@@ -1493,7 +1647,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-env.obj: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-env.obj -MD -MP -MF $(DEPDIR)/mount_static-env.Tpo -c -o mount_static-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-env.Tpo $(DEPDIR)/mount_static-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-env.Tpo $(DEPDIR)/mount_static-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-env.obj -MD -MP -MF "$(DEPDIR)/mount_static-env.Tpo" -c -o mount_static-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-env.Tpo" "$(DEPDIR)/mount_static-env.Po"; else rm -f "$(DEPDIR)/mount_static-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='mount_static-env.obj' libtool=no @AMDEPBACKSLASH@
@@ -1502,7 +1656,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-linux_version.o: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-linux_version.o -MD -MP -MF $(DEPDIR)/mount_static-linux_version.Tpo -c -o mount_static-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-linux_version.Tpo $(DEPDIR)/mount_static-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-linux_version.Tpo $(DEPDIR)/mount_static-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-linux_version.o -MD -MP -MF "$(DEPDIR)/mount_static-linux_version.Tpo" -c -o mount_static-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-linux_version.Tpo" "$(DEPDIR)/mount_static-linux_version.Po"; else rm -f "$(DEPDIR)/mount_static-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='mount_static-linux_version.o' libtool=no @AMDEPBACKSLASH@
@@ -1511,7 +1665,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-linux_version.obj: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-linux_version.obj -MD -MP -MF $(DEPDIR)/mount_static-linux_version.Tpo -c -o mount_static-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-linux_version.Tpo $(DEPDIR)/mount_static-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-linux_version.Tpo $(DEPDIR)/mount_static-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-linux_version.obj -MD -MP -MF "$(DEPDIR)/mount_static-linux_version.Tpo" -c -o mount_static-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-linux_version.Tpo" "$(DEPDIR)/mount_static-linux_version.Po"; else rm -f "$(DEPDIR)/mount_static-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='mount_static-linux_version.obj' libtool=no @AMDEPBACKSLASH@
@@ -1520,7 +1674,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-blkdev.o: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-blkdev.o -MD -MP -MF $(DEPDIR)/mount_static-blkdev.Tpo -c -o mount_static-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-blkdev.Tpo $(DEPDIR)/mount_static-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-blkdev.Tpo $(DEPDIR)/mount_static-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-blkdev.o -MD -MP -MF "$(DEPDIR)/mount_static-blkdev.Tpo" -c -o mount_static-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-blkdev.Tpo" "$(DEPDIR)/mount_static-blkdev.Po"; else rm -f "$(DEPDIR)/mount_static-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='mount_static-blkdev.o' libtool=no @AMDEPBACKSLASH@
@@ -1529,7 +1683,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-blkdev.obj: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-blkdev.obj -MD -MP -MF $(DEPDIR)/mount_static-blkdev.Tpo -c -o mount_static-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-blkdev.Tpo $(DEPDIR)/mount_static-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-blkdev.Tpo $(DEPDIR)/mount_static-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-blkdev.obj -MD -MP -MF "$(DEPDIR)/mount_static-blkdev.Tpo" -c -o mount_static-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-blkdev.Tpo" "$(DEPDIR)/mount_static-blkdev.Po"; else rm -f "$(DEPDIR)/mount_static-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='mount_static-blkdev.obj' libtool=no @AMDEPBACKSLASH@
@@ -1538,7 +1692,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-fsprobe.o: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fsprobe.o -MD -MP -MF $(DEPDIR)/mount_static-fsprobe.Tpo -c -o mount_static-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-fsprobe.Tpo $(DEPDIR)/mount_static-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-fsprobe.Tpo $(DEPDIR)/mount_static-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fsprobe.o -MD -MP -MF "$(DEPDIR)/mount_static-fsprobe.Tpo" -c -o mount_static-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-fsprobe.Tpo" "$(DEPDIR)/mount_static-fsprobe.Po"; else rm -f "$(DEPDIR)/mount_static-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='mount_static-fsprobe.o' libtool=no @AMDEPBACKSLASH@
@@ -1547,7 +1701,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-fsprobe.obj: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fsprobe.obj -MD -MP -MF $(DEPDIR)/mount_static-fsprobe.Tpo -c -o mount_static-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-fsprobe.Tpo $(DEPDIR)/mount_static-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-fsprobe.Tpo $(DEPDIR)/mount_static-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-fsprobe.obj -MD -MP -MF "$(DEPDIR)/mount_static-fsprobe.Tpo" -c -o mount_static-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-fsprobe.Tpo" "$(DEPDIR)/mount_static-fsprobe.Po"; else rm -f "$(DEPDIR)/mount_static-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='mount_static-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
@@ -1640,7 +1794,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +
  mount_static-setproctitle.o: ../lib/setproctitle.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-setproctitle.o -MD -MP -MF $(DEPDIR)/mount_static-setproctitle.Tpo -c -o mount_static-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-setproctitle.Tpo $(DEPDIR)/mount_static-setproctitle.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-setproctitle.Tpo $(DEPDIR)/mount_static-setproctitle.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-setproctitle.o -MD -MP -MF "$(DEPDIR)/mount_static-setproctitle.Tpo" -c -o mount_static-setproctitle.o `test -f '../lib/setproctitle.c' || echo '$(srcdir)/'`../lib/setproctitle.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-setproctitle.Tpo" "$(DEPDIR)/mount_static-setproctitle.Po"; else rm -f "$(DEPDIR)/mount_static-setproctitle.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/setproctitle.c' object='mount_static-setproctitle.o' libtool=no @AMDEPBACKSLASH@
@@ -1649,7 +1803,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mount_static-setproctitle.obj: ../lib/setproctitle.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-setproctitle.obj -MD -MP -MF $(DEPDIR)/mount_static-setproctitle.Tpo -c -o mount_static-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mount_static-setproctitle.Tpo $(DEPDIR)/mount_static-setproctitle.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mount_static-setproctitle.Tpo $(DEPDIR)/mount_static-setproctitle.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mount_static_CFLAGS) $(CFLAGS) -MT mount_static-setproctitle.obj -MD -MP -MF "$(DEPDIR)/mount_static-setproctitle.Tpo" -c -o mount_static-setproctitle.obj `if test -f '../lib/setproctitle.c'; then $(CYGPATH_W) '../lib/setproctitle.c'; else $(CYGPATH_W) '$(srcdir)/../lib/setproctitle.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mount_static-setproctitle.Tpo" "$(DEPDIR)/mount_static-setproctitle.Po"; else rm -f "$(DEPDIR)/mount_static-setproctitle.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/setproctitle.c' object='mount_static-setproctitle.obj' libtool=no @AMDEPBACKSLASH@
@@ -1658,7 +1812,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-fstab.o: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-fstab.Tpo -c -o mtab_lock_test-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-fstab.Tpo $(DEPDIR)/mtab_lock_test-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-fstab.Tpo $(DEPDIR)/mtab_lock_test-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-fstab.Tpo" -c -o mtab_lock_test-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo" "$(DEPDIR)/mtab_lock_test-fstab.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='mtab_lock_test-fstab.o' libtool=no @AMDEPBACKSLASH@
@@ -1667,7 +1821,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-fstab.obj: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-fstab.Tpo -c -o mtab_lock_test-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-fstab.Tpo $(DEPDIR)/mtab_lock_test-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-fstab.Tpo $(DEPDIR)/mtab_lock_test-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-fstab.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-fstab.Tpo" -c -o mtab_lock_test-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo" "$(DEPDIR)/mtab_lock_test-fstab.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='mtab_lock_test-fstab.obj' libtool=no @AMDEPBACKSLASH@
@@ -1676,7 +1830,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-sundries.Tpo -c -o mtab_lock_test-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-sundries.Tpo $(DEPDIR)/mtab_lock_test-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-sundries.Tpo $(DEPDIR)/mtab_lock_test-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-sundries.Tpo" -c -o mtab_lock_test-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo" "$(DEPDIR)/mtab_lock_test-sundries.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='mtab_lock_test-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -1685,7 +1839,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-sundries.Tpo -c -o mtab_lock_test-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-sundries.Tpo $(DEPDIR)/mtab_lock_test-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-sundries.Tpo $(DEPDIR)/mtab_lock_test-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-sundries.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-sundries.Tpo" -c -o mtab_lock_test-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo" "$(DEPDIR)/mtab_lock_test-sundries.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='mtab_lock_test-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -1694,7 +1848,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-xmalloc.Tpo -c -o mtab_lock_test-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-xmalloc.Tpo $(DEPDIR)/mtab_lock_test-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-xmalloc.Tpo $(DEPDIR)/mtab_lock_test-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" -c -o mtab_lock_test-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" "$(DEPDIR)/mtab_lock_test-xmalloc.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='mtab_lock_test-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -1703,7 +1857,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-xmalloc.Tpo -c -o mtab_lock_test-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-xmalloc.Tpo $(DEPDIR)/mtab_lock_test-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-xmalloc.Tpo $(DEPDIR)/mtab_lock_test-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-xmalloc.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" -c -o mtab_lock_test-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo" "$(DEPDIR)/mtab_lock_test-xmalloc.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='mtab_lock_test-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -1712,7 +1866,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-canonicalize.o -MD -MP -MF $(DEPDIR)/mtab_lock_test-canonicalize.Tpo -c -o mtab_lock_test-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-canonicalize.Tpo $(DEPDIR)/mtab_lock_test-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-canonicalize.Tpo $(DEPDIR)/mtab_lock_test-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-canonicalize.o -MD -MP -MF "$(DEPDIR)/mtab_lock_test-canonicalize.Tpo" -c -o mtab_lock_test-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-canonicalize.Tpo" "$(DEPDIR)/mtab_lock_test-canonicalize.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='mtab_lock_test-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -1721,7 +1875,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  mtab_lock_test-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-canonicalize.obj -MD -MP -MF $(DEPDIR)/mtab_lock_test-canonicalize.Tpo -c -o mtab_lock_test-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mtab_lock_test-canonicalize.Tpo $(DEPDIR)/mtab_lock_test-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mtab_lock_test-canonicalize.Tpo $(DEPDIR)/mtab_lock_test-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mtab_lock_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mtab_lock_test-canonicalize.obj -MD -MP -MF "$(DEPDIR)/mtab_lock_test-canonicalize.Tpo" -c -o mtab_lock_test-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mtab_lock_test-canonicalize.Tpo" "$(DEPDIR)/mtab_lock_test-canonicalize.Po"; else rm -f "$(DEPDIR)/mtab_lock_test-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='mtab_lock_test-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -1730,7 +1884,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-swapon.o: swapon.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-swapon.o -MD -MP -MF $(DEPDIR)/swapon-swapon.Tpo -c -o swapon-swapon.o `test -f 'swapon.c' || echo '$(srcdir)/'`swapon.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-swapon.Tpo $(DEPDIR)/swapon-swapon.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-swapon.Tpo $(DEPDIR)/swapon-swapon.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-swapon.o -MD -MP -MF "$(DEPDIR)/swapon-swapon.Tpo" -c -o swapon-swapon.o `test -f 'swapon.c' || echo '$(srcdir)/'`swapon.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-swapon.Tpo" "$(DEPDIR)/swapon-swapon.Po"; else rm -f "$(DEPDIR)/swapon-swapon.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='swapon.c' object='swapon-swapon.o' libtool=no @AMDEPBACKSLASH@
@@ -1739,7 +1893,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-swapon.obj: swapon.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-swapon.obj -MD -MP -MF $(DEPDIR)/swapon-swapon.Tpo -c -o swapon-swapon.obj `if test -f 'swapon.c'; then $(CYGPATH_W) 'swapon.c'; else $(CYGPATH_W) '$(srcdir)/swapon.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-swapon.Tpo $(DEPDIR)/swapon-swapon.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-swapon.Tpo $(DEPDIR)/swapon-swapon.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-swapon.obj -MD -MP -MF "$(DEPDIR)/swapon-swapon.Tpo" -c -o swapon-swapon.obj `if test -f 'swapon.c'; then $(CYGPATH_W) 'swapon.c'; else $(CYGPATH_W) '$(srcdir)/swapon.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-swapon.Tpo" "$(DEPDIR)/swapon-swapon.Po"; else rm -f "$(DEPDIR)/swapon-swapon.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='swapon.c' object='swapon-swapon.obj' libtool=no @AMDEPBACKSLASH@
@@ -1776,7 +1930,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +
  swapon-linux_version.o: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-linux_version.o -MD -MP -MF $(DEPDIR)/swapon-linux_version.Tpo -c -o swapon-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-linux_version.Tpo $(DEPDIR)/swapon-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-linux_version.Tpo $(DEPDIR)/swapon-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-linux_version.o -MD -MP -MF "$(DEPDIR)/swapon-linux_version.Tpo" -c -o swapon-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-linux_version.Tpo" "$(DEPDIR)/swapon-linux_version.Po"; else rm -f "$(DEPDIR)/swapon-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='swapon-linux_version.o' libtool=no @AMDEPBACKSLASH@
@@ -1785,7 +1939,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-linux_version.obj: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-linux_version.obj -MD -MP -MF $(DEPDIR)/swapon-linux_version.Tpo -c -o swapon-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-linux_version.Tpo $(DEPDIR)/swapon-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-linux_version.Tpo $(DEPDIR)/swapon-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-linux_version.obj -MD -MP -MF "$(DEPDIR)/swapon-linux_version.Tpo" -c -o swapon-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-linux_version.Tpo" "$(DEPDIR)/swapon-linux_version.Po"; else rm -f "$(DEPDIR)/swapon-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='swapon-linux_version.obj' libtool=no @AMDEPBACKSLASH@
@@ -1794,7 +1948,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-blkdev.o: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-blkdev.o -MD -MP -MF $(DEPDIR)/swapon-blkdev.Tpo -c -o swapon-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-blkdev.Tpo $(DEPDIR)/swapon-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-blkdev.Tpo $(DEPDIR)/swapon-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-blkdev.o -MD -MP -MF "$(DEPDIR)/swapon-blkdev.Tpo" -c -o swapon-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-blkdev.Tpo" "$(DEPDIR)/swapon-blkdev.Po"; else rm -f "$(DEPDIR)/swapon-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='swapon-blkdev.o' libtool=no @AMDEPBACKSLASH@
@@ -1803,7 +1957,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-blkdev.obj: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-blkdev.obj -MD -MP -MF $(DEPDIR)/swapon-blkdev.Tpo -c -o swapon-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-blkdev.Tpo $(DEPDIR)/swapon-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-blkdev.Tpo $(DEPDIR)/swapon-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-blkdev.obj -MD -MP -MF "$(DEPDIR)/swapon-blkdev.Tpo" -c -o swapon-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-blkdev.Tpo" "$(DEPDIR)/swapon-blkdev.Po"; else rm -f "$(DEPDIR)/swapon-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='swapon-blkdev.obj' libtool=no @AMDEPBACKSLASH@
@@ -1812,7 +1966,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-fsprobe.o: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-fsprobe.o -MD -MP -MF $(DEPDIR)/swapon-fsprobe.Tpo -c -o swapon-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-fsprobe.Tpo $(DEPDIR)/swapon-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-fsprobe.Tpo $(DEPDIR)/swapon-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-fsprobe.o -MD -MP -MF "$(DEPDIR)/swapon-fsprobe.Tpo" -c -o swapon-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-fsprobe.Tpo" "$(DEPDIR)/swapon-fsprobe.Po"; else rm -f "$(DEPDIR)/swapon-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='swapon-fsprobe.o' libtool=no @AMDEPBACKSLASH@
@@ -1821,7 +1975,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-fsprobe.obj: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-fsprobe.obj -MD -MP -MF $(DEPDIR)/swapon-fsprobe.Tpo -c -o swapon-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-fsprobe.Tpo $(DEPDIR)/swapon-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-fsprobe.Tpo $(DEPDIR)/swapon-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-fsprobe.obj -MD -MP -MF "$(DEPDIR)/swapon-fsprobe.Tpo" -c -o swapon-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-fsprobe.Tpo" "$(DEPDIR)/swapon-fsprobe.Po"; else rm -f "$(DEPDIR)/swapon-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='swapon-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
@@ -1830,7 +1984,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-canonicalize.o -MD -MP -MF $(DEPDIR)/swapon-canonicalize.Tpo -c -o swapon-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-canonicalize.Tpo $(DEPDIR)/swapon-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-canonicalize.Tpo $(DEPDIR)/swapon-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-canonicalize.o -MD -MP -MF "$(DEPDIR)/swapon-canonicalize.Tpo" -c -o swapon-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-canonicalize.Tpo" "$(DEPDIR)/swapon-canonicalize.Po"; else rm -f "$(DEPDIR)/swapon-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='swapon-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -1839,7 +1993,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  swapon-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-canonicalize.obj -MD -MP -MF $(DEPDIR)/swapon-canonicalize.Tpo -c -o swapon-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/swapon-canonicalize.Tpo $(DEPDIR)/swapon-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/swapon-canonicalize.Tpo $(DEPDIR)/swapon-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(swapon_CFLAGS) $(CFLAGS) -MT swapon-canonicalize.obj -MD -MP -MF "$(DEPDIR)/swapon-canonicalize.Tpo" -c -o swapon-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/swapon-canonicalize.Tpo" "$(DEPDIR)/swapon-canonicalize.Po"; else rm -f "$(DEPDIR)/swapon-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='swapon-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -1848,7 +2002,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-umount.o: umount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.o -MD -MP -MF $(DEPDIR)/umount-umount.Tpo -c -o umount-umount.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-umount.Tpo $(DEPDIR)/umount-umount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-umount.Tpo $(DEPDIR)/umount-umount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.o -MD -MP -MF "$(DEPDIR)/umount-umount.Tpo" -c -o umount-umount.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-umount.Tpo" "$(DEPDIR)/umount-umount.Po"; else rm -f "$(DEPDIR)/umount-umount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='umount.c' object='umount-umount.o' libtool=no @AMDEPBACKSLASH@
@@ -1857,7 +2011,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-umount.obj: umount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.obj -MD -MP -MF $(DEPDIR)/umount-umount.Tpo -c -o umount-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-umount.Tpo $(DEPDIR)/umount-umount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-umount.Tpo $(DEPDIR)/umount-umount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-umount.obj -MD -MP -MF "$(DEPDIR)/umount-umount.Tpo" -c -o umount-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-umount.Tpo" "$(DEPDIR)/umount-umount.Po"; else rm -f "$(DEPDIR)/umount-umount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='umount.c' object='umount-umount.obj' libtool=no @AMDEPBACKSLASH@
@@ -1866,7 +2020,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-fstab.o: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.o -MD -MP -MF $(DEPDIR)/umount-fstab.Tpo -c -o umount-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-fstab.Tpo $(DEPDIR)/umount-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-fstab.Tpo $(DEPDIR)/umount-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.o -MD -MP -MF "$(DEPDIR)/umount-fstab.Tpo" -c -o umount-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-fstab.Tpo" "$(DEPDIR)/umount-fstab.Po"; else rm -f "$(DEPDIR)/umount-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='umount-fstab.o' libtool=no @AMDEPBACKSLASH@
@@ -1875,7 +2029,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-fstab.obj: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.obj -MD -MP -MF $(DEPDIR)/umount-fstab.Tpo -c -o umount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-fstab.Tpo $(DEPDIR)/umount-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-fstab.Tpo $(DEPDIR)/umount-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fstab.obj -MD -MP -MF "$(DEPDIR)/umount-fstab.Tpo" -c -o umount-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-fstab.Tpo" "$(DEPDIR)/umount-fstab.Po"; else rm -f "$(DEPDIR)/umount-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='umount-fstab.obj' libtool=no @AMDEPBACKSLASH@
@@ -1884,7 +2038,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-mount_mntent.o: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.o -MD -MP -MF $(DEPDIR)/umount-mount_mntent.Tpo -c -o umount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-mount_mntent.Tpo $(DEPDIR)/umount-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-mount_mntent.Tpo $(DEPDIR)/umount-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.o -MD -MP -MF "$(DEPDIR)/umount-mount_mntent.Tpo" -c -o umount-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-mount_mntent.Tpo" "$(DEPDIR)/umount-mount_mntent.Po"; else rm -f "$(DEPDIR)/umount-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='umount-mount_mntent.o' libtool=no @AMDEPBACKSLASH@
@@ -1893,7 +2047,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-mount_mntent.obj: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.obj -MD -MP -MF $(DEPDIR)/umount-mount_mntent.Tpo -c -o umount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-mount_mntent.Tpo $(DEPDIR)/umount-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-mount_mntent.Tpo $(DEPDIR)/umount-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-mount_mntent.obj -MD -MP -MF "$(DEPDIR)/umount-mount_mntent.Tpo" -c -o umount-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-mount_mntent.Tpo" "$(DEPDIR)/umount-mount_mntent.Po"; else rm -f "$(DEPDIR)/umount-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='umount-mount_mntent.obj' libtool=no @AMDEPBACKSLASH@
@@ -1902,7 +2056,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-getusername.o: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.o -MD -MP -MF $(DEPDIR)/umount-getusername.Tpo -c -o umount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-getusername.Tpo $(DEPDIR)/umount-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-getusername.Tpo $(DEPDIR)/umount-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.o -MD -MP -MF "$(DEPDIR)/umount-getusername.Tpo" -c -o umount-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-getusername.Tpo" "$(DEPDIR)/umount-getusername.Po"; else rm -f "$(DEPDIR)/umount-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='umount-getusername.o' libtool=no @AMDEPBACKSLASH@
@@ -1911,7 +2065,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-getusername.obj: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.obj -MD -MP -MF $(DEPDIR)/umount-getusername.Tpo -c -o umount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-getusername.Tpo $(DEPDIR)/umount-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-getusername.Tpo $(DEPDIR)/umount-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-getusername.obj -MD -MP -MF "$(DEPDIR)/umount-getusername.Tpo" -c -o umount-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-getusername.Tpo" "$(DEPDIR)/umount-getusername.Po"; else rm -f "$(DEPDIR)/umount-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='umount-getusername.obj' libtool=no @AMDEPBACKSLASH@
@@ -1920,21 +2074,21 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
 -umount-lomount.o: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-lomount.o -MD -MP -MF $(DEPDIR)/umount-lomount.Tpo -c -o umount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-lomount.Tpo $(DEPDIR)/umount-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-lomount.Tpo $(DEPDIR)/umount-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='umount-lomount.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
 -
 -umount-lomount.obj: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-lomount.obj -MD -MP -MF $(DEPDIR)/umount-lomount.Tpo -c -o umount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-lomount.Tpo $(DEPDIR)/umount-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-lomount.Tpo $(DEPDIR)/umount-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='umount-lomount.obj' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -c -o umount-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
 -
  umount-devname.o: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-devname.o -MD -MP -MF $(DEPDIR)/umount-devname.Tpo -c -o umount-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-devname.Tpo $(DEPDIR)/umount-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-devname.Tpo $(DEPDIR)/umount-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-devname.o -MD -MP -MF "$(DEPDIR)/umount-devname.Tpo" -c -o umount-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-devname.Tpo" "$(DEPDIR)/umount-devname.Po"; else rm -f "$(DEPDIR)/umount-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='umount-devname.o' libtool=no @AMDEPBACKSLASH@
@@ -1943,7 +2097,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-devname.obj: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-devname.obj -MD -MP -MF $(DEPDIR)/umount-devname.Tpo -c -o umount-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-devname.Tpo $(DEPDIR)/umount-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-devname.Tpo $(DEPDIR)/umount-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-devname.obj -MD -MP -MF "$(DEPDIR)/umount-devname.Tpo" -c -o umount-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-devname.Tpo" "$(DEPDIR)/umount-devname.Po"; else rm -f "$(DEPDIR)/umount-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='umount-devname.obj' libtool=no @AMDEPBACKSLASH@
@@ -1952,7 +2106,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.o -MD -MP -MF $(DEPDIR)/umount-sundries.Tpo -c -o umount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.o -MD -MP -MF "$(DEPDIR)/umount-sundries.Tpo" -c -o umount-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-sundries.Tpo" "$(DEPDIR)/umount-sundries.Po"; else rm -f "$(DEPDIR)/umount-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='umount-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -1961,7 +2115,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.obj -MD -MP -MF $(DEPDIR)/umount-sundries.Tpo -c -o umount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-sundries.Tpo $(DEPDIR)/umount-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-sundries.obj -MD -MP -MF "$(DEPDIR)/umount-sundries.Tpo" -c -o umount-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-sundries.Tpo" "$(DEPDIR)/umount-sundries.Po"; else rm -f "$(DEPDIR)/umount-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='umount-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -1970,7 +2124,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.o -MD -MP -MF $(DEPDIR)/umount-xmalloc.Tpo -c -o umount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-xmalloc.Tpo $(DEPDIR)/umount-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-xmalloc.Tpo $(DEPDIR)/umount-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.o -MD -MP -MF "$(DEPDIR)/umount-xmalloc.Tpo" -c -o umount-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-xmalloc.Tpo" "$(DEPDIR)/umount-xmalloc.Po"; else rm -f "$(DEPDIR)/umount-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='umount-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -1979,7 +2133,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.obj -MD -MP -MF $(DEPDIR)/umount-xmalloc.Tpo -c -o umount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-xmalloc.Tpo $(DEPDIR)/umount-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-xmalloc.Tpo $(DEPDIR)/umount-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-xmalloc.obj -MD -MP -MF "$(DEPDIR)/umount-xmalloc.Tpo" -c -o umount-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-xmalloc.Tpo" "$(DEPDIR)/umount-xmalloc.Po"; else rm -f "$(DEPDIR)/umount-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='umount-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -1988,7 +2142,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-canonicalize.o -MD -MP -MF $(DEPDIR)/umount-canonicalize.Tpo -c -o umount-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-canonicalize.Tpo $(DEPDIR)/umount-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-canonicalize.Tpo $(DEPDIR)/umount-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-canonicalize.o -MD -MP -MF "$(DEPDIR)/umount-canonicalize.Tpo" -c -o umount-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-canonicalize.Tpo" "$(DEPDIR)/umount-canonicalize.Po"; else rm -f "$(DEPDIR)/umount-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='umount-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -1997,7 +2151,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-canonicalize.obj -MD -MP -MF $(DEPDIR)/umount-canonicalize.Tpo -c -o umount-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-canonicalize.Tpo $(DEPDIR)/umount-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-canonicalize.Tpo $(DEPDIR)/umount-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-canonicalize.obj -MD -MP -MF "$(DEPDIR)/umount-canonicalize.Tpo" -c -o umount-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-canonicalize.Tpo" "$(DEPDIR)/umount-canonicalize.Po"; else rm -f "$(DEPDIR)/umount-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='umount-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -2006,7 +2160,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-env.o: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.o -MD -MP -MF $(DEPDIR)/umount-env.Tpo -c -o umount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.o -MD -MP -MF "$(DEPDIR)/umount-env.Tpo" -c -o umount-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-env.Tpo" "$(DEPDIR)/umount-env.Po"; else rm -f "$(DEPDIR)/umount-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='umount-env.o' libtool=no @AMDEPBACKSLASH@
@@ -2015,7 +2169,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-env.obj: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.obj -MD -MP -MF $(DEPDIR)/umount-env.Tpo -c -o umount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-env.Tpo $(DEPDIR)/umount-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-env.obj -MD -MP -MF "$(DEPDIR)/umount-env.Tpo" -c -o umount-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-env.Tpo" "$(DEPDIR)/umount-env.Po"; else rm -f "$(DEPDIR)/umount-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='umount-env.obj' libtool=no @AMDEPBACKSLASH@
@@ -2024,7 +2178,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-linux_version.o: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.o -MD -MP -MF $(DEPDIR)/umount-linux_version.Tpo -c -o umount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-linux_version.Tpo $(DEPDIR)/umount-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-linux_version.Tpo $(DEPDIR)/umount-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.o -MD -MP -MF "$(DEPDIR)/umount-linux_version.Tpo" -c -o umount-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-linux_version.Tpo" "$(DEPDIR)/umount-linux_version.Po"; else rm -f "$(DEPDIR)/umount-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='umount-linux_version.o' libtool=no @AMDEPBACKSLASH@
@@ -2033,7 +2187,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-linux_version.obj: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.obj -MD -MP -MF $(DEPDIR)/umount-linux_version.Tpo -c -o umount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-linux_version.Tpo $(DEPDIR)/umount-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-linux_version.Tpo $(DEPDIR)/umount-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-linux_version.obj -MD -MP -MF "$(DEPDIR)/umount-linux_version.Tpo" -c -o umount-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-linux_version.Tpo" "$(DEPDIR)/umount-linux_version.Po"; else rm -f "$(DEPDIR)/umount-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='umount-linux_version.obj' libtool=no @AMDEPBACKSLASH@
@@ -2042,7 +2196,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-blkdev.o: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.o -MD -MP -MF $(DEPDIR)/umount-blkdev.Tpo -c -o umount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-blkdev.Tpo $(DEPDIR)/umount-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-blkdev.Tpo $(DEPDIR)/umount-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.o -MD -MP -MF "$(DEPDIR)/umount-blkdev.Tpo" -c -o umount-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-blkdev.Tpo" "$(DEPDIR)/umount-blkdev.Po"; else rm -f "$(DEPDIR)/umount-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='umount-blkdev.o' libtool=no @AMDEPBACKSLASH@
@@ -2051,7 +2205,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-blkdev.obj: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.obj -MD -MP -MF $(DEPDIR)/umount-blkdev.Tpo -c -o umount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-blkdev.Tpo $(DEPDIR)/umount-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-blkdev.Tpo $(DEPDIR)/umount-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-blkdev.obj -MD -MP -MF "$(DEPDIR)/umount-blkdev.Tpo" -c -o umount-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-blkdev.Tpo" "$(DEPDIR)/umount-blkdev.Po"; else rm -f "$(DEPDIR)/umount-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='umount-blkdev.obj' libtool=no @AMDEPBACKSLASH@
@@ -2060,7 +2214,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-fsprobe.o: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.o -MD -MP -MF $(DEPDIR)/umount-fsprobe.Tpo -c -o umount-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-fsprobe.Tpo $(DEPDIR)/umount-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-fsprobe.Tpo $(DEPDIR)/umount-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.o -MD -MP -MF "$(DEPDIR)/umount-fsprobe.Tpo" -c -o umount-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-fsprobe.Tpo" "$(DEPDIR)/umount-fsprobe.Po"; else rm -f "$(DEPDIR)/umount-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='umount-fsprobe.o' libtool=no @AMDEPBACKSLASH@
@@ -2069,7 +2223,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount-fsprobe.obj: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.obj -MD -MP -MF $(DEPDIR)/umount-fsprobe.Tpo -c -o umount-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount-fsprobe.Tpo $(DEPDIR)/umount-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount-fsprobe.Tpo $(DEPDIR)/umount-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_CFLAGS) $(CFLAGS) -MT umount-fsprobe.obj -MD -MP -MF "$(DEPDIR)/umount-fsprobe.Tpo" -c -o umount-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount-fsprobe.Tpo" "$(DEPDIR)/umount-fsprobe.Po"; else rm -f "$(DEPDIR)/umount-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='umount-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
@@ -2092,7 +2246,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +
  umount_static-umount.o: umount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-umount.o -MD -MP -MF $(DEPDIR)/umount_static-umount.Tpo -c -o umount_static-umount.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-umount.Tpo $(DEPDIR)/umount_static-umount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-umount.Tpo $(DEPDIR)/umount_static-umount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-umount.o -MD -MP -MF "$(DEPDIR)/umount_static-umount.Tpo" -c -o umount_static-umount.o `test -f 'umount.c' || echo '$(srcdir)/'`umount.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-umount.Tpo" "$(DEPDIR)/umount_static-umount.Po"; else rm -f "$(DEPDIR)/umount_static-umount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='umount.c' object='umount_static-umount.o' libtool=no @AMDEPBACKSLASH@
@@ -2101,7 +2255,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-umount.obj: umount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-umount.obj -MD -MP -MF $(DEPDIR)/umount_static-umount.Tpo -c -o umount_static-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-umount.Tpo $(DEPDIR)/umount_static-umount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-umount.Tpo $(DEPDIR)/umount_static-umount.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-umount.obj -MD -MP -MF "$(DEPDIR)/umount_static-umount.Tpo" -c -o umount_static-umount.obj `if test -f 'umount.c'; then $(CYGPATH_W) 'umount.c'; else $(CYGPATH_W) '$(srcdir)/umount.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-umount.Tpo" "$(DEPDIR)/umount_static-umount.Po"; else rm -f "$(DEPDIR)/umount_static-umount.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='umount.c' object='umount_static-umount.obj' libtool=no @AMDEPBACKSLASH@
@@ -2110,7 +2264,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-fstab.o: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fstab.o -MD -MP -MF $(DEPDIR)/umount_static-fstab.Tpo -c -o umount_static-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-fstab.Tpo $(DEPDIR)/umount_static-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-fstab.Tpo $(DEPDIR)/umount_static-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fstab.o -MD -MP -MF "$(DEPDIR)/umount_static-fstab.Tpo" -c -o umount_static-fstab.o `test -f 'fstab.c' || echo '$(srcdir)/'`fstab.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-fstab.Tpo" "$(DEPDIR)/umount_static-fstab.Po"; else rm -f "$(DEPDIR)/umount_static-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='umount_static-fstab.o' libtool=no @AMDEPBACKSLASH@
@@ -2119,7 +2273,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-fstab.obj: fstab.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fstab.obj -MD -MP -MF $(DEPDIR)/umount_static-fstab.Tpo -c -o umount_static-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-fstab.Tpo $(DEPDIR)/umount_static-fstab.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-fstab.Tpo $(DEPDIR)/umount_static-fstab.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fstab.obj -MD -MP -MF "$(DEPDIR)/umount_static-fstab.Tpo" -c -o umount_static-fstab.obj `if test -f 'fstab.c'; then $(CYGPATH_W) 'fstab.c'; else $(CYGPATH_W) '$(srcdir)/fstab.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-fstab.Tpo" "$(DEPDIR)/umount_static-fstab.Po"; else rm -f "$(DEPDIR)/umount_static-fstab.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fstab.c' object='umount_static-fstab.obj' libtool=no @AMDEPBACKSLASH@
@@ -2128,7 +2282,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-mount_mntent.o: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-mount_mntent.o -MD -MP -MF $(DEPDIR)/umount_static-mount_mntent.Tpo -c -o umount_static-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-mount_mntent.Tpo $(DEPDIR)/umount_static-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-mount_mntent.Tpo $(DEPDIR)/umount_static-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-mount_mntent.o -MD -MP -MF "$(DEPDIR)/umount_static-mount_mntent.Tpo" -c -o umount_static-mount_mntent.o `test -f 'mount_mntent.c' || echo '$(srcdir)/'`mount_mntent.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-mount_mntent.Tpo" "$(DEPDIR)/umount_static-mount_mntent.Po"; else rm -f "$(DEPDIR)/umount_static-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='umount_static-mount_mntent.o' libtool=no @AMDEPBACKSLASH@
@@ -2137,7 +2291,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-mount_mntent.obj: mount_mntent.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-mount_mntent.obj -MD -MP -MF $(DEPDIR)/umount_static-mount_mntent.Tpo -c -o umount_static-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-mount_mntent.Tpo $(DEPDIR)/umount_static-mount_mntent.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-mount_mntent.Tpo $(DEPDIR)/umount_static-mount_mntent.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-mount_mntent.obj -MD -MP -MF "$(DEPDIR)/umount_static-mount_mntent.Tpo" -c -o umount_static-mount_mntent.obj `if test -f 'mount_mntent.c'; then $(CYGPATH_W) 'mount_mntent.c'; else $(CYGPATH_W) '$(srcdir)/mount_mntent.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-mount_mntent.Tpo" "$(DEPDIR)/umount_static-mount_mntent.Po"; else rm -f "$(DEPDIR)/umount_static-mount_mntent.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mount_mntent.c' object='umount_static-mount_mntent.obj' libtool=no @AMDEPBACKSLASH@
@@ -2146,7 +2300,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-getusername.o: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-getusername.o -MD -MP -MF $(DEPDIR)/umount_static-getusername.Tpo -c -o umount_static-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-getusername.Tpo $(DEPDIR)/umount_static-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-getusername.Tpo $(DEPDIR)/umount_static-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-getusername.o -MD -MP -MF "$(DEPDIR)/umount_static-getusername.Tpo" -c -o umount_static-getusername.o `test -f 'getusername.c' || echo '$(srcdir)/'`getusername.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-getusername.Tpo" "$(DEPDIR)/umount_static-getusername.Po"; else rm -f "$(DEPDIR)/umount_static-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='umount_static-getusername.o' libtool=no @AMDEPBACKSLASH@
@@ -2155,7 +2309,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-getusername.obj: getusername.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-getusername.obj -MD -MP -MF $(DEPDIR)/umount_static-getusername.Tpo -c -o umount_static-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-getusername.Tpo $(DEPDIR)/umount_static-getusername.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-getusername.Tpo $(DEPDIR)/umount_static-getusername.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-getusername.obj -MD -MP -MF "$(DEPDIR)/umount_static-getusername.Tpo" -c -o umount_static-getusername.obj `if test -f 'getusername.c'; then $(CYGPATH_W) 'getusername.c'; else $(CYGPATH_W) '$(srcdir)/getusername.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-getusername.Tpo" "$(DEPDIR)/umount_static-getusername.Po"; else rm -f "$(DEPDIR)/umount_static-getusername.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getusername.c' object='umount_static-getusername.obj' libtool=no @AMDEPBACKSLASH@
@@ -2164,21 +2318,21 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
 -umount_static-lomount.o: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-lomount.o -MD -MP -MF $(DEPDIR)/umount_static-lomount.Tpo -c -o umount_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-lomount.Tpo $(DEPDIR)/umount_static-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-lomount.Tpo $(DEPDIR)/umount_static-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='umount_static-lomount.o' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -c -o umount_static-lomount.o `test -f 'lomount.c' || echo '$(srcdir)/'`lomount.c
 -
 -umount_static-lomount.obj: lomount.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-lomount.obj -MD -MP -MF $(DEPDIR)/umount_static-lomount.Tpo -c -o umount_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-lomount.Tpo $(DEPDIR)/umount_static-lomount.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-lomount.Tpo $(DEPDIR)/umount_static-lomount.Po
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lomount.c' object='umount_static-lomount.obj' libtool=no @AMDEPBACKSLASH@
 - at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 - at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -c -o umount_static-lomount.obj `if test -f 'lomount.c'; then $(CYGPATH_W) 'lomount.c'; else $(CYGPATH_W) '$(srcdir)/lomount.c'; fi`
 -
  umount_static-devname.o: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-devname.o -MD -MP -MF $(DEPDIR)/umount_static-devname.Tpo -c -o umount_static-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-devname.Tpo $(DEPDIR)/umount_static-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-devname.Tpo $(DEPDIR)/umount_static-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-devname.o -MD -MP -MF "$(DEPDIR)/umount_static-devname.Tpo" -c -o umount_static-devname.o `test -f 'devname.c' || echo '$(srcdir)/'`devname.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-devname.Tpo" "$(DEPDIR)/umount_static-devname.Po"; else rm -f "$(DEPDIR)/umount_static-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='umount_static-devname.o' libtool=no @AMDEPBACKSLASH@
@@ -2187,7 +2341,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-devname.obj: devname.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-devname.obj -MD -MP -MF $(DEPDIR)/umount_static-devname.Tpo -c -o umount_static-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-devname.Tpo $(DEPDIR)/umount_static-devname.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-devname.Tpo $(DEPDIR)/umount_static-devname.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-devname.obj -MD -MP -MF "$(DEPDIR)/umount_static-devname.Tpo" -c -o umount_static-devname.obj `if test -f 'devname.c'; then $(CYGPATH_W) 'devname.c'; else $(CYGPATH_W) '$(srcdir)/devname.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-devname.Tpo" "$(DEPDIR)/umount_static-devname.Po"; else rm -f "$(DEPDIR)/umount_static-devname.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='devname.c' object='umount_static-devname.obj' libtool=no @AMDEPBACKSLASH@
@@ -2196,7 +2350,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-sundries.o: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-sundries.o -MD -MP -MF $(DEPDIR)/umount_static-sundries.Tpo -c -o umount_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-sundries.Tpo $(DEPDIR)/umount_static-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-sundries.Tpo $(DEPDIR)/umount_static-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-sundries.o -MD -MP -MF "$(DEPDIR)/umount_static-sundries.Tpo" -c -o umount_static-sundries.o `test -f 'sundries.c' || echo '$(srcdir)/'`sundries.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-sundries.Tpo" "$(DEPDIR)/umount_static-sundries.Po"; else rm -f "$(DEPDIR)/umount_static-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='umount_static-sundries.o' libtool=no @AMDEPBACKSLASH@
@@ -2205,7 +2359,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-sundries.obj: sundries.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-sundries.obj -MD -MP -MF $(DEPDIR)/umount_static-sundries.Tpo -c -o umount_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-sundries.Tpo $(DEPDIR)/umount_static-sundries.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-sundries.Tpo $(DEPDIR)/umount_static-sundries.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-sundries.obj -MD -MP -MF "$(DEPDIR)/umount_static-sundries.Tpo" -c -o umount_static-sundries.obj `if test -f 'sundries.c'; then $(CYGPATH_W) 'sundries.c'; else $(CYGPATH_W) '$(srcdir)/sundries.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-sundries.Tpo" "$(DEPDIR)/umount_static-sundries.Po"; else rm -f "$(DEPDIR)/umount_static-sundries.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sundries.c' object='umount_static-sundries.obj' libtool=no @AMDEPBACKSLASH@
@@ -2214,7 +2368,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-xmalloc.o: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-xmalloc.o -MD -MP -MF $(DEPDIR)/umount_static-xmalloc.Tpo -c -o umount_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-xmalloc.Tpo $(DEPDIR)/umount_static-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-xmalloc.Tpo $(DEPDIR)/umount_static-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-xmalloc.o -MD -MP -MF "$(DEPDIR)/umount_static-xmalloc.Tpo" -c -o umount_static-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-xmalloc.Tpo" "$(DEPDIR)/umount_static-xmalloc.Po"; else rm -f "$(DEPDIR)/umount_static-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='umount_static-xmalloc.o' libtool=no @AMDEPBACKSLASH@
@@ -2223,7 +2377,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-xmalloc.obj: xmalloc.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-xmalloc.obj -MD -MP -MF $(DEPDIR)/umount_static-xmalloc.Tpo -c -o umount_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-xmalloc.Tpo $(DEPDIR)/umount_static-xmalloc.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-xmalloc.Tpo $(DEPDIR)/umount_static-xmalloc.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-xmalloc.obj -MD -MP -MF "$(DEPDIR)/umount_static-xmalloc.Tpo" -c -o umount_static-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-xmalloc.Tpo" "$(DEPDIR)/umount_static-xmalloc.Po"; else rm -f "$(DEPDIR)/umount_static-xmalloc.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmalloc.c' object='umount_static-xmalloc.obj' libtool=no @AMDEPBACKSLASH@
@@ -2232,7 +2386,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-canonicalize.o: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-canonicalize.o -MD -MP -MF $(DEPDIR)/umount_static-canonicalize.Tpo -c -o umount_static-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-canonicalize.Tpo $(DEPDIR)/umount_static-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-canonicalize.Tpo $(DEPDIR)/umount_static-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-canonicalize.o -MD -MP -MF "$(DEPDIR)/umount_static-canonicalize.Tpo" -c -o umount_static-canonicalize.o `test -f '../lib/canonicalize.c' || echo '$(srcdir)/'`../lib/canonicalize.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-canonicalize.Tpo" "$(DEPDIR)/umount_static-canonicalize.Po"; else rm -f "$(DEPDIR)/umount_static-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='umount_static-canonicalize.o' libtool=no @AMDEPBACKSLASH@
@@ -2241,7 +2395,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-canonicalize.obj: ../lib/canonicalize.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-canonicalize.obj -MD -MP -MF $(DEPDIR)/umount_static-canonicalize.Tpo -c -o umount_static-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-canonicalize.Tpo $(DEPDIR)/umount_static-canonicalize.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-canonicalize.Tpo $(DEPDIR)/umount_static-canonicalize.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-canonicalize.obj -MD -MP -MF "$(DEPDIR)/umount_static-canonicalize.Tpo" -c -o umount_static-canonicalize.obj `if test -f '../lib/canonicalize.c'; then $(CYGPATH_W) '../lib/canonicalize.c'; else $(CYGPATH_W) '$(srcdir)/../lib/canonicalize.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-canonicalize.Tpo" "$(DEPDIR)/umount_static-canonicalize.Po"; else rm -f "$(DEPDIR)/umount_static-canonicalize.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/canonicalize.c' object='umount_static-canonicalize.obj' libtool=no @AMDEPBACKSLASH@
@@ -2250,7 +2404,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-env.o: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-env.o -MD -MP -MF $(DEPDIR)/umount_static-env.Tpo -c -o umount_static-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-env.Tpo $(DEPDIR)/umount_static-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-env.Tpo $(DEPDIR)/umount_static-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-env.o -MD -MP -MF "$(DEPDIR)/umount_static-env.Tpo" -c -o umount_static-env.o `test -f '../lib/env.c' || echo '$(srcdir)/'`../lib/env.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-env.Tpo" "$(DEPDIR)/umount_static-env.Po"; else rm -f "$(DEPDIR)/umount_static-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='umount_static-env.o' libtool=no @AMDEPBACKSLASH@
@@ -2259,7 +2413,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-env.obj: ../lib/env.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-env.obj -MD -MP -MF $(DEPDIR)/umount_static-env.Tpo -c -o umount_static-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-env.Tpo $(DEPDIR)/umount_static-env.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-env.Tpo $(DEPDIR)/umount_static-env.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-env.obj -MD -MP -MF "$(DEPDIR)/umount_static-env.Tpo" -c -o umount_static-env.obj `if test -f '../lib/env.c'; then $(CYGPATH_W) '../lib/env.c'; else $(CYGPATH_W) '$(srcdir)/../lib/env.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-env.Tpo" "$(DEPDIR)/umount_static-env.Po"; else rm -f "$(DEPDIR)/umount_static-env.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/env.c' object='umount_static-env.obj' libtool=no @AMDEPBACKSLASH@
@@ -2268,7 +2422,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-linux_version.o: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-linux_version.o -MD -MP -MF $(DEPDIR)/umount_static-linux_version.Tpo -c -o umount_static-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-linux_version.Tpo $(DEPDIR)/umount_static-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-linux_version.Tpo $(DEPDIR)/umount_static-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-linux_version.o -MD -MP -MF "$(DEPDIR)/umount_static-linux_version.Tpo" -c -o umount_static-linux_version.o `test -f '../lib/linux_version.c' || echo '$(srcdir)/'`../lib/linux_version.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-linux_version.Tpo" "$(DEPDIR)/umount_static-linux_version.Po"; else rm -f "$(DEPDIR)/umount_static-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='umount_static-linux_version.o' libtool=no @AMDEPBACKSLASH@
@@ -2277,7 +2431,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-linux_version.obj: ../lib/linux_version.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-linux_version.obj -MD -MP -MF $(DEPDIR)/umount_static-linux_version.Tpo -c -o umount_static-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-linux_version.Tpo $(DEPDIR)/umount_static-linux_version.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-linux_version.Tpo $(DEPDIR)/umount_static-linux_version.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-linux_version.obj -MD -MP -MF "$(DEPDIR)/umount_static-linux_version.Tpo" -c -o umount_static-linux_version.obj `if test -f '../lib/linux_version.c'; then $(CYGPATH_W) '../lib/linux_version.c'; else $(CYGPATH_W) '$(srcdir)/../lib/linux_version.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-linux_version.Tpo" "$(DEPDIR)/umount_static-linux_version.Po"; else rm -f "$(DEPDIR)/umount_static-linux_version.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/linux_version.c' object='umount_static-linux_version.obj' libtool=no @AMDEPBACKSLASH@
@@ -2286,7 +2440,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-blkdev.o: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-blkdev.o -MD -MP -MF $(DEPDIR)/umount_static-blkdev.Tpo -c -o umount_static-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-blkdev.Tpo $(DEPDIR)/umount_static-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-blkdev.Tpo $(DEPDIR)/umount_static-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-blkdev.o -MD -MP -MF "$(DEPDIR)/umount_static-blkdev.Tpo" -c -o umount_static-blkdev.o `test -f '../lib/blkdev.c' || echo '$(srcdir)/'`../lib/blkdev.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-blkdev.Tpo" "$(DEPDIR)/umount_static-blkdev.Po"; else rm -f "$(DEPDIR)/umount_static-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='umount_static-blkdev.o' libtool=no @AMDEPBACKSLASH@
@@ -2295,7 +2449,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-blkdev.obj: ../lib/blkdev.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-blkdev.obj -MD -MP -MF $(DEPDIR)/umount_static-blkdev.Tpo -c -o umount_static-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-blkdev.Tpo $(DEPDIR)/umount_static-blkdev.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-blkdev.Tpo $(DEPDIR)/umount_static-blkdev.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-blkdev.obj -MD -MP -MF "$(DEPDIR)/umount_static-blkdev.Tpo" -c -o umount_static-blkdev.obj `if test -f '../lib/blkdev.c'; then $(CYGPATH_W) '../lib/blkdev.c'; else $(CYGPATH_W) '$(srcdir)/../lib/blkdev.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-blkdev.Tpo" "$(DEPDIR)/umount_static-blkdev.Po"; else rm -f "$(DEPDIR)/umount_static-blkdev.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/blkdev.c' object='umount_static-blkdev.obj' libtool=no @AMDEPBACKSLASH@
@@ -2304,7 +2458,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-fsprobe.o: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fsprobe.o -MD -MP -MF $(DEPDIR)/umount_static-fsprobe.Tpo -c -o umount_static-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-fsprobe.Tpo $(DEPDIR)/umount_static-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-fsprobe.Tpo $(DEPDIR)/umount_static-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fsprobe.o -MD -MP -MF "$(DEPDIR)/umount_static-fsprobe.Tpo" -c -o umount_static-fsprobe.o `test -f '../lib/fsprobe.c' || echo '$(srcdir)/'`../lib/fsprobe.c; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-fsprobe.Tpo" "$(DEPDIR)/umount_static-fsprobe.Po"; else rm -f "$(DEPDIR)/umount_static-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='umount_static-fsprobe.o' libtool=no @AMDEPBACKSLASH@
@@ -2313,7 +2467,7 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  umount_static-fsprobe.obj: ../lib/fsprobe.c
 - at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fsprobe.obj -MD -MP -MF $(DEPDIR)/umount_static-fsprobe.Tpo -c -o umount_static-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`
-- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/umount_static-fsprobe.Tpo $(DEPDIR)/umount_static-fsprobe.Po
+- at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/umount_static-fsprobe.Tpo $(DEPDIR)/umount_static-fsprobe.Po
 + at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(umount_static_CFLAGS) $(CFLAGS) -MT umount_static-fsprobe.obj -MD -MP -MF "$(DEPDIR)/umount_static-fsprobe.Tpo" -c -o umount_static-fsprobe.obj `if test -f '../lib/fsprobe.c'; then $(CYGPATH_W) '../lib/fsprobe.c'; else $(CYGPATH_W) '$(srcdir)/../lib/fsprobe.c'; fi`; \
 + at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/umount_static-fsprobe.Tpo" "$(DEPDIR)/umount_static-fsprobe.Po"; else rm -f "$(DEPDIR)/umount_static-fsprobe.Tpo"; exit 1; fi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../lib/fsprobe.c' object='umount_static-fsprobe.obj' libtool=no @AMDEPBACKSLASH@
@@ -2339,49 +2493,171 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  clean-libtool:
  	-rm -rf .libs _libs
+-install-man5: $(dist_man_MANS)
 +
 +distclean-libtool:
 +	-rm -f libtool
 +uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
++install-man5: $(man5_MANS) $(man_MANS)
  	@$(NORMAL_INSTALL)
 -	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+-	@list=''; test -n "$(man5dir)" || exit 0; \
+-	{ for i in $$list; do echo "$$i"; done; \
+-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+-	  sed -n '/\.5[a-z]*$$/p'; \
+-	} | while read p; do \
+-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; echo "$$p"; \
+-	done | \
+-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+-	sed 'N;N;s,\n, ,g' | { \
+-	list=; while read file base inst; do \
+-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+-	  fi; \
 +	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -1672,8 +2112,8 @@
- 	  esac; \
++	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
++	  case "$$i" in \
++	    *.5*) list="$$list $$i" ;; \
++	  esac; \
  	done; \
- 	for i in $$list; do \
--	  if test -f $$i; then file=$$i; \
--	  else file=$(srcdir)/$$i; fi; \
+-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+-	while read files; do \
+-	  test -z "$$files" || { \
+-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+-	done; }
+-
++	for i in $$list; do \
 +	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 +	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- 	  case "$$ext" in \
- 	    5*) ;; \
-@@ -1708,7 +2148,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    5*) ;; \
++	    *) ext='5' ;; \
++	  esac; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
++	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
++	done
+ uninstall-man5:
+ 	@$(NORMAL_UNINSTALL)
+-	@list=''; test -n "$(man5dir)" || exit 0; \
+-	files=`{ for i in $$list; do echo "$$i"; done; \
+-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+-	  sed -n '/\.5[a-z]*$$/p'; \
+-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+-	test -z "$$files" || { \
+-	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
+-	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+-install-man8: $(dist_man_MANS)
++	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
++	  case "$$i" in \
++	    *.5*) list="$$list $$i" ;; \
++	  esac; \
++	done; \
++	for i in $$list; do \
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    5*) ;; \
++	    *) ext='5' ;; \
++	  esac; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
++	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
++	done
++install-man8: $(man8_MANS) $(man_MANS)
  	@$(NORMAL_INSTALL)
 -	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+-	@list=''; test -n "$(man8dir)" || exit 0; \
+-	{ for i in $$list; do echo "$$i"; done; \
+-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+-	  sed -n '/\.8[a-z]*$$/p'; \
+-	} | while read p; do \
+-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; echo "$$p"; \
+-	done | \
+-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+-	sed 'N;N;s,\n, ,g' | { \
+-	list=; while read file base inst; do \
+-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+-	  fi; \
 +	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -1717,8 +2157,8 @@
- 	  esac; \
++	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
++	  case "$$i" in \
++	    *.8*) list="$$list $$i" ;; \
++	  esac; \
  	done; \
- 	for i in $$list; do \
--	  if test -f $$i; then file=$$i; \
--	  else file=$(srcdir)/$$i; fi; \
+-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+-	while read files; do \
+-	  test -z "$$files" || { \
+-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
+-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+-	done; }
+-
++	for i in $$list; do \
 +	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
 +	  else file=$$i; fi; \
- 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- 	  case "$$ext" in \
- 	    8*) ;; \
-@@ -1757,8 +2197,8 @@
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    8*) ;; \
++	    *) ext='8' ;; \
++	  esac; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+-	@list=''; test -n "$(man8dir)" || exit 0; \
+-	files=`{ for i in $$list; do echo "$$i"; done; \
+-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+-	  sed -n '/\.8[a-z]*$$/p'; \
+-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
+-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+-	test -z "$$files" || { \
+-	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
+-	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
++	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
++	  case "$$i" in \
++	    *.8*) list="$$list $$i" ;; \
++	  esac; \
++	done; \
++	for i in $$list; do \
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    8*) ;; \
++	    *) ext='8' ;; \
++	  esac; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
++	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	done
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -2392,21 +2668,37 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	mkid -fID $$unique
  tags: TAGS
  
-@@ -1770,8 +2210,8 @@
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+-	set x; \
++	tags=; \
+ 	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
 -	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 -	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+-	shift; \
+-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +	  $(AWK) '    { files[$$0] = 1; } \
 +	       END { for (i in files) print i; }'`; \
- 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
- 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -1781,12 +2221,13 @@
+-	  if test $$# -gt 0; then \
+-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	      "$$@" $$unique; \
+-	  else \
+-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+-	      $$unique; \
+-	  fi; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
+ 	fi
+ ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
- 	tags=; \
++	tags=; \
 +	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
@@ -2414,15 +2706,38 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	  done | \
 -	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 -	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+-	test -z "$(CTAGS_ARGS)$$unique" \
 +	  $(AWK) '    { files[$$0] = 1; } \
 +	       END { for (i in files) print i; }'`; \
- 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- 	     $$tags $$unique
-@@ -1800,21 +2241,23 @@
+-	     $$unique
++	     $$tags $$unique
+ 
+ GTAGS:
+ 	here=`$(am__cd) $(top_builddir) && pwd` \
+-	  && $(am__cd) $(top_srcdir) \
+-	  && gtags -i $(GTAGS_ARGS) "$$here"
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
+-	@list='$(MANS)'; if test -n "$$list"; then \
+-	  list=`for p in $$list; do \
+-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+-	  if test -n "$$list" && \
+-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+-	    exit 1; \
+-	  else :; fi; \
+-	else :; fi
 -	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 -	list='$(DISTFILES)'; \
@@ -2453,10 +2768,25 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
 +	  fi; \
  	  if test -d $$d/$$file; then \
 -	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	    if test -d "$(distdir)/$$file"; then \
+-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+-	    fi; \
  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  	    fi; \
-@@ -1830,7 +2273,7 @@
+-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+-	    test -f "$(distdir)/$$file" \
+-	    || cp -p $$d/$$file "$(distdir)/$$file" \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+@@ -1893,7 +2276,7 @@
  all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
  installdirs:
  	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
@@ -2465,7 +2795,15 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -1865,7 +2308,7 @@
+@@ -1915,7 +2298,6 @@
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -1929,7 +2311,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -2474,30 +2812,47 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  dvi: dvi-am
  
-@@ -1879,22 +2322,14 @@
+@@ -1937,39 +2319,20 @@
+ 
+ html: html-am
+ 
+-html-am:
+-
+ info: info-am
+ 
+ info-am:
  
  install-data-am: install-man
  
 -install-dvi: install-dvi-am
 -
+-install-dvi-am:
+-
  install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
 -install-html: install-html-am
 -
+-install-html-am:
+ 
  install-info: install-info-am
  
+-install-info-am:
+-
  install-man: install-man5 install-man8
  
 -install-pdf: install-pdf-am
 -
+-install-pdf-am:
+-
 -install-ps: install-ps-am
 -
+-install-ps-am:
+-
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1915,29 +2350,25 @@
+@@ -1990,29 +2353,25 @@
  
  ps-am:
  
@@ -2533,9 +2888,17 @@ diff -urN util-linux-ng-2.15.1/mount/Makefile.in util-linux-ng-2.15.1-AES/mount/
  
  
  $(ul_libblkid_la):
-diff -urN util-linux-ng-2.15.1/mount/aes.c util-linux-ng-2.15.1-AES/mount/aes.c
---- util-linux-ng-2.15.1/mount/aes.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/aes.c	2009-06-24 18:34:30.000000000 +0300
+@@ -2025,7 +2384,6 @@
+ 	chmod 4755 $(DESTDIR)$(bindir)/mount
+ 	chmod 4755 $(DESTDIR)$(bindir)/umount
+ 	cd $(DESTDIR)$(sbindir) && ln -sf swapon swapoff
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -urN util-linux-ng-2.16.1/mount/aes.c util-linux-ng-2.16.1-AES/mount/aes.c
+--- util-linux-ng-2.16.1/mount/aes.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/aes.c	2009-10-10 18:02:39.000000000 +0300
 @@ -0,0 +1,299 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -2836,9 +3199,9 @@ diff -urN util-linux-ng-2.15.1/mount/aes.c util-linux-ng-2.15.1-AES/mount/aes.c
 +
 +    state_out(out_blk, b0);
 +}
-diff -urN util-linux-ng-2.15.1/mount/aes.h util-linux-ng-2.15.1-AES/mount/aes.h
---- util-linux-ng-2.15.1/mount/aes.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/aes.h	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/aes.h util-linux-ng-2.16.1-AES/mount/aes.h
+--- util-linux-ng-2.16.1/mount/aes.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/aes.h	2009-10-10 18:02:39.000000000 +0300
 @@ -0,0 +1,97 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -2937,9 +3300,9 @@ diff -urN util-linux-ng-2.15.1/mount/aes.h util-linux-ng-2.15.1-AES/mount/aes.h
 +// if their parameters have not changed.
 +
 +#endif  // _AES_H
-diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lomount.c
---- util-linux-ng-2.15.1/mount/lomount.c	2009-06-10 14:25:20.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/lomount.c	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/lomount.c util-linux-ng-2.16.1-AES/mount/lomount.c
+--- util-linux-ng-2.16.1/mount/lomount.c	2009-07-04 02:20:07.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/lomount.c	2009-10-10 18:02:39.000000000 +0300
 @@ -1,7 +1,22 @@
 -/* Originally from Ted's losetup.c */
 +/* Taken from Ted's losetup.c - Mitch <m.dsouza at mrc-apu.cam.ac.uk> */
@@ -2964,7 +3327,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
  #include <stdio.h>
  #include <string.h>
  #include <ctype.h>
-@@ -9,1063 +24,1339 @@
+@@ -9,1087 +24,1339 @@
  #include <errno.h>
  #include <stdlib.h>
  #include <unistd.h>
@@ -2999,12 +3362,17 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -#define SIZE(a) (sizeof(a)/sizeof(a[0]))
 -
 -#ifdef LOOP_SET_FD
--
--static int is_associated(int dev, struct stat *file, unsigned long long offset, int isoff);
 +#if !defined(BLKGETSIZE64)
 +# define BLKGETSIZE64 _IOR(0x12,114,size_t)
 +#endif
  
+-static int is_associated(int dev, struct stat *file, unsigned long long offset, int isoff);
++extern int verbose;
++extern char *xstrdup (const char *s);	/* not: #include "sundries.h" */
++extern void show_all_loops(void);
++extern int read_options_from_fstab(char *, char **);
++extern int recompute_loop_dev_size(char *);
+ 
 -static int
 -loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info)
 -{
@@ -3035,8 +3403,6 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -        return 0;
 -}
 -
--#define DEV_LOOP_PATH		"/dev/loop"
--#define DEV_PATH		"/dev"
 -#define LOOPMAJOR		7
 -#define NLOOPS_DEFAULT		8	/* /dev/loop[0-7] */
 -
@@ -3058,12 +3424,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -#define LLFLG_PROCFS	(1 << 4)	/* try to found used devices in /proc/partitions */
 -#define LLFLG_SUBDIR	(1 << 5)	/* /dev/loop/N */
 -#define LLFLG_DFLT	(1 << 6)	/* directly try to check default loops */
-+extern int verbose;
-+extern char *xstrdup (const char *s);	/* not: #include "sundries.h" */
-+extern void show_all_loops(void);
-+extern int read_options_from_fstab(char *, char **);
-+extern int recompute_loop_dev_size(char *);
- 
+-
 -int
 -is_loop_device (const char *device) {
 -	struct stat st;
@@ -3216,7 +3577,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -	ll->ncur = -1;
 +#define SIZE(a) (sizeof(a)/sizeof(a[0]))
  
--	if (stat(DEV_PATH, &st) == -1 || (!S_ISDIR(st.st_mode)))
+-	if (stat(_PATH_DEV, &st) == -1 || (!S_ISDIR(st.st_mode)))
 -		return -1;			/* /dev doesn't exist */
 +char *
 +find_unused_loop_device (void) {
@@ -3228,7 +3589,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 +	int i, j, fd, somedev = 0, someloop = 0;
 +	struct stat statbuf;
  
--	if (stat(DEV_LOOP_PATH, &st) == 0 && S_ISDIR(st.st_mode))
+-	if (stat(_PATH_DEV_LOOP, &st) == 0 && S_ISDIR(st.st_mode))
 -		ll->flag |= LLFLG_SUBDIR;	/* /dev/loop/ exists */
 +	for (j = 0; j < SIZE(loop_formats); j++) {
 +	    for(i = 0; i < 256; i++) {
@@ -3274,7 +3635,9 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
  
 -static void
 -looplist_close(struct looplist *ll)
--{
++#if !defined(MAIN)
++int is_loop_active(const char *dev, const char *backdev)
+ {
 -	free(ll->minors);
 -	if (ll->proc)
 -		fclose(ll->proc);
@@ -3286,9 +3649,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -
 -static int
 -looplist_open_dev(struct looplist *ll, int lnum)
-+#if !defined(MAIN)
-+int is_loop_active(const char *dev, const char *backdev)
- {
+-{
 -	struct stat st;
 -	int used;
  	int fd;
@@ -3296,8 +3657,8 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -	/* create a full device path */
 -	snprintf(ll->name, sizeof(ll->name),
 -		ll->flag & LLFLG_SUBDIR ?
--			DEV_LOOP_PATH "/%d" :
--			DEV_PATH "/loop%d",
+-			_PATH_DEV_LOOP "/%d" :
+-			_PATH_DEV "loop%d",
 -		lnum);
 -
 -	fd = open(ll->name, O_RDONLY);
@@ -3541,12 +3902,12 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
  		}
 -		goto done;
 +		h = p->pw_dir;
-+	}
+ 	}
 +	if(!(e[0] = malloc(strlen(h) + 6))) {
 +		nomem1:
 +		fprintf(stderr, _("Error: Unable to allocate memory\n"));
 +		return NULL;
- 	}
++	}
 +	sprintf(e[0], "HOME=%s", h);
 +	e[1] = 0;
  
@@ -3607,8 +3968,8 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
  	 */
 -	if (!ll->minors) {
 -		ll->nminors = (ll->flag & LLFLG_SUBDIR) ?
--			loop_scandir(DEV_LOOP_PATH, &ll->minors, 0) :
--			loop_scandir(DEV_PATH, &ll->minors, 1);
+-			loop_scandir(_PATH_DEV_LOOP, &ll->minors, 0) :
+-			loop_scandir(_PATH_DEV, &ll->minors, 1);
 -		ll->ncur = -1;
 -	}
 -	for (++ll->ncur; ll->ncur < ll->nminors; ll->ncur++) {
@@ -3737,6 +4098,29 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -#ifdef MAIN
 -
 -static int
+-set_capacity(const char *device)
++static char *sGetPass(int minLen, int warnLen)
+ {
+-	int errsv;
+-	int fd = open(device, O_RDONLY);
+-
+-	if (fd == -1)
+-		goto err;
+-
+-	if (ioctl(fd, LOOP_SET_CAPACITY) != 0)
+-		goto err;
+-
+-	return 0;
+-err:
+-	errsv = errno;
+-	fprintf(stderr, _("loop: can't set capacity on device %s: %s\n"),
+-					device, strerror (errsv));
+-	if (fd != -1)
+-		close(fd);
+-	return 2;
+-}
+-
+-static int
 -show_loop_fd(int fd, char *device) {
 -	struct loop_info loopinfo;
 -	struct loop_info64 loopinfo64;
@@ -3754,18 +4138,16 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -
 -		if (loopinfo64.lo_offset)
 -			printf(_(", offset %" PRIu64 ), loopinfo64.lo_offset);
--
++	char *p, *s, *seed;
++	int i, ask2, close_i_fd = 0;
+ 
 -		if (loopinfo64.lo_sizelimit)
 -			printf(_(", sizelimit %" PRIu64 ), loopinfo64.lo_sizelimit);
 -
 -		if (loopinfo64.lo_encrypt_type ||
 -		    loopinfo64.lo_crypt_name[0]) {
 -			char *e = (char *)loopinfo64.lo_crypt_name;
-+static char *sGetPass(int minLen, int warnLen)
-+{
-+	char *p, *s, *seed;
-+	int i, ask2, close_i_fd = 0;
- 
+-
 -			if (*e == 0 && loopinfo64.lo_encrypt_type == 1)
 -				e = "XOR";
 -			printf(_(", encryption %s (type %" PRIu32 ")"),
@@ -4030,8 +4412,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -/* check if the loopfile is already associated with the same given
 - * parameters.
 - *
-- * returns: -1 error
-- *           0 unused
+- * returns:  0 unused / error
 - *           1 loop device already used
 - */
 -static int
@@ -4046,17 +4427,15 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -	            file->st_ino == linfo64.lo_inode &&
 -		    (isoff == 0 || offset == linfo64.lo_offset))
 -			ret = 1;
--		return ret;
--	}
--	if (ioctl(dev, LOOP_GET_STATUS, &linfo) == 0) {
+-
+-	} else if (ioctl(dev, LOOP_GET_STATUS, &linfo) == 0) {
 -		if (file->st_dev == linfo.lo_device &&
 -	            file->st_ino == linfo.lo_inode &&
 -		    (isoff == 0 || offset == linfo.lo_offset))
 -			ret = 1;
--		return ret;
 -	}
 -
--	return errno == ENXIO ? 0 : -1;
+-	return ret;
 -}
 -
 -/* check if the loop file is already used with the same given
@@ -4139,9 +4518,8 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 +	memcpy(&b[0], &s.sha_out[0], 64);
 +	memset(&s, 0, sizeof(s));
  
--	if (stat(filename, &statbuf) == -1) {
--		perror(filename);
--		return -1;
+-	if (stat(filename, &statbuf) == -1)
+-		return 0;
 +	/*
 +	 * Read 32 bytes of random entropy from kernel's random
 +	 * number generator. This code may be executed early on startup
@@ -4152,13 +4530,12 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 +	if((fd = open("/dev/urandom", O_RDONLY)) == -1) {
 +		fprintf(stderr, _("Error: unable to open /dev/urandom\n"));
 +		return 1;
- 	}
++	}
 +	rd_wr_retry(fd, &b[64], 32, 0);
  
 -	fd = open(devname, O_RDONLY);
--	if (fd == -1) {
--		perror(devname);
--		return -1;
+-	if (fd == -1)
+-		return 0;
 +	/* generate multi-key hashes */
 +	x = 0;
 +	while(x < 65) {
@@ -4166,9 +4543,9 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 +		sha512_hash_buffer(&b[0], 64+32+16, k, 32);
 +		k += 32;
 +		x++;
- 	}
--	ret = is_associated(fd, &statbuf, offset, 1);
++	}
  
+-	ret = is_associated(fd, &statbuf, offset, 1);
  	close(fd);
 -	return ret;
 +	memset(&b[0], 0, sizeof(b));
@@ -4853,6 +5230,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -  " %1$s -a | --all                              list all used\n"
 -  " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
 -  " %1$s -f | --find                             find unused\n"
+-  " %1$s -c | --set-capacity <loopdev>           resize\n"
 -  " %1$s -j | --associated <file> [-o <num>]     list all associated with <file>\n"
 -  " %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"),
 -		progname);
@@ -4898,7 +5276,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
  int
  main(int argc, char **argv) {
 -	char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
--	int delete, find, c, all;
+-	int delete, find, c, all, capacity;
 +	char *partitionName = NULL;
 +	char *device = NULL;
 +	int delete,find,c,option_a=0,option_F=0,option_R=0,setup_o=0;
@@ -4909,6 +5287,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -	unsigned long long off, slimit;
 -	struct option longopts[] = {
 -		{ "all", 0, 0, 'a' },
+-		{ "set-capacity", 0, 0, 'c' },
 -		{ "detach", 0, 0, 'd' },
 -		{ "encryption", 1, 0, 'e' },
 -		{ "find", 0, 0, 'f' },
@@ -4927,7 +5306,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
  	bindtextdomain(PACKAGE, LOCALEDIR);
  	textdomain(PACKAGE);
  
--	delete = find = all = 0;
+-	capacity = delete = find = all = 0;
 -	off = 0;
 -        slimit = 0;
 -	assoc = offset = sizelimit = encryption = passfd = NULL;
@@ -4937,7 +5316,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -	if ((p = strrchr(progname, '/')) != NULL)
 -		progname = p+1;
 -
--	while ((c = getopt_long(argc, argv, "ade:E:fhj:o:p:rsv",
+-	while ((c = getopt_long(argc, argv, "acde:E:fhj:o:p:rsv",
 -				longopts, NULL)) != -1) {
 +	while ((c = getopt(argc,argv,"aC:de:fFG:H:I:K:o:p:P:rRs:S:Tv")) != -1) {
  		switch (c) {
@@ -4946,6 +5325,9 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 +		case 'a':		/* show status of all loops */
 +			option_a = 1;
  			break;
+-		case 'c':
+-			capacity = 1;
+-			break;
 -		case 'r':
 -			ro = 1;
 +		case 'C':
@@ -5040,7 +5422,7 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -		usage();
 -	} else if (delete) {
 -		if (argc < optind+1 || encryption || offset || sizelimit ||
--				find || all || showdev || assoc || ro)
+-		    capacity || find || all || showdev || assoc || ro)
 -			usage();
 +	if (option_a + delete + option_R + setup_o + find > 1) usage();
 +	if (option_a) {
@@ -5049,14 +5431,18 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 +		show_all_loops();
 +		res = 0;
  	} else if (find) {
--		if (all || assoc || argc < optind || argc > optind+1)
+-		if (capacity || all || assoc || argc < optind || argc > optind+1)
 +		if (argc != optind)
  			usage();
 -	} else if (all) {
 -		if (argc > 2)
 -			usage();
 -	} else if (assoc) {
--		if (encryption || showdev || passfd || ro)
+-		if (capacity || encryption || showdev || passfd || ro)
+-			usage();
+-	} else if (capacity) {
+-		if (argc != optind + 1 || encryption || offset || sizelimit ||
+-		    showdev || ro)
 -			usage();
 -	} else {
 -		if (argc < optind+1 || argc > optind+2)
@@ -5095,6 +5481,8 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -	if (delete) {
 -		while (optind < argc)
 -			res += del_loop(argv[optind++]);
+-	} else if (capacity) {
+-		res = set_capacity(device);
 -	} else if (file == NULL)
 -		res = show_loop(device);
 -	else {
@@ -5161,9 +5549,9 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.c util-linux-ng-2.15.1-AES/mount/lo
 -#endif /* !LOOP_SET_FD*/
 -#endif /* MAIN */
 +#endif
-diff -urN util-linux-ng-2.15.1/mount/lomount.h util-linux-ng-2.15.1-AES/mount/lomount.h
---- util-linux-ng-2.15.1/mount/lomount.h	2009-02-24 17:39:30.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/lomount.h	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/lomount.h util-linux-ng-2.16.1-AES/mount/lomount.h
+--- util-linux-ng-2.16.1/mount/lomount.h	2009-07-04 02:20:07.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/lomount.h	2009-10-10 18:02:39.000000000 +0300
 @@ -1,12 +1,19 @@
 -extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 -		    const char *, int, int *);
@@ -5192,9 +5580,9 @@ diff -urN util-linux-ng-2.15.1/mount/lomount.h util-linux-ng-2.15.1-AES/mount/lo
 +extern char *loopOffsetBytes;
 +extern char *loopSizeBytes;
 +extern char *loopEncryptionType;
-diff -urN util-linux-ng-2.15.1/mount/loop.c util-linux-ng-2.15.1-AES/mount/loop.c
---- util-linux-ng-2.15.1/mount/loop.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/loop.c	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/loop.c util-linux-ng-2.16.1-AES/mount/loop.c
+--- util-linux-ng-2.16.1/mount/loop.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/loop.c	2009-10-10 18:02:39.000000000 +0300
 @@ -0,0 +1,221 @@
 +/*
 + *  loop.c
@@ -5417,9 +5805,9 @@ diff -urN util-linux-ng-2.15.1/mount/loop.c util-linux-ng-2.15.1-AES/mount/loop.
 +	loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
 +	return(loop_set_status64_ioctl(fd, loopinfo));
 +}
-diff -urN util-linux-ng-2.15.1/mount/loop.h util-linux-ng-2.15.1-AES/mount/loop.h
---- util-linux-ng-2.15.1/mount/loop.h	2009-06-10 14:25:20.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/loop.h	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/loop.h util-linux-ng-2.16.1-AES/mount/loop.h
+--- util-linux-ng-2.16.1/mount/loop.h	2009-07-04 02:20:06.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/loop.h	2009-10-10 18:02:39.000000000 +0300
 @@ -1,19 +1,20 @@
 -#ifndef MNT_LOOP_H
 -#define MNT_LOOP_H
@@ -5454,10 +5842,12 @@ diff -urN util-linux-ng-2.15.1/mount/loop.h util-linux-ng-2.15.1-AES/mount/loop.
  #define LO_CRYPT_CRYPTOAPI 18
  
  #define LOOP_SET_FD		0x4C00
-@@ -22,22 +23,26 @@
+@@ -22,24 +23,26 @@
  #define LOOP_GET_STATUS		0x4C03
  #define LOOP_SET_STATUS64	0x4C04
  #define LOOP_GET_STATUS64	0x4C05
+-/* #define LOOP_CHANGE_FD	0x4C06 */
+-#define LOOP_SET_CAPACITY	0x4C07
 +#define LOOP_MULTI_KEY_SETUP 	0x4C4D
 +#define LOOP_MULTI_KEY_SETUP_V3	0x4C4E
 +#define LOOP_RECOMPUTE_DEV_SIZE 0x4C52
@@ -5492,7 +5882,7 @@ diff -urN util-linux-ng-2.15.1/mount/loop.h util-linux-ng-2.15.1-AES/mount/loop.
  	int		lo_offset;
  	int		lo_encrypt_type;
  	int		lo_encrypt_key_size;
-@@ -49,19 +54,34 @@
+@@ -51,19 +54,34 @@
  };
  
  struct loop_info64 {
@@ -5541,10 +5931,10 @@ diff -urN util-linux-ng-2.15.1/mount/loop.h util-linux-ng-2.15.1-AES/mount/loop.
 +extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
 +
 +#endif
-diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/losetup.8
---- util-linux-ng-2.15.1/mount/losetup.8	2009-06-10 14:25:20.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/losetup.8	2009-06-24 18:34:30.000000000 +0300
-@@ -1,117 +1,169 @@
+diff -urN util-linux-ng-2.16.1/mount/losetup.8 util-linux-ng-2.16.1-AES/mount/losetup.8
+--- util-linux-ng-2.16.1/mount/losetup.8	2009-09-07 10:24:49.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/losetup.8	2009-10-10 18:02:39.000000000 +0300
+@@ -1,124 +1,169 @@
 -.TH LOSETUP 8 "2003-07-01" "Linux" "MAINTENANCE COMMANDS"
 +.TH LOSETUP 8 "2008-10-15" "Linux" "MAINTENANCE COMMANDS"
  .SH NAME
@@ -5584,9 +5974,7 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 -.sp
 -.in +5
 -.B "losetup \-d"
--.I loopdev
--.RB [ \fIloopdev\fP
--.RB ...]
+-.IR loopdev ...
 -.sp
 -.in -5
 -Print name of first unused loop device:
@@ -5599,7 +5987,7 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 -.sp
 -.in +5
 -.B losetup
--.RB [{\-e | \-E}
+-.RB [{ \-e | \-E }
 -.IR encryption ]
 -.RB [ \-o
 -.IR offset ]
@@ -5609,9 +5997,16 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 -.RB [ \-p
 -.IR pfd ]
 -.RB [ \-r ]
--.RB { \-f [ \-\-show ] | \fIloopdev\fP }
+-.RB { \-f [ \-\-show ]| \fIloopdev\fP }
 -.I file
+-.sp
 -.in -13
+-Resize loop device:
+-.sp
+-.in +5
+-.B "losetup \-c"
+-.I loopdev
+-.in -5
 +.br
 +.B losetup -f
 +.br
@@ -5641,11 +6036,13 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 -always present are 0 (no encryption) and 1 (XOR encryption).
 -When the cryptoloop module is loaded (or compiled in), it uses number 18.
 -This cryptoloop module will take the name of an arbitrary encryption type
--and finds the module that knows how to perform that encryption.
+-and find the module that knows how to perform that encryption.
  .SH OPTIONS
 -.IP "\fB\-a, \-\-all\fP"
 -show status of all loop devices
--.IP "\fB\-d, \-\-detach\fP \fIloopdev\fP [\fIloopdev\fP ...]" 
+-.IP "\fB\-c, \-\-set-capacity\fP \fIloopdev\fP
+-force loop driver to reread size of the file associated with the specified loop device
+-.IP "\fB\-d, \-\-detach\fP \fIloopdev\fP..."
 -detach the file or device associated with the specified loop device(s)
 -.IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP"
 -enable data encryption with specified name or number
@@ -5814,7 +6211,7 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
  .SH RETURN VALUE
  .B losetup
  returns 0 on success, nonzero on failure. When
-@@ -123,49 +175,26 @@
+@@ -130,49 +175,26 @@
  
  .SH FILES
  .nf
@@ -5825,12 +6222,12 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 -If you are using the loadable module you must have the module loaded
 -first with the command
 -.IP
--# insmod loop.o
+-# modprobe loop
 -.LP
 -Maybe also encryption modules are needed.
 -.IP
--# insmod des.o
--# insmod cryptoloop.o
+-# modprobe des
+-# modprobe cryptoloop
 -.LP
  The following commands can be used as an example of using the loop device.
  .nf
@@ -5865,7 +6262,7 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 -DES encryption is painfully slow. On the other hand, XOR is terribly weak.
 -
 -Cryptoloop is deprecated in favor of dm-crypt. For more details see
--.B cryptsetup(8).
+-.BR cryptsetup (8).
 -.SH AVAILABILITY
 -The losetup command is part of the util-linux-ng package and is available from
 -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
@@ -5880,9 +6277,9 @@ diff -urN util-linux-ng-2.15.1/mount/losetup.8 util-linux-ng-2.15.1-AES/mount/lo
 +Original version: Theodore Ts'o <tytso at athena.mit.edu>
 +AES support: Jari Ruusu
 +.fi
-diff -urN util-linux-ng-2.15.1/mount/loumount.c util-linux-ng-2.15.1-AES/mount/loumount.c
---- util-linux-ng-2.15.1/mount/loumount.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/loumount.c	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/loumount.c util-linux-ng-2.16.1-AES/mount/loumount.c
+--- util-linux-ng-2.16.1/mount/loumount.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/loumount.c	2009-10-10 18:02:39.000000000 +0300
 @@ -0,0 +1,60 @@
 +/*
 + *  loumount.c
@@ -5944,10 +6341,10 @@ diff -urN util-linux-ng-2.15.1/mount/loumount.c util-linux-ng-2.15.1-AES/mount/l
 +		printf(_("del_loop(%s): success\n"), device);
 +	return 0;
 +}
-diff -urN util-linux-ng-2.15.1/mount/mount.8 util-linux-ng-2.15.1-AES/mount/mount.8
---- util-linux-ng-2.15.1/mount/mount.8	2009-06-10 14:25:20.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/mount.8	2009-06-24 18:34:30.000000000 +0300
-@@ -360,6 +360,16 @@
+diff -urN util-linux-ng-2.16.1/mount/mount.8 util-linux-ng-2.16.1-AES/mount/mount.8
+--- util-linux-ng-2.16.1/mount/mount.8	2009-09-07 10:27:18.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/mount.8	2009-10-10 18:02:40.000000000 +0300
+@@ -390,6 +390,16 @@
  .B \-v
  Verbose mode.
  .TP
@@ -5964,9 +6361,9 @@ diff -urN util-linux-ng-2.15.1/mount/mount.8 util-linux-ng-2.15.1-AES/mount/moun
  .B \-a
  Mount all filesystems (of the given types) mentioned in
  .IR fstab .
-@@ -409,12 +419,6 @@
+@@ -439,12 +449,6 @@
  .I /etc
- is on a read-only file system.
+ is on a read-only filesystem.
  .TP
 -.BI \-p " num"
 -In case of a loop mount with encryption, read the passphrase from
@@ -5977,7 +6374,7 @@ diff -urN util-linux-ng-2.15.1/mount/mount.8 util-linux-ng-2.15.1-AES/mount/moun
  .B \-s
  Tolerate sloppy mount options rather than failing. This will ignore
  mount options not supported by a filesystem type. Not all filesystems
-@@ -2282,13 +2286,19 @@
+@@ -2423,13 +2427,19 @@
  and then mount this device on
  .IR /mnt .
  
@@ -5999,9 +6396,9 @@ diff -urN util-linux-ng-2.15.1/mount/mount.8 util-linux-ng-2.15.1-AES/mount/moun
  If no explicit loop device is mentioned
  (but just an option `\fB\-o loop\fP' is given), then
  .B mount
-diff -urN util-linux-ng-2.15.1/mount/mount.c util-linux-ng-2.15.1-AES/mount/mount.c
---- util-linux-ng-2.15.1/mount/mount.c	2009-06-10 14:25:20.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/mount.c	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/mount.c util-linux-ng-2.16.1-AES/mount/mount.c
+--- util-linux-ng-2.16.1/mount/mount.c	2009-09-07 10:24:49.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/mount.c	2009-10-10 18:02:40.000000000 +0300
 @@ -10,6 +10,7 @@
  #include <string.h>
  #include <getopt.h>
@@ -6210,7 +6607,7 @@ diff -urN util-linux-ng-2.15.1/mount/mount.c util-linux-ng-2.15.1-AES/mount/moun
      if (special) {
        block_signals (SIG_UNBLOCK);
        res = status;
-@@ -2091,8 +2089,8 @@
+@@ -2095,8 +2093,8 @@
  		case 'O':		/* with -t: mount only if (not) opt */
  			test_opts = append_opt(test_opts, optarg, NULL);
  			break;
@@ -6221,9 +6618,9 @@ diff -urN util-linux-ng-2.15.1/mount/mount.c util-linux-ng-2.15.1-AES/mount/moun
  			break;
  		case 'r':		/* mount readonly */
  			readonly = 1;
-diff -urN util-linux-ng-2.15.1/mount/rmd160.c util-linux-ng-2.15.1-AES/mount/rmd160.c
---- util-linux-ng-2.15.1/mount/rmd160.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/rmd160.c	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/rmd160.c util-linux-ng-2.16.1-AES/mount/rmd160.c
+--- util-linux-ng-2.16.1/mount/rmd160.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/rmd160.c	2009-10-10 18:02:40.000000000 +0300
 @@ -0,0 +1,532 @@
 +/* rmd160.c  -	RIPE-MD160
 + *	Copyright (C) 1998 Free Software Foundation, Inc.
@@ -6757,9 +7154,9 @@ diff -urN util-linux-ng-2.15.1/mount/rmd160.c util-linux-ng-2.15.1-AES/mount/rmd
 +    rmd160_final( &hd );
 +    memcpy( outbuf, hd.buf, 20 );
 +}
-diff -urN util-linux-ng-2.15.1/mount/rmd160.h util-linux-ng-2.15.1-AES/mount/rmd160.h
---- util-linux-ng-2.15.1/mount/rmd160.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/rmd160.h	2009-06-24 18:34:30.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/rmd160.h util-linux-ng-2.16.1-AES/mount/rmd160.h
+--- util-linux-ng-2.16.1/mount/rmd160.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/rmd160.h	2009-10-10 18:02:40.000000000 +0300
 @@ -0,0 +1,9 @@
 +#ifndef RMD160_H
 +#define RMD160_H
@@ -6770,9 +7167,9 @@ diff -urN util-linux-ng-2.15.1/mount/rmd160.h util-linux-ng-2.15.1-AES/mount/rmd
 +#endif /*RMD160_H*/
 +
 +
-diff -urN util-linux-ng-2.15.1/mount/sha512.c util-linux-ng-2.15.1-AES/mount/sha512.c
---- util-linux-ng-2.15.1/mount/sha512.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/sha512.c	2009-06-24 18:34:31.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/sha512.c util-linux-ng-2.16.1-AES/mount/sha512.c
+--- util-linux-ng-2.16.1/mount/sha512.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/sha512.c	2009-10-10 18:02:40.000000000 +0300
 @@ -0,0 +1,432 @@
 +/*
 + *  sha512.c
@@ -7206,9 +7603,9 @@ diff -urN util-linux-ng-2.15.1/mount/sha512.c util-linux-ng-2.15.1-AES/mount/sha
 +    memset(&ctx, 0, sizeof(ctx));
 +}
 +#endif
-diff -urN util-linux-ng-2.15.1/mount/sha512.h util-linux-ng-2.15.1-AES/mount/sha512.h
---- util-linux-ng-2.15.1/mount/sha512.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-ng-2.15.1-AES/mount/sha512.h	2009-06-24 18:34:31.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/sha512.h util-linux-ng-2.16.1-AES/mount/sha512.h
+--- util-linux-ng-2.16.1/mount/sha512.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-ng-2.16.1-AES/mount/sha512.h	2009-10-10 18:02:40.000000000 +0300
 @@ -0,0 +1,45 @@
 +/*
 + *  sha512.h
@@ -7255,10 +7652,10 @@ diff -urN util-linux-ng-2.15.1/mount/sha512.h util-linux-ng-2.15.1-AES/mount/sha
 +/* no sha384_write(), use sha512_write() */
 +/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47]  */
 +extern void sha384_hash_buffer(unsigned char *, int, unsigned char *, int);
-diff -urN util-linux-ng-2.15.1/mount/swapon.8 util-linux-ng-2.15.1-AES/mount/swapon.8
---- util-linux-ng-2.15.1/mount/swapon.8	2009-05-27 16:37:52.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/swapon.8	2009-06-24 18:34:31.000000000 +0300
-@@ -107,6 +107,22 @@
+diff -urN util-linux-ng-2.16.1/mount/swapon.8 util-linux-ng-2.16.1-AES/mount/swapon.8
+--- util-linux-ng-2.16.1/mount/swapon.8	2009-09-07 10:24:49.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/swapon.8	2009-10-10 18:02:40.000000000 +0300
+@@ -103,6 +103,22 @@
  .I /proc/swaps
  or
  .IR /etc/fstab ).
@@ -7281,9 +7678,9 @@ diff -urN util-linux-ng-2.15.1/mount/swapon.8 util-linux-ng-2.15.1-AES/mount/swa
  
  .TP
  .B "\-a, \-\-all"
-diff -urN util-linux-ng-2.15.1/mount/swapon.c util-linux-ng-2.15.1-AES/mount/swapon.c
---- util-linux-ng-2.15.1/mount/swapon.c	2009-05-27 16:37:52.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/swapon.c	2009-06-24 18:34:31.000000000 +0300
+diff -urN util-linux-ng-2.16.1/mount/swapon.c util-linux-ng-2.16.1-AES/mount/swapon.c
+--- util-linux-ng-2.16.1/mount/swapon.c	2009-07-04 02:20:06.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/swapon.c	2009-10-10 18:02:40.000000000 +0300
 @@ -1,5 +1,18 @@
  /*
   * A swapon(8)/swapoff(8) for Linux 0.99.
@@ -7691,10 +8088,10 @@ diff -urN util-linux-ng-2.15.1/mount/swapon.c util-linux-ng-2.15.1-AES/mount/swa
  	}
  
  	return status;
-diff -urN util-linux-ng-2.15.1/mount/umount.c util-linux-ng-2.15.1-AES/mount/umount.c
---- util-linux-ng-2.15.1/mount/umount.c	2009-05-27 16:37:52.000000000 +0300
-+++ util-linux-ng-2.15.1-AES/mount/umount.c	2009-06-24 18:34:31.000000000 +0300
-@@ -189,7 +189,6 @@
+diff -urN util-linux-ng-2.16.1/mount/umount.c util-linux-ng-2.16.1-AES/mount/umount.c
+--- util-linux-ng-2.16.1/mount/umount.c	2009-07-04 02:20:06.000000000 +0300
++++ util-linux-ng-2.16.1-AES/mount/umount.c	2009-10-10 18:02:40.000000000 +0300
+@@ -190,7 +190,6 @@
  	int res;
  	int status;
  	const char *loopdev;
@@ -7702,7 +8099,7 @@ diff -urN util-linux-ng-2.15.1/mount/umount.c util-linux-ng-2.15.1-AES/mount/umo
  
  	/* Special case for root.  As of 0.99pl10 we can (almost) unmount root;
  	   the kernel will remount it readonly so that we can carry on running
-@@ -209,13 +208,6 @@
+@@ -210,13 +209,6 @@
  	if (check_special_umountprog(spec, node, type, &status))
  		return status;
  
@@ -7716,7 +8113,7 @@ diff -urN util-linux-ng-2.15.1/mount/umount.c util-linux-ng-2.15.1-AES/mount/umo
  	if (lazy) {
  		res = umount2 (node, MNT_DETACH);
  		if (res < 0)
-@@ -299,7 +291,7 @@
+@@ -300,7 +292,7 @@
  		}
  
  		/* Also free loop devices when -d flag is given */
@@ -7725,3 +8122,37 @@ diff -urN util-linux-ng-2.15.1/mount/umount.c util-linux-ng-2.15.1-AES/mount/umo
  			loopdev = spec;
  	}
   gotloop:
+@@ -436,6 +428,7 @@
+ 	return NULL;
+ }
+ 
++#if 0
+ /* check if @mc contains a loop device which is associated
+  * with the @file in fs
+  */
+@@ -473,6 +466,7 @@
+ 		       mc->m.mnt_fsname, fs->m.mnt_fsname);
+ 	return 0;
+ }
++#endif
+ 
+ static int
+ umount_file (char *arg) {
+@@ -555,15 +549,12 @@
+ 		   the pair (dev,file) in fstab. */
+ 		fs = getfs_by_devdir(mc->m.mnt_fsname, mc->m.mnt_dir);
+ 		if (!fs) {
+-			fs = getfs_by_dir(file);
+-			if (!fs && !getfs_by_spec(file))
++			if (!getfs_by_spec (file) && !getfs_by_dir (file))
+ 				die (2,
+ 				     _("umount: %s is not in the fstab "
+ 				       "(and you are not root)"),
+ 				     file);
+-
+-			/* spec could be a file which is loop mounted */
+-			if (fs && !is_valid_loop(mc, fs))
++			else
+ 				die (2, _("umount: %s mount disagrees with "
+ 					  "the fstab"), file);
+ 		}

-- 
Debian loop-AES packaging

