]> err.no Git - util-linux/commitdiff
build-sys: mount/Makefile.am tiny cleanup II
authorStepan Kasal <skasal@redhat.com>
Tue, 15 May 2007 18:46:09 +0000 (20:46 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 16 May 2007 09:43:29 +0000 (11:43 +0200)
Style change: init the *_LDADD vars, then amend them with +=.

Signed-off-by: Stepan Kasal <skasal@redhat.com>
mount/Makefile.am

index 2734945a7490ce9ef15663dd46ca44fcfc9c1f64..90b35ed009a6737e000c1e4b67c42a1f9d2ce154 100644 (file)
@@ -17,12 +17,10 @@ mount_common = fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \
 
 mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c \
        mount_guess_fstype.c
-mount_LDADD =
 mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 
 umount_SOURCES = umount.c $(mount_common)
-umount_LDADD =
 umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 
@@ -33,10 +31,18 @@ swapon_SOURCES = swapon.c xmalloc.c \
 losetup_SOURCES = lomount.c loop.h lomount.h
 losetup_CFLAGS = -DMAIN
 
+mount_LDADD =
+umount_LDADD =
+swapon_LDADD =
+
 if HAVE_BLKID
 mount_LDADD += -lblkid -luuid
 umount_LDADD += -lblkid -luuid
-swapon_LDADD = -lblkid -luuid
+swapon_LDADD += -lblkid -luuid
+endif
+
+if HAVE_SELINUX
+mount_LDADD += -lselinux
 endif
 
 if HAVE_PIVOT_ROOT
@@ -56,10 +62,6 @@ swapargs.h:
 clean-local:
        rm -f swapargs.h
 
-if HAVE_SELINUX
-mount_LDADD += -lselinux
-endif
-
 install-exec-hook:
        chmod 4755 $(DESTDIR)$(bindir)/mount
        chmod 4755 $(DESTDIR)$(bindir)/umount