changeset 29965:1bff8cc9ca6b

Do not build monolithic documentation in a separate directory.

--- a/DOCS/README	Sun Dec 13 22:43:37 2009 +0000
+++ b/DOCS/README	Sun Dec 13 22:51:55 2009 +0000
@@ -12,10 +12,10 @@
       each language in its own subdirectory.
 
    b, If you prefer reading the documentation as a single big file it
-      can be found in the HTML-single/ directory, each language in its
+      can be found in the file MPlayer.html, each language in its
       own subdirectory.
 
-   c, If the HTML/ or HTML-single/ directories don't contain your language,
+   c, If the HTML/ directory does not contain your language,
       try the subdirectories in this very same folder.
 
 
@@ -23,7 +23,7 @@
 
    a, Enter the xml/ directory, and read the README file there to find
       out how to build a HTML version of the XML documentation. It will
-      be created in the HTML/ and HTML-single/ directories.
+      be created in the HTML/ directory.
 
    b, If the xml/ directory doesn't contain your language, try the
       subdirectories in this very same folder.

--- a/DOCS/xml/Makefile	Sun Dec 13 22:43:37 2009 +0000
+++ b/DOCS/xml/Makefile	Sun Dec 13 22:51:55 2009 +0000
@@ -2,11 +2,8 @@
 
 include ../../config.mak
 
-# Generated chunked HTML files go here.
-HTML_CHUNKED = ../HTML
-
-# Generated single HTML files go here.
-HTML_SINGLE = ../HTML-single
+# Generated HTML files go here.
+HTML = ../HTML
 
 all: html-chunked html-single
 
@@ -20,7 +17,7 @@
 	@echo "html-chunked-LANG : As above, but only one language."
 	@echo "xmllint           : Check syntax of all xml files."
 	@echo "xmllint-LANG      : Check syntax of LANG xml files."
-	@echo "clean             : Purge the 'HTML' and 'HTML-single' directories."
+	@echo "clean             : Purge the 'HTML' directory."
 	@echo "releaseclean      : Remove generated files but keep the HTML."
 	@echo "distclean         : Remove ALL generated files."
 	@echo "Substitute LANG for one of $(DOC_LANG_ALL)"
@@ -31,17 +28,17 @@
 
 xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL))
 
-$(foreach lang,$(DOC_LANG_ALL),$(HTML_CHUNKED)/$(lang) $(HTML_SINGLE)/$(lang)):
+$(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)):
 	-mkdir -p $@
 
 xsltproc.sh xmllint.sh:
 	sh configure
 
 define lang-def
-html-chunked-$(1): $(HTML_CHUNKED)/$(1) xsltproc.sh xmllint.sh
+html-chunked-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh
 	$(MAKE) HTMLDIR=../$$< -C $(1) html-chunked
 
-html-single-$(1): $(HTML_SINGLE)/$(1) xsltproc.sh xmllint.sh
+html-single-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh
 	$(MAKE) HTMLFILE=../$$</MPlayer.html -C $(1) html-single
 
 xmllint-$(1): xmllint.sh
@@ -51,7 +48,7 @@
 $(foreach lang, $(DOC_LANG_ALL),$(eval $(call lang-def,$(lang))))
 
 clean:
-	rm -rf $(HTML_CHUNKED) $(HTML_SINGLE)
+	rm -rf $(HTML)
 
 releaseclean:
 	rm -f $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml)