Prep v229: Update and fix man page building (Makefile-man.am)

diff --git a/Makefile-man.am b/Makefile-man.am
index 9fb004bc6c703a783b29725730d23ce78d08524a..e5d00f06e86b392aa850c6d2d9e7cf0d2a6194cf 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -292,6 +292,16 @@ man/sd_session_is_remote.html: man/sd_session_is_active.html
 
 endif
 
 
 endif
 

+if HAVE_PYTHON
+MANPAGES += \
+       man/elogind.directives.7 \
+       man/elogind.index.7
+MANPAGES_ALIAS += \
+       #
+
+
+endif
+

 # Really, do not edit this file.
 
 EXTRA_DIST += \
 # Really, do not edit this file.
 
 EXTRA_DIST += \

diff --git a/Makefile.am b/Makefile.am
index 208927963fb4e26dd64389d4b465032779867e74..b12457878337267aebc320e384281ac1ab4374cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -256,32 +256,35 @@ endif
 CLEANFILES += \
        man/index.html
 
 CLEANFILES += \
        man/index.html
 

-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
-NON_INDEX_XML_FILES = $(filter-out man/elogind.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/elogind.directives.xml,$(NON_INDEX_XML_FILES))}
+XML_GLOB            := $(wildcard $(top_srcdir)/man/*.xml)
+DIRECTIVE_FILE      := man/elogind.directives.xml
+INDEX_XML_FILE      := man/elogind.index.xml
+NON_INDEX_XML_FILES := $(DIRECTIVE_FILE) $(filter-out $(INDEX_XML_FILE) $(DIRECTIVE_FILE),$(XML_FILES))
+ALL_XML_FILES       := $(INDEX_XML_FILE) $(DIRECTIVE_FILE) $(filter-out $(INDEX_XML_FILE) $(DIRECTIVE_FILE),$(XML_GLOB))
+SOURCE_XML_FILES    := ${patsubst %,$(top_srcdir)/%,$(filter-out $(DIRECTIVE_FILE),$(NON_INDEX_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.
 
 # 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) man/custom-entities.ent
-       $(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(top_srcdir)/Makefile-man.tmp
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(ALL_XML_FILES) man/custom-entities.ent
+       $(AM_V_GEN)$(PYTHON) $< $(ALL_XML_FILES) > $(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"
 
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
        @echo "Makefile-man.am has been regenerated"
 

-man/elogind.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
+$(INDEX_XML_FILE): $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)

        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
 
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
 

-man/elogind.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
+$(DIRECTIVE_FILE): $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)

        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
 
 CLEANFILES += \
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
 
 CLEANFILES += \

-       man/elogind.index.xml \
-       man/elogind.directives.xml
+       $(INDEX_XML_FILE) \
+       $(DIRECTIVE_FILE)

 
 EXTRA_DIST += \
 
 EXTRA_DIST += \

-       $(filter-out man/elogind.directives.xml man/elogind.index.xml,$(XML_FILES)) \
+       $(filter-out $(DIRECTIVE_FILE) $(INDEX_XML_FILE),$(XML_FILES)) \

        tools/make-man-index.py \
        tools/make-man-rules.py \
        tools/make-directive-index.py \
        tools/make-man-index.py \
        tools/make-man-rules.py \
        tools/make-directive-index.py \