1 files changed, 26 insertions, 38 deletions
diff --git a/mount-deprecated/Makemodule.am b/mount-deprecated/Makemodule.am
index d3205f504..89944cc6e 100644
--- a/mount-deprecated/Makemodule.am
+++ b/mount-deprecated/Makemodule.am
@@ -1,10 +1,5 @@
 if BUILD_DEPRECATED_MOUNT
 
-bin_PROGRAMS += mount umount
-dist_man_MANS += \
-	mount-deprecated/mount.8 \
-	mount-deprecated/umount.8
-
 mount_common_sources = \
 	mount-deprecated/sundries.c \
 	mount-deprecated/sundries.h \
@@ -18,58 +13,51 @@ mount_common_sources = \
 	mount-deprecated/fstab.c \
 	mount-deprecated/getusername.c \
 	mount-deprecated/mount_mntent.c \
-	mount-deprecated/fsprobe.c \
-	\
-	lib/canonicalize.c \
-	lib/at.c \
-	lib/blkdev.c \
-	lib/env.c \
-	lib/linux_version.c \
-	lib/loopdev.c \
-	lib/mangle.c \
-	lib/strutils.c \
-	lib/xgetpass.c \
-	lib/sysfs.c
+	mount-deprecated/fsprobe.c
 
-mount_SOURCES = \
-	mount-deprecated/mount.c \
-	$(mount_common_sources) \
-	lib/setproctitle.c
+#
+# mount
+#
+bin_PROGRAMS += mount
+dist_man_MANS += mount-deprecated/mount.8
+mount_SOURCES = mount-deprecated/mount.c $(mount_common_sources)
 mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-mount_LDADD = libblkid.la
-
-umount_SOURCES = \
-	mount-deprecated/umount.c \
-	$(mount_common_sources)
-umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
-umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
-umount_LDADD = libblkid.la
-
+mount_LDADD = libblkid.la libcommon.la
 
-
-mount_static_LDADD =
+if HAVE_SELINUX
+mount_LDADD += $(SELINUX_LIBS)
+endif
 
 if HAVE_STATIC_MOUNT
 bin_PROGRAMS += mount.static
 mount_static_SOURCES = $(mount_SOURCES)
 mount_static_CFLAGS = $(mount_CFLAGS)
 mount_static_LDFLAGS = -all-static
-mount_static_LDADD += libblkid.la
+mount_static_LDADD = libblkid.la libcommon.la
+if HAVE_SELINUX
+mount_static_LDADD += $(SELINUX_LIBS_STATIC)
 endif
+endif # HAVE_STATIC_MOUNT
+
+#
+# umount
+#
+bin_PROGRAMS += umount
+dist_man_MANS += mount-deprecated/umount.8
+umount_SOURCES = mount-deprecated/umount.c $(mount_common_sources)
+umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libblkid_incdir)
+umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
+umount_LDADD = libblkid.la libcommon.la
 
 if HAVE_STATIC_UMOUNT
 bin_PROGRAMS += umount.static
 umount_static_SOURCES = $(umount_SOURCES)
 umount_static_CFLAGS = $(umount_CFLAGS)
 umount_static_LDFLAGS = -all-static
-umount_static_LDADD = libblkid.la
+umount_static_LDADD = libblkid.la libcommon.la
 endif
 
-if HAVE_SELINUX
-mount_LDADD += $(SELINUX_LIBS)
-mount_static_LDADD += $(SELINUX_LIBS_STATIC)
-endif
 
 if MAKEINSTALL_DO_SETUID
 install-exec-hook-mount: