diff options
| author | Karel Zak <kzak@redhat.com> | 2009-03-02 14:21:03 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2009-03-03 15:20:45 +0100 |
| commit | 81772d3c240cb72ddb977557c973b12bfef90396 (patch) | |
| tree | 727f440246e420980af2413ce27208631d71185a /mount/Makefile.am | |
| parent | e8be80dd3829b4fe31ea0335ead1af9bd5d0d65c (diff) | |
| download | util-linux-old-81772d3c240cb72ddb977557c973b12bfef90396.tar.gz | |
swapon: simplify spec to devname conversion
We needn't to use spec_to_devname() and check for pseudo filesystems.
The swap{on,off} is always checking for the 'swap' fstype.
This patch also removes the dependence on xmalloc.c.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'mount/Makefile.am')
| -rw-r--r-- | mount/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am index b34df3c3..7714efbc 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -6,12 +6,12 @@ bin_PROGRAMS = mount umount sbin_PROGRAMS = losetup swapon dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 -# generic sources for all programs (mount, umount, swapon, losetup) -srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c +# generic sources for all programs (mount, umount, losetup) +srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h # generic header for mount and umount hdrs_mount = fstab.h mount_mntent.h mount_constants.h \ - lomount.h xmalloc.h getusername.h loop.h sundries.h + lomount.h getusername.h loop.h # generic sources for mount and umount srcs_mount = fstab.c mount_mntent.c getusername.c lomount.c devname.c devname.h \ @@ -38,12 +38,12 @@ umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) $(cflags_common) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) umount_LDADD = $(ldadd_common) -swapon_SOURCES = swapon.c swap_constants.h $(srcs_common) devname.c devname.h \ - ../lib/linux_version.c ../lib/blkdev.c ../lib/fsprobe.c +swapon_SOURCES = swapon.c swap_constants.h ../lib/linux_version.c \ + ../lib/blkdev.c ../lib/fsprobe.c ../lib/canonicalize.c swapon_CFLAGS = $(cflags_common) swapon_LDADD = $(ldadd_common) -losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h xmalloc.h sundries.h +losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_static_LDADD = |