X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMakebottom;h=b164f2b7feffd8763028144b0580dbee72a5fabc;hb=6cbd32307057f98fc793eaf9dc97c99c62a85a43;hp=f53b1f7961c7a8b144bcf0cbf525e5537a07be89;hpb=91972e1a8200da60d621b5341fc2e672a6d9f77b;p=libucw.git

diff --git a/build/Makebottom b/build/Makebottom
index f53b1f79..b164f2b7 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -1,9 +1,11 @@
 # Bottom part of Makefile for the UCW Libraries
-# (c) 1997--2007 Martin Mares <mj@ucw.cz>
+# (c) 1997--2008 Martin Mares <mj@ucw.cz>
 
 # 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
@@ -16,7 +18,7 @@ programs: $(PROGS)
 datafiles: $(DATAFILES)
 tests: $(TESTS)
 configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
-docs: runtree $(DOCS)
+docs: runtree $(DOCS) $(DOC_INDICES)
 
 tags:
 	etags `find . -name "*.[ch]"`
@@ -193,22 +195,27 @@ $(DATAFILES): $(o)/%: $(s)/%
 	$(Q)$(call symlink,$@,run/$(DATADIR))
 
 # Rules for documentation
-$(o)/%.html: $(o)/%.txt
-	$(M)"AD $< -> $@"
-	$(Q)asciidoc $<
 
-$(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))
 
-# Default installation target
+# 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)
 
-default-install:
-	SH_EXTRA_RUNDIRS="$(sort $(EXTRA_RUNDIRS))" SH_INSTALL_RUNDIRS="$(sort $(INSTALL_RUNDIRS))" SH_CONFIGS="$(sort $(CONFIGS))" SH_AUTO_CONFIRM="$(CONFIRM)" $(s)/build/installer $(INSTALL_DIR)
+$(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,$@)
 
 # Don't delete intermediate targets. There shouldn't be any, but due to bugs
 # in GNU Make rules with targets in not-yet-existing directories are ignored
 # 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 docs