From a2ece0cf8d9c353b277e550d54d4aeb40697463a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 3 Oct 2014 19:01:47 +0200 Subject: [PATCH] docs/manual: rename the generic dependency rules Those rules are generic, and not specific to our manual, we want them always called: - manual-check-dependencies - manual-check-dependencies-pdf So, rename them to be generic to gendoc. Cascade the document's dependency checking to call those rules, too. Signed-off-by: "Yann E. MORIN" Cc: Samuel Martin Cc: Thomas De Schampheleire Reviewed-by: Samuel Martin Acked-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- docs/manual/manual.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index 536f939278..f6ef71ed64 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -1,6 +1,6 @@ # we can't use suitable-host-package here because that's not available in # the context of 'make release' -manual-check-dependencies: +gendoc-check-dependencies: $(Q)if [ -z "$(shell support/dependencies/check-host-asciidoc.sh)" ]; then \ echo "You need a sufficiently recent asciidoc on your host" \ "to generate documents"; \ @@ -11,7 +11,7 @@ manual-check-dependencies: exit 1; \ fi -manual-check-dependencies-pdf: +gendoc-check-dependencies-pdf: $(Q)if [ -z "`which dblatex 2>/dev/null`" ]; then \ echo "You need dblatex on your host to generate PDF documents"; \ exit 1; \ @@ -55,7 +55,10 @@ $(1): $(1)-$(5) .PHONY: $(1)-$(5) $(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) -$(1)-check-dependencies-$(5): +$(1)-check-dependencies: gendoc-check-dependencies + +gendoc-check-dependencies-$(5): +$(1)-check-dependencies-$(5): gendoc-check-dependencies-$(5) $(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) -- 2.30.2