# HG changeset patch
# User diego
# Date 1273583612 0
# Node ID 1ff8bca53fe65b103f3e58a86d7fb803d5f514bb
# Parent  b604051c30a3599e2f705c9d492239871d74f2eb
Make XML documentation build process nonrecursive.
This greatly simplifies the documentation build process and the Makefiles.

diff -r b604051c30a3 -r 1ff8bca53fe6 DOCS/xml/Makefile
--- a/DOCS/xml/Makefile	Tue May 11 11:52:41 2010 +0000
+++ b/DOCS/xml/Makefile	Tue May 11 13:13:32 2010 +0000
@@ -37,16 +37,21 @@
 	sh configure
 
 define lang-def
-html-chunked-$(lang) html-single-$(lang): $(HTML)/$(lang) $(CONFIGURE_GENERATED)
+html-chunked-$(lang): $(HTML)/$(lang)/index.html
+html-single-$(lang):  $(HTML)/$(lang)/MPlayer.html
+$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) $(HTML)/$(lang) $(CONFIGURE_GENERATED) html-common.xsl $(HTML)/$(lang)/default.css xmllint-$(lang)
 
-html-chunked-$(lang):
-	$(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-chunked
+$(HTML)/$(lang)/default.css: $(HTML)/$(lang)
+	cp -f default.css $$(@D)
 
-html-single-$(lang):
-	$(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-single
+$(HTML)/$(lang)/index.html:
+	./xsltproc.sh $$(@D)/ html-chunk.xsl $$<
 
-xmllint-$(lang): xmllint.sh
-	$(MAKE) -C $(lang) xmllint
+$(HTML)/$(lang)/MPlayer.html:
+	./xsltproc.sh $$@ html-single.xsl $$<
+
+xmllint-$(lang): $(lang)/main.xml
+	./xmllint.sh $$<
 endef
 
 $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def)))
diff -r b604051c30a3 -r 1ff8bca53fe6 DOCS/xml/Makefile.inc
--- a/DOCS/xml/Makefile.inc	Tue May 11 11:52:41 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#
-# Makefile.inc for Makefiles in subdirectories.
-#
-
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml)
-
-# This is the main target...
-all: html-chunked html-single
-html-chunked: $(HTMLDIR)/index.html
-html-single:  $(HTMLDIR)/MPlayer.html
-
-xmllint: $(LANG)/main.xml
-	./xmllint.sh $<
-
-$(HTMLDIR)/default.css:
-	cp -f default.css $(@D)
-
-$(HTMLDIR)/index.html: $(LANG)/main.xml html-chunk.xsl html-common.xsl $(HTMLDIR)/default.css xmllint
-	./xsltproc.sh $(HTMLDIR)/ html-chunk.xsl $<
-
-$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml html-single.xsl html-common.xsl $(HTMLDIR)/default.css xmllint
-	./xsltproc.sh $@ html-single.xsl $<
-
-html-chunk.xsl html-single.xsl $(LANG)/main.xml:
-	sh configure
-
-.PHONY: all html-chunked html-single xmllint