From 1b40267def6197cb9ff59f13910a43f0e0e691b9 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 9 Sep 2008 12:32:43 +0200 Subject: [PATCH] Doc. system: Hack around Makefile inexpressiveness. --- build/Makebottom | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Makebottom b/build/Makebottom index 772b4cbc..ef5d75cf 100644 --- a/build/Makebottom +++ b/build/Makebottom @@ -198,12 +198,14 @@ $(o)/%.html: $(o)/%.txt $(M)"DOC-HTML $<" $(Q)asciidoc -e -f $(s)/build/asciidoc.conf -f $(s)/build/asciidoc-xhtml.conf -f /etc/asciidoc/asciidoc.conf -f /etc/asciidoc/xhtml11.conf $< -$(patsubst %.html,%.txt,$(DOC_INDICES)): $(o)/%.txt: +# In reality, we do not depend on the .txt files, but on the corresponding .deflist's. +# However, the Makefile language cannot express that doc-extract generates both .txt +# and .deflist, so we always use the .txt's in dependencies. +$(patsubst %.html,%.txt,$(DOC_INDICES)): $(o)/%.txt: $(patsubst %.html,%.txt,$(DOCS)) $(M)"DOC-DEFS $@" $(Q)echo $@: $(DOC_HEAD) $(DOC_LIST) >> $(o)/depend.new $(Q)$(s)/build/doc-defs $(DOC_HEAD) $@ $(DOC_LIST) -#FIXME: this one outputs .deflist too. How do I specify that one run of the rule has multiple target files? $(patsubst %.html,%.txt,$(DOCS)): $(o)/%.txt: $(s)/%.txt $(M)"DOC-EXT $<" $(Q)$(s)/build/doc-extract $< $@ $(o)/depend.new $(s) $(patsubst %.txt,%.deflist,$@) -- 2.39.5