build: enhance man pages cleaning and dependencies

* man/local.mk: All of the manpages should depend on 'src/system.h',
and all of them should be cleaned by "make maintainer-clean", that
is, added to MAINTAINERCLEANFILES.  Make it be so.
Some minor cosmetic tweakings and reorderings while at it.

diff --git a/man/local.mk b/man/local.mk
index 99eb2159b3a9f2c268dfb961d89051f9592e02f8..182020be4c127d1a653411c96bb0f6c8f68a9046 100644 (file)
--- a/man/local.mk
+++ b/man/local.mk
@@ -19,16 +19,15 @@
 EXTRA_DIST += man/help2man
 
 man1_MANS = @man1_MANS@
-
 EXTRA_DIST += $(man1_MANS) $(man1_MANS:.1=.x)
-MAINTAINERCLEANFILES += $(man1_MANS)
 
 EXTRA_MANS = @EXTRA_MANS@
-
 EXTRA_DIST += $(EXTRA_MANS) $(EXTRA_MANS:.1=.x)
 
 ALL_MANS = $(man1_MANS) $(EXTRA_MANS)
 
+MAINTAINERCLEANFILES += $(ALL_MANS)
+
 # This is required because we have subtle inter-directory dependencies:
 # in order to generate all man pages, even those for which we don't
 # install a binary, require that all programs be built at distribution
@@ -150,7 +149,7 @@ man/yes.1:       $(mandep)  src/yes.c
 
 # This is required so that changes to e.g., emit_bug_reporting_address
 # provoke regeneration of all the manpages.
-$(man1_MANS): $(top_srcdir)/src/system.h
+$(ALL_MANS): $(top_srcdir)/src/system.h
 
 .x.1:
        $(AM_V_GEN)case '$(PERL)' in                            \