html.xsl ---> html-single.xsl + more consistency + small fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11207 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 25 insertions, 24 deletions

diff --git a/DOCS/xml/.cvsignore b/DOCS/xml/.cvsignore
index 52b592bfd4..fa8ce145e4 100644
--- a/DOCS/xml/.cvsignore
+++ b/DOCS/xml/.cvsignore
@@ -1,4 +1,4 @@
-html.xsl
 html-chunk.xsl
+html-single.xsl
 xsltproc.sh
 xmllint.sh
diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile
index 0a31c36f8f..9ed90c4080 100644
--- a/DOCS/xml/Makefile
+++ b/DOCS/xml/Makefile
@@ -21,6 +21,7 @@ help:
 	@echo "build-html-chunked: Build HTML documentation (multiple files)."
 	@echo "clean-html-single : Purge the 'HTML-single' directory."
 	@echo "clean-html-chunked: Purge the 'HTML' directory."
+	@echo "clean             : Purge the 'HTML' and 'HTML-single' directories."
 	@echo "distclean         : Remove ALL generated files."
 
 .PHONY: build-html-chunked
@@ -38,7 +39,7 @@ build-html-single: xsltproc.sh
 	for dir in $(SUBDIRS); do\
 		test -f $$dir/Makefile &&\
 		(test -d $(HTML_SINGLE)/$$dir || mkdir $(HTML_SINGLE)/$$dir) &&\
-		if $(MAKE) HTMLFILE=../$(HTML_SINGLE)/$$dir/MPlayer.html -C $$dir html; then :; else exit 1; fi;\
+		if $(MAKE) HTMLFILE=../$(HTML_SINGLE)/$$dir/MPlayer.html -C $$dir html-single; then :; else exit 1; fi;\
 	done
 
 .PHONY: clean-html-chunked
@@ -55,7 +56,7 @@ distclean: clean-html-chunked clean-html-single
 		test -f $$dir/Makefile &&\
 		if $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$$dir -C $$dir distclean ; then :; else exit 1; fi;\
 	done
-	-rm -f html.xsl html-chunk.xsl xsltproc.sh xmllint.sh
+	-rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh
 
 xsltproc.sh: configure
 	./configure
diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc
index c4de7b002f..c451fb1d47 100644
--- a/DOCS/xml/Makefile.inc
+++ b/DOCS/xml/Makefile.inc
@@ -2,20 +2,8 @@
 # Makefile.inc for Makefiles in subdirectories.
 #
 
-# Use customized html.xsl and/or html-chunk.xsl file if they exist...
+# Use customized html-chunk.xsl and/or html-single.xsl file if they exist...
 # Also add html-common.xsl to depends if it exists.
-ifeq (html.xsl,$(wildcard html.xsl))
-HTML_XSL := html.xsl
-ifeq (html-common.xsl,$(wildcard html-common.xsl))
-XSL_DEPS := $(HTML_XSL) html-common.xsl ../html.xsl ../html-common.xsl
-else
-XSL_DEPS := $(HTML_XSL) html-common.xsl ../html.xsl ../html-common.xsl
-endif
-else
-HTML_XSL := ../html.xsl
-XSL_DEPS := $(HTML_XSL) ../html-common.xsl
-endif
-
 ifeq (html-chunk.xsl,$(wildcard html-chunk.xsl))
 HTML_CHUNK_XSL := html-chunk.xsl
 ifeq (html-common.xsl,$(wildcard html-common.xsl))
@@ -28,13 +16,25 @@ HTML_CHUNK_XSL := ../html-chunk.xsl
 CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-common.xsl
 endif
 
+ifeq (html-single.xsl,$(wildcard html-single.xsl))
+HTML_SINGLE_XSL := html-single.xsl
+ifeq (html-common.xsl,$(wildcard html-common.xsl))
+XSL_DEPS := $(HTML_SINGLE_XSL) html-common.xsl ../html-single.xsl ../html-common.xsl
+else
+XSL_DEPS := $(HTML_SINGLE_XSL) html-common.xsl ../html-single.xsl ../html-common.xsl
+endif
+else
+HTML_SINGLE_XSL := ../html-single.xsl
+XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl
+endif
+
 # Fall back to the default HTML stylesheet if none is specified.
 HTML_STYLESHEET ?= ../default.css
 
 # This is the main target...
-all: html html-chunked
-html: $(HTMLFILE)
+all: html-chunked html-single
 html-chunked: $(HTMLDIR)/index.html
+html-single: $(HTMLFILE)
 
 $(HTMLDIR)/index.html: documentation.xml $(CHUNK_XSL_DEPS)
 	@if test "$(HTMLDIR)" = "" ; then echo "Error: HTMLDIR not set!!!"; echo "Typically this means, that you've run make from subdir of DOCS/xml. Don't do this!" ; false; fi
@@ -50,9 +50,9 @@ $(HTMLFILE): documentation.xml $(XSL_DEPS)
 	-rm -f $(HTMLFILE)
 	../xmllint.sh $<
 	cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
-	../xsltproc.sh $(HTMLFILE) $(HTML_XSL) $<
+	../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
 
-../html.xsl:
+../html-single.xsl:
 	cd .. && sh configure
 
 distclean:
diff --git a/DOCS/xml/configure b/DOCS/xml/configure
index 48687e45cc..dd57c0968f 100755
--- a/DOCS/xml/configure
+++ b/DOCS/xml/configure
@@ -25,8 +25,8 @@ fi
 
 
 
-echo "Searching stylesheets..."
-echo "Searching html/chunk.xsl..."
+echo "Searching for stylesheets..."
+echo "Searching for html/chunk.xsl..."
 for _try_chunk_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/share/docbook-xsl/html/chunk.xsl
 do
   if test -f "$_try_chunk_xsl"
@@ -79,7 +79,7 @@ cat > html-chunk.xsl << EOF
 EOF
 
 
-cat > html.xsl << EOF
+cat > html-single.xsl << EOF
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- **************************************************
      This file is generated automatically. DO NOT EDIT.
@@ -245,7 +245,7 @@ EOF
 chmod +x $_xsltwrapper
 
 
-echo "Searching xml checker..."
+echo "Searching for XML checker..."
 for _try_xmllint in xmllint
 do
   if command -v $_try_xmllint > /dev/null