DOCS/xml: Get rid of xmllint wrapper redirection

Run commands directly from make.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31534 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-06-23 12:07:29 +00:00 committed by Uoti Urpala
parent 1ba2cadb83
commit 204ffa4413
2 changed files with 7 additions and 14 deletions

View File

@ -1,12 +1,13 @@
# Makefile for generating the HTML documentation # Makefile for generating the HTML documentation
include ../../config.mak include ../../config.mak
include xml.mak
# Generated HTML files go here. # Generated HTML files go here.
HTML = ../HTML HTML = ../HTML
MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml)
CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak xsltproc.sh
all: html-chunked html-single all: html-chunked html-single
@ -48,8 +49,8 @@ $(HTML)/$(lang)/index.html:
$(HTML)/$(lang)/MPlayer.html: $(HTML)/$(lang)/MPlayer.html:
./xsltproc.sh $$@ html-single.xsl $$< ./xsltproc.sh $$@ html-single.xsl $$<
xmllint-$(lang): $(lang)/main.xml xmllint-$(lang):
./xmllint.sh $$< SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) $(lang)/main.xml
endef endef
$(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def))) $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def)))

14
DOCS/xml/configure vendored
View File

@ -4,7 +4,6 @@
# the other stuff necessary to convert the XML documentation. # the other stuff necessary to convert the XML documentation.
_xsltwrapper="xsltproc.sh" _xsltwrapper="xsltproc.sh"
_xmllintwrapper="xmllint.sh"
echo "Searching for XML catalogs..." echo "Searching for XML catalogs..."
for _try_catalog in \ for _try_catalog in \
@ -358,14 +357,7 @@ then
_xmllint_command=true _xmllint_command=true
fi fi
cat > $_xmllintwrapper << EOF cat > xml.mak << EOF
#!/bin/sh CATALOG = $_catalog
# ************************************************** XMLLINT_COMMAND = $_xmllint_command
# This file is generated automatically. DO NOT EDIT.
# **************************************************
# This is a small wrapper for XML lintian programs.
$_sgmlcatalog
$_xmllint_command
EOF EOF
chmod +x $_xmllintwrapper