From b72afc004c0bb745d05f38224660444615e5d15d Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 22:51:55 +0000 Subject: Do not build monolithic documentation in a separate directory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30007 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/README | 6 +++--- DOCS/xml/Makefile | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'DOCS') diff --git a/DOCS/README b/DOCS/README index 7caffa7300..04d7357854 100644 --- a/DOCS/README +++ b/DOCS/README @@ -12,10 +12,10 @@ Thanks for reading MPlayer documentation !!! 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 @@ Thanks for reading MPlayer documentation !!! 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. diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index f540b2b418..7f94dc5f37 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -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 @@ help: @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 @@ html-single: $(addprefix html-single-,$(DOC_LANGS)) 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=../$$