[Mplayer-cvslog] CVS: main/DOCS/xml .cvsignore,1.2,1.3 Makefile,1.11,1.12 Makefile.inc,1.6,1.7 configure,1.5,1.6
Diego Biurrun CVS
diego at mplayerhq.hu
Tue Oct 21 13:07:24 CEST 2003
Update of /cvsroot/mplayer/main/DOCS/xml
In directory mail:/var/tmp.root/cvs-serv1161
Modified Files:
.cvsignore Makefile Makefile.inc configure
Log Message:
html.xsl ---> html-single.xsl + more consistency + small fixes
Index: .cvsignore
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Oct 2003 09:56:10 -0000 1.2
+++ .cvsignore 21 Oct 2003 11:07:02 -0000 1.3
@@ -1,4 +1,4 @@
-html.xsl
html-chunk.xsl
+html-single.xsl
xsltproc.sh
xmllint.sh
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 21 Oct 2003 01:36:00 -0000 1.11
+++ Makefile 21 Oct 2003 11:07:02 -0000 1.12
@@ -21,6 +21,7 @@
@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 @@
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 @@
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
Index: Makefile.inc
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.inc 20 Oct 2003 09:56:10 -0000 1.6
+++ Makefile.inc 21 Oct 2003 11:07:02 -0000 1.7
@@ -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 @@
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 @@
-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:
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure 20 Oct 2003 09:56:10 -0000 1.5
+++ configure 21 Oct 2003 11:07:02 -0000 1.6
@@ -25,8 +25,8 @@
-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 @@
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 @@
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
More information about the MPlayer-cvslog
mailing list