From: Stepan Kasal <skasal@redhat.com>
Date: Tue, 15 May 2007 18:46:09 +0000 (+0200)
Subject: build-sys: mount/Makefile.am tiny cleanup II
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7caf9897a8e202b87046a55dfcb9245c5d6474dd;p=util-linux

build-sys: mount/Makefile.am tiny cleanup II

Style change: init the *_LDADD vars, then amend them with +=.

Signed-off-by: Stepan Kasal <skasal@redhat.com>
---

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 2734945a..90b35ed0 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -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