# The run tree
-runtree: run/.tree-stamp $(addsuffix /.dir-stamp,$(addprefix $(o)/,$(DIRS)))
+DOCDIR=doc
+
+runtree: run/.tree-stamp $(addsuffix /.dir-stamp,$(addprefix $(o)/,$(DIRS)) $(addprefix run/$(DOCDIR)/,$(DOC_MODULES)))
run/.tree-stamp: $(o)/config.mk
$(M)Creating runtree
datafiles: $(DATAFILES)
tests: $(TESTS)
configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
-docs: runtree $(DOCS)
+docs: runtree $(DOCS) $(DOC_INDICES)
tags:
etags `find . -name "*.[ch]"`
$(Q)$(call symlink,$@,run/$(DATADIR))
# Rules for documentation
-$(o)/%.html: $(o)/%.txt
- $(M)"AD $< -> $@"
- $(Q)asciidoc -f $(s)/build/docconfig $<
-$(o)/%.txt: $(s)/%.txt
- $(M)"ED $< -> $@"
- $(Q)$(s)/build/extract-doc.pl $< $@ $(o)/depend.new $(s)
+$(o)/%.html: $(o)/%.txt $(s)/build/asciidoc.conf $(s)/build/asciidoc-xhtml.conf run/$(DOCDIR)/$(DOC_MODULE)/.dir-stamp
+ $(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 $<
+ $(Q)$(call symlink,$@,run/$(DOCDIR)/$(DOC_MODULE))
+
+# 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)) $(s)/build/doc-defs
+ $(M)"DOC-DEFS $@"
+ $(Q)echo $@: $(DOC_HEAD) $(DOC_LIST) >> $(o)/depend.new
+ $(Q)$(s)/build/doc-defs $(DOC_HEAD) $@ $(DOC_LIST)
+
+$(patsubst %.html,%.txt,$(DOCS)): $(o)/%.txt: $(s)/%.txt $(s)/build/doc-extract
+ $(M)"DOC-EXT $<"
+ $(Q)$(s)/build/doc-extract $< $@ $(o)/depend.new $(s) $(patsubst %.txt,%.deflist,$@)
# Default installation target
# when searching for implicit rules and thence targets considered intermediate.
.SECONDARY:
-.PHONY: all clean distclean runtree programs api datafiles force tags configs dust install default-install
+.PHONY: all clean distclean runtree programs api datafiles force tags configs dust install default-install docs