From e4f42f9d1eb609a515ad1434512d5ad3d96c9b72 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 30 Jun 2015 09:56:44 -0400 Subject: build-sys: use wildcard glob in update-man-list again The idea is that after adding a new man page, make update-man-list will be used to regenerate part of the makefile. So the data already present in the makefile cannot be used to do that. Also, renames filter out generated xml files in make-man-rules.py itself in order to make Makefile.am a bit simpler, and rename files to dist_files to better reflect new meaning. --- Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 7ac3c1d7eb..0fa4cf4824 100644 --- a/Makefile.am +++ b/Makefile.am @@ -708,10 +708,14 @@ noinst_DATA += \ CLEANFILES += \ man/index.html +XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml) NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES)) SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))} -update-man-list: $(top_srcdir)/tools/make-man-rules.py $(SOURCE_XML_FILES) +# This target should only be run manually. It recreates Makefile-man.am +# file in the source directory based on all man/*.xml files. Run it after +# adding, removing, or changing the conditional in a man page. +update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am @echo "Makefile-man.am has been regenerated" -- cgit v1.2.3-54-g00ecf