From e5bde19ae29c3f0459a5934f1c6f3d5982dcbaad Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 20 Apr 2021 14:39:32 +0200
Subject: [PATCH] build-sys: cleanup Makefiles

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 disk-utils/Makemodule.am |  4 ++--
 misc-utils/Makemodule.am |  4 ++--
 sys-utils/Makemodule.am  | 10 +++++-----
 text-utils/Makemodule.am |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index cd993a577..9e99b1380 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -110,14 +110,14 @@ endif
 if BUILD_CRAMFS
 cramfs_common_sources = disk-utils/cramfs.h disk-utils/cramfs_common.c
 sbin_PROGRAMS += fsck.cramfs
+MANPAGES += disk-utils/fsck.cramfs.8
 fsck_cramfs_SOURCES = disk-utils/fsck.cramfs.c $(cramfs_common_sources)
 fsck_cramfs_LDADD = $(LDADD) -lz libcommon.la
-MANPAGES += disk-utils/fsck.cramfs.8
 
 sbin_PROGRAMS += mkfs.cramfs
+MANPAGES += disk-utils/mkfs.cramfs.8
 mkfs_cramfs_SOURCES = disk-utils/mkfs.cramfs.c $(cramfs_common_sources)
 mkfs_cramfs_LDADD = $(LDADD) -lz libcommon.la
-MANPAGES += disk-utils/mkfs.cramfs.8
 endif
 
 if BUILD_FDFORMAT
diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 8e1a8590d..b10b75b54 100644
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -188,9 +188,9 @@ endif # BUILD_FINDMNT
 
 if BUILD_KILL
 bin_PROGRAMS += kill
+MANPAGES += misc-utils/kill.1
 kill_SOURCES = misc-utils/kill.c
 kill_LDADD = $(LDADD) libcommon.la
-MANPAGES += misc-utils/kill.1
 endif
 
 if BUILD_RENAME
@@ -220,6 +220,7 @@ endif
 
 if BUILD_HARDLINK
 usrbin_exec_PROGRAMS += hardlink
+MANPAGES += misc-utils/hardlink.1
 hardlink_SOURCES = misc-utils/hardlink.c lib/monotonic.c
 hardlink_LDADD = $(LDADD) libcommon.la $(REALTIME_LIBS)
 hardlink_CFLAGS = $(AM_CFLAGS)
@@ -227,5 +228,4 @@ if HAVE_PCRE2_POSIX
 hardlink_LDADD += $(PCRE2_POSIX_LIBS)
 hardlink_CFLAGS += $(PCRE2_POSIX_CFLAGS)
 endif
-MANPAGES += misc-utils/hardlink.1
 endif
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index b96e00630..3f2ecdab1 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -251,10 +251,10 @@ endif # BUILD_SETARCH
 
 if BUILD_EJECT
 usrbin_exec_PROGRAMS += eject
+MANPAGES += sys-utils/eject.1
 eject_SOURCES =  sys-utils/eject.c lib/monotonic.c
 eject_LDADD = $(LDADD) libmount.la libcommon.la $(REALTIME_LIBS)
 eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-MANPAGES += sys-utils/eject.1
 endif
 
 
@@ -391,6 +391,7 @@ endif
 
 if BUILD_LSCPU
 usrbin_exec_PROGRAMS += lscpu
+MANPAGES += sys-utils/lscpu.1
 lscpu_SOURCES = sys-utils/lscpu.c \
 		sys-utils/lscpu-cputype.c \
 		sys-utils/lscpu-cpu.c \
@@ -401,14 +402,13 @@ lscpu_SOURCES = sys-utils/lscpu.c \
 		sys-utils/lscpu.h
 lscpu_LDADD = $(LDADD) libcommon.la libsmartcols.la $(RTAS_LIBS)
 lscpu_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
-MANPAGES += sys-utils/lscpu.1
 endif
 
 if BUILD_CHCPU
 sbin_PROGRAMS += chcpu
+MANPAGES += sys-utils/chcpu.8
 chcpu_SOURCES = sys-utils/chcpu.c
 chcpu_LDADD = $(LDADD) libcommon.la
-MANPAGES += sys-utils/chcpu.8
 endif
 
 if BUILD_WDCTL
@@ -421,17 +421,17 @@ endif
 
 if BUILD_MOUNTPOINT
 bin_PROGRAMS += mountpoint
+MANPAGES += sys-utils/mountpoint.1
 mountpoint_LDADD = $(LDADD) libmount.la
 mountpoint_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir)
-MANPAGES += sys-utils/mountpoint.1
 mountpoint_SOURCES = sys-utils/mountpoint.c
 endif
 
 if BUILD_FALLOCATE
 usrbin_exec_PROGRAMS += fallocate
+MANPAGES += sys-utils/fallocate.1
 fallocate_SOURCES = sys-utils/fallocate.c
 fallocate_LDADD = $(LDADD) libcommon.la
-MANPAGES += sys-utils/fallocate.1
 endif
 
 if BUILD_PIVOT_ROOT
diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index 521ab97d1..66df9f999 100644
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -46,8 +46,8 @@ endif
 
 if BUILD_LINE
 usrbin_exec_PROGRAMS += line
-line_SOURCES = text-utils/line.c
 MANPAGES += text-utils/line.1
+line_SOURCES = text-utils/line.c
 endif
 
 if BUILD_PG