From 2032840792362c62781dd2661506c5afcc7f9fe7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 30 Oct 2016 19:30:26 -0400 Subject: at: (sd)man: clean up, rename {,sd}man --- build-aux/Makefile.each.tail/70-man.mk | 59 ------------------------- build-aux/Makefile.each.tail/70-sdman.mk | 76 ++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 59 deletions(-) delete mode 100644 build-aux/Makefile.each.tail/70-man.mk create mode 100644 build-aux/Makefile.each.tail/70-sdman.mk (limited to 'build-aux/Makefile.each.tail') diff --git a/build-aux/Makefile.each.tail/70-man.mk b/build-aux/Makefile.each.tail/70-man.mk deleted file mode 100644 index 3ff381b761..0000000000 --- a/build-aux/Makefile.each.tail/70-man.mk +++ /dev/null @@ -1,59 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - -mod.man.description = (systemd) manpages -mod.man.depends += am files write-atomic - -_man.man_xml = $(foreach _man.tmp,$(filter %.xml,$(files.src.src)),$(if $(findstring /,$(_man.tmp)),,$(_man.tmp))) - -ifneq ($(_man.man_xml),) -#$(info $(outdir)/_man.man_xml: «$(_man.man_xml)») - -$(srcdir)/Makefile-man.mk: $(topsrcdir)/tools/make-man-rules.py $(topsrcdir)/tools/xml_helper.py $(topsrcdir)/man/custom-entities.ent.in $(outdir)/.var._man.man_xml $(call at.addprefix,$(srcdir),$(_man.man_xml)) - $(AM_V_GEN)$(PYTHON) $< $(filter %.xml,$^) | $(WRITE_ATOMIC) $@ -files.src.gen += Makefile-man.mk - -man.MANPAGES = -man.MANPAGES_ALIAS = -#-include $(srcdir)/Makefile-man.mk - -_man.XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(man.MANPAGES)}}}}} -man.HTML_FILES = \ - ${_man.XML_FILES:.xml=.html} -man.HTML_ALIAS = \ - ${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(man.MANPAGES_ALIAS)}}}}} - -ifneq ($(ENABLE_MANPAGES),) -man_MANS = \ - $(man.MANPAGES) \ - $(man.MANPAGES_ALIAS) - -noinst_DATA += \ - $(man.HTML_FILES) \ - $(man.HTML_ALIAS) -endif # ENABLE_MANPAGES - -at.subdirs += $(abspath $(topoutdir)/man) - -endif # _man.man_xml diff --git a/build-aux/Makefile.each.tail/70-sdman.mk b/build-aux/Makefile.each.tail/70-sdman.mk new file mode 100644 index 0000000000..0e4b35b6ce --- /dev/null +++ b/build-aux/Makefile.each.tail/70-sdman.mk @@ -0,0 +1,76 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see . + +mod.sdman.description = (systemd) manpages +mod.sdman.depends += am files write-atomic +define mod.sdman.doc +# Inputs: +# - Global variable : `ENABLE_MANPAGES` +# - Directory variable : `files.src.src` +# Inputs (from `$(srcdir)/Makefile-man.mk`): +# - Directory variable : `sdman.MANPAGES` +# - Directory variable : `sdman.MANPAGES_ALIAS` +# Outputs: +# - File : `$(srcdir)/Makefile-man.mk` +# - Directory variable : `at.subdirs` +# - Directory variable : `files.src.gen` +# - Directory variable : `man_MANS` +# - Directory variable : `noinst_DATA` +# +# The `sdman.*` variables are the interface by which Makefile-man.mk may +# communicate up. They should not be used outside of the `sdman` module. +endef +mod.sdman.doc := $(value mod.sdman.doc) + +_sdman.man_xml = $(foreach _sdman.tmp,$(filter %.xml,$(files.src.src)),$(if $(findstring /,$(_sdman.tmp)),,$(_sdman.tmp))) + +ifneq ($(_sdman.man_xml),) + +$(srcdir)/Makefile-man.mk: $(topsrcdir)/tools/make-man-rules.py $(topsrcdir)/tools/xml_helper.py $(topsrcdir)/man/custom-entities.ent.in $(outdir)/.var._sdman.man_xml $(call at.addprefix,$(srcdir),$(_sdman.man_xml)) + $(AM_V_GEN)$(PYTHON) $< $(filter %.xml,$^) | $(WRITE_ATOMIC) $@ +files.src.gen += Makefile-man.mk + +sdman.MANPAGES = +sdman.MANPAGES_ALIAS = +#-include $(srcdir)/Makefile-man.mk + +_sdman.XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(sdman.MANPAGES)}}}}} +_sdman.HTML_FILES = \ + ${_sdman.XML_FILES:.xml=.html} +_sdman.HTML_ALIAS = \ + ${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(sdman.MANPAGES_ALIAS)}}}}} + +ifneq ($(ENABLE_MANPAGES),) +man_MANS = \ + $(sdman.MANPAGES) \ + $(sdman.MANPAGES_ALIAS) + +noinst_DATA += \ + $(_sdman.HTML_FILES) \ + $(_sdman.HTML_ALIAS) +endif # ENABLE_MANPAGES + +at.subdirs += $(abspath $(topoutdir)/man) + +endif # _sdman.man_xml -- cgit v1.2.3-54-g00ecf