diff options
author | LaMont Jones <lamont@debian.org> | 2007-10-26 06:48:18 -0600 |
---|---|---|
committer | LaMont Jones <lamont@debian.org> | 2007-10-26 06:48:18 -0600 |
commit | 4f3b9d4acca24271d3e2ababf7d91a0a77b94027 (patch) | |
tree | efac9785b1fb9cae22b1467816237fb931b9d0ec /mount/Makefile.am | |
parent | be2fa82d6882d74a858b6aea7e57a70212069876 (diff) | |
parent | 32f7216b4c480e140a035c92319e527120d26616 (diff) | |
download | util-linux-old-4f3b9d4acca24271d3e2ababf7d91a0a77b94027.tar.gz |
Merge commit 'origin/master'
Conflicts:
mount/Makefile.am
mount/mount.c
Diffstat (limited to 'mount/Makefile.am')
-rw-r--r-- | mount/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am index 41ae3fb0..f4430009 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -25,7 +25,8 @@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) swapon_SOURCES = swapon.c swap_constants.h $(utils_common) -losetup_SOURCES = lomount.c loop.h lomount.h rmd160.c +losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \ + loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_LDADD = $(LDADD_common) |