[PATCH] build-sys: simplify code around RDEV_LINKS and SETARCH_LINKS

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Stepan Kasal <skasal@xxxxxxxxxx>
---

Hello,
  so, if I remember correctly, here is the right spot for comments
inside git-formatted mail-patches.
  This mail is just correcting typo in the subj. line of the prev.
one:  s/Simplify/simplify/
  The rest is the same.
Stepan

 sys-utils/Makefile.am |   24 +++++++++---------------
 sys-utils/ramsize.8   |    1 -
 sys-utils/rootflags.8 |    1 -
 sys-utils/vidmode.8   |    1 -
 4 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 sys-utils/ramsize.8
 delete mode 100644 sys-utils/rootflags.8
 delete mode 100644 sys-utils/vidmode.8

diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 056f8e1..8c837e8 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -35,21 +35,11 @@ dist_man_MANS += arch.1
 endif
 
 
+RDEV_LINKS =
 if BUILD_RDEV
-rdev_common_mans = rdev.8 ramsize.8 rootflags.8 vidmode.8
-rdev_common_links = ramsize vidmode rootflags
-
-if ARCH_I86
-usrsbinexec_PROGRAMS += rdev
-dist_man_MANS += $(rdev_common_mans)
-RDEV_LINKS = $(rdev_common_links)
-endif
-if ARCH_86_64
 usrsbinexec_PROGRAMS += rdev
-dist_man_MANS += $(rdev_common_mans)
-RDEV_LINKS = $(rdev_common_links)
-endif
-
+RDEV_LINKS += ramsize vidmode rootflags
+dist_man_MANS += rdev.8
 endif
 
 
@@ -80,9 +70,13 @@ if ARCH_HPPA
 SETARCH_LINKS += parisc parisc64 parisc32
 endif
 
+RDEV_MAN_LINKS = $(RDEV_LINKS:=.8)
 SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
-dist_man_MANS += $(SETARCH_MAN_LINKS)
-CLEANFILES=$(SETARCH_MAN_LINKS)
+man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
+CLEANFILES = $(man_MANS)
+
+$(RDEV_MAN_LINKS): rdev.8
+	echo ".so rdev.8" > $@
 
 $(SETARCH_MAN_LINKS): setarch.8
 	echo ".so setarch.8" > $@
diff --git a/sys-utils/ramsize.8 b/sys-utils/ramsize.8
deleted file mode 100644
index 901bd75..0000000
--- a/sys-utils/ramsize.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8
diff --git a/sys-utils/rootflags.8 b/sys-utils/rootflags.8
deleted file mode 100644
index 901bd75..0000000
--- a/sys-utils/rootflags.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8
diff --git a/sys-utils/vidmode.8 b/sys-utils/vidmode.8
deleted file mode 100644
index 901bd75..0000000
--- a/sys-utils/vidmode.8
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/rdev.8
-- 
1.5.3.4

-
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux