From 5ef58f03513d97c518a330d5d97f508529a3235e Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 12:28:42 +0000 Subject: Declare a dependency on xmllint instead of duplicating the target's commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29993 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index c7c3252240..53e475d7af 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -39,7 +39,7 @@ SYMLINKS_DEPS:=$(if $(findstring yes,$(USE_SYMLINKS)), $(patsubst ../en/%,%,$(wi xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< -$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) +$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint ifndef HTMLDIR $(warning $(HTMLDIR)) $(warning Error: HTMLDIR not set!!!) @@ -47,18 +47,16 @@ ifndef HTMLDIR $(error Don't do this!) endif -rm -f $(HTMLDIR)/* - ../xmllint.sh $< cp -f $(HTML_STYLESHEET) $(HTMLDIR)/ ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< -$(HTMLFILE): main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) +$(HTMLFILE): main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint ifndef HTMLFILE $(warning Error: HTMLFILE not set!!!) $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) $(error Don't do this!) endif -rm -f $(HTMLFILE) - ../xmllint.sh $< cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)` ../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $< -- cgit v1.2.3 From e50d429186ce2b27d25f3385ea230e1bc696922c Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 12:31:26 +0000 Subject: Do not pointlessly remove all targets before recreating them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29994 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 2 -- 1 file changed, 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 53e475d7af..2ef29064da 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -46,7 +46,6 @@ ifndef HTMLDIR $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) $(error Don't do this!) endif - -rm -f $(HTMLDIR)/* cp -f $(HTML_STYLESHEET) $(HTMLDIR)/ ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< @@ -56,7 +55,6 @@ ifndef HTMLFILE $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) $(error Don't do this!) endif - -rm -f $(HTMLFILE) cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)` ../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $< -- cgit v1.2.3 From dcd42d9779857631dfa891453c847ba6e68ba647 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 12:38:16 +0000 Subject: Use automatic variables instead of the target name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29995 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 2ef29064da..ce68ca2d8e 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -55,8 +55,8 @@ ifndef HTMLFILE $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) $(error Don't do this!) endif - cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)` - ../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $< + cp -f $(HTML_STYLESHEET) `dirname $@` + ../xsltproc.sh $@ $(HTML_SINGLE_XSL) $< ../html-chunk.xsl ../html-single.xsl main.xml: cd .. && sh configure -- cgit v1.2.3 From ca65466a05ad6f608b092b9b75e14854b34d6b9a Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 12:41:17 +0000 Subject: Replace shell command substitution by Makefile syntax construct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29996 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index ce68ca2d8e..86a0e4a068 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -55,7 +55,7 @@ ifndef HTMLFILE $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) $(error Don't do this!) endif - cp -f $(HTML_STYLESHEET) `dirname $@` + cp -f $(HTML_STYLESHEET) $(@D) ../xsltproc.sh $@ $(HTML_SINGLE_XSL) $< ../html-chunk.xsl ../html-single.xsl main.xml: -- cgit v1.2.3 From 24b378c00ca658da69af0d8b7b9185833e53abf7 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 21:24:04 +0000 Subject: Remove pointless warning about Make being called from the wrong place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29998 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 86a0e4a068..f69614871f 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -40,21 +40,10 @@ xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint -ifndef HTMLDIR - $(warning $(HTMLDIR)) - $(warning Error: HTMLDIR not set!!!) - $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) - $(error Don't do this!) -endif cp -f $(HTML_STYLESHEET) $(HTMLDIR)/ ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< $(HTMLFILE): main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint -ifndef HTMLFILE - $(warning Error: HTMLFILE not set!!!) - $(warning Typically this means, that you've run make from a subdir of DOCS/xml.) - $(error Don't do this!) -endif cp -f $(HTML_STYLESHEET) $(@D) ../xsltproc.sh $@ $(HTML_SINGLE_XSL) $< -- cgit v1.2.3 From 464d2e597f433110c8e0502528a2d48cc137d166 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 21:33:24 +0000 Subject: Do not use symlinks for translations that comprise all XML files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29999 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/de/Makefile | 2 +- DOCS/xml/hu/Makefile | 2 +- DOCS/xml/ru/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile index e18885f6df..e36fbfffa5 100644 --- a/DOCS/xml/de/Makefile +++ b/DOCS/xml/de/Makefile @@ -2,7 +2,7 @@ #HTML_STYLESHEET = mystyle.css # Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = yes +USE_SYMLINKS = no # Dependency information. $(HTMLDIR)/index.html: $(wildcard *.xml) diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile index e18885f6df..e36fbfffa5 100644 --- a/DOCS/xml/hu/Makefile +++ b/DOCS/xml/hu/Makefile @@ -2,7 +2,7 @@ #HTML_STYLESHEET = mystyle.css # Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = yes +USE_SYMLINKS = no # Dependency information. $(HTMLDIR)/index.html: $(wildcard *.xml) diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile index e18885f6df..e36fbfffa5 100644 --- a/DOCS/xml/ru/Makefile +++ b/DOCS/xml/ru/Makefile @@ -2,7 +2,7 @@ #HTML_STYLESHEET = mystyle.css # Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = yes +USE_SYMLINKS = no # Dependency information. $(HTMLDIR)/index.html: $(wildcard *.xml) -- cgit v1.2.3 From 11dc4089e74d4373fde9687c079574914f405ff5 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 21:43:31 +0000 Subject: xmllint.sh is not a phony target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30000 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 7a90938aef..2a13530f39 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -62,4 +62,4 @@ releaseclean: distclean: clean releaseclean -.PHONY: all help html-chunked* html-single* xmllint* *clean* +.PHONY: all help html-chunked* html-single* xmllint xmllint-* *clean* -- cgit v1.2.3 From 8c42f1b7bcab35e3d70a0d6bea0865c67d5393dc Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 21:51:09 +0000 Subject: cosmetics: Remove pointless trailing /. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30001 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index f69614871f..644dac7083 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -40,7 +40,7 @@ xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint - cp -f $(HTML_STYLESHEET) $(HTMLDIR)/ + cp -f $(HTML_STYLESHEET) $(HTMLDIR) ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< $(HTMLFILE): main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint -- cgit v1.2.3 From 05de890bad0299894d7804894228c3de40d46166 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 22:10:39 +0000 Subject: Declare common dependencies for chunked and single HTML targets together. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30002 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 2a13530f39..21d34df0f9 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -25,9 +25,9 @@ help: @echo "distclean : Remove ALL generated files." @echo "Substitute LANG for one of $(DOC_LANG_ALL)" -html-chunked: xsltproc.sh xmllint.sh $(HTML_CHUNKED) $(addprefix html-chunked-,$(DOC_LANGS)) - -html-single: xsltproc.sh xmllint.sh $(HTML_SINGLE) $(addprefix html-single-,$(DOC_LANGS)) +html-chunked html-single: xsltproc.sh xmllint.sh +html-chunked: $(HTML_CHUNKED) $(addprefix html-chunked-,$(DOC_LANGS)) +html-single: $(HTML_SINGLE) $(addprefix html-single-,$(DOC_LANGS)) xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) -- cgit v1.2.3 From 985b7e57ae8616b9aa9c5ff4d1e5469e55a10541 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 22:15:50 +0000 Subject: Create required directories directly without intermediate steps. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30003 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 21d34df0f9..5b18bc2101 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -31,19 +31,17 @@ html-single: $(HTML_SINGLE) $(addprefix html-single-,$(DOC_LANGS)) xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) -$(HTML_CHUNKED) $(HTML_SINGLE): +$(foreach lang,$(DOC_LANG_ALL),$(HTML_CHUNKED)/$(lang) $(HTML_SINGLE)/$(lang)): -mkdir -p $@ xsltproc.sh xmllint.sh: sh configure define lang-def -html-chunked-$(1): xsltproc.sh xmllint.sh $(HTML_CHUNKED) - -mkdir -p $(HTML_CHUNKED)/$(1) +html-chunked-$(1): $(HTML_CHUNKED)/$(1) xsltproc.sh xmllint.sh $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$(1) -C $(1) html-chunked -html-single-$(1): xsltproc.sh xmllint.sh $(HTML_SINGLE) - -mkdir -p $(HTML_SINGLE)/$(1) +html-single-$(1): $(HTML_SINGLE)/$(1) xsltproc.sh xmllint.sh $(MAKE) HTMLFILE=../$(HTML_SINGLE)/$(1)/MPlayer.html -C $(1) html-single xmllint-$(1): xmllint.sh -- cgit v1.2.3 From a1b76a2914349ad99abf60cb29a74bde2e972e18 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 22:23:34 +0000 Subject: Simplify some commands via automatic variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30004 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 5b18bc2101..da17379ba7 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -39,10 +39,10 @@ xsltproc.sh xmllint.sh: define lang-def html-chunked-$(1): $(HTML_CHUNKED)/$(1) xsltproc.sh xmllint.sh - $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$(1) -C $(1) html-chunked + $(MAKE) HTMLDIR=../$$< -C $(1) html-chunked html-single-$(1): $(HTML_SINGLE)/$(1) xsltproc.sh xmllint.sh - $(MAKE) HTMLFILE=../$(HTML_SINGLE)/$(1)/MPlayer.html -C $(1) html-single + $(MAKE) HTMLFILE=../$$ Date: Sun, 13 Dec 2009 22:25:08 +0000 Subject: Do not pointlessly set the HTMLFILE variable when running xmllint. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30005 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index da17379ba7..8b57846da8 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -45,7 +45,7 @@ html-single-$(1): $(HTML_SINGLE)/$(1) xsltproc.sh xmllint.sh $(MAKE) HTMLFILE=../$$ Date: Sun, 13 Dec 2009 22:43:37 +0000 Subject: - Remove now unnecessary dependency on intermediate directories. - Update README.maintainers to reflect that the monolithic documentation is no longer built in a separate dir (accidentally committed part that belongs to the next committed revision). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30006 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 4 ++-- DOCS/xml/README.maintainers | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 8b57846da8..f540b2b418 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -26,8 +26,8 @@ help: @echo "Substitute LANG for one of $(DOC_LANG_ALL)" html-chunked html-single: xsltproc.sh xmllint.sh -html-chunked: $(HTML_CHUNKED) $(addprefix html-chunked-,$(DOC_LANGS)) -html-single: $(HTML_SINGLE) $(addprefix html-single-,$(DOC_LANGS)) +html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) +html-single: $(addprefix html-single-,$(DOC_LANGS)) xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers index a17617a555..743d0a71e2 100644 --- a/DOCS/xml/README.maintainers +++ b/DOCS/xml/README.maintainers @@ -2,9 +2,9 @@ The documentation and its translations reside in subdirectories. When building the documentation, the toplevel Makefile goes into the subdirectories listed in the SUBDIRS variable and executes make in each of those directories to create the HTML documentation -in subdirectories of the 'HTML' and 'HTML-single' directories. +in subdirectories of the 'HTML' directory. -IMPORTANT: Do NOT place sensitive files under 'HTML' or 'HTML-single'! +IMPORTANT: Do NOT place sensitive files under 'HTML'! It is for generated documentation only. The whole directory tree is wiped out by the Makefile when running 'make distclean' or 'make clean'. -- cgit v1.2.3 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=../$$ Date: Sun, 13 Dec 2009 23:17:11 +0000 Subject: Simplify setting COMMON_XSL_DEPS variable: Use $(wildcard ) directly instead of using it to control a conditional. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30008 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 644dac7083..52cdc31e15 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -4,11 +4,7 @@ # 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-common.xsl,$(wildcard html-common.xsl)) -COMMON_XSL_DEPS := html-common.xsl ../html-common.xsl -else -COMMON_XSL_DEPS := ../html-common.xsl -endif +COMMON_XSL_DEPS := ../html-common.xsl $(wildcard html-common.xsl) ifeq (html-chunk.xsl,$(wildcard html-chunk.xsl)) HTML_CHUNK_XSL := html-chunk.xsl -- cgit v1.2.3 From d1cab97233109562807ee0a7ccf44be7401432fb Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 23:22:55 +0000 Subject: Simplify one more command via automatic variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30009 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 52cdc31e15..30c18d7535 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -36,7 +36,7 @@ xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint - cp -f $(HTML_STYLESHEET) $(HTMLDIR) + cp -f $(HTML_STYLESHEET) $(@D) ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< $(HTMLFILE): main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint -- cgit v1.2.3 From 01ebb2b49a65e051e0065f3fcdfd190921f95e14 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 23:48:20 +0000 Subject: Avoid '&>' bashism for redirecting both stdout and stderr. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30010 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/configure b/DOCS/xml/configure index d4145ddf4c..b94eebf7e5 100755 --- a/DOCS/xml/configure +++ b/DOCS/xml/configure @@ -181,7 +181,7 @@ echo "Looking for a valid XSLT processor..." # Also checks for Jade/OpenJade. #FIXME: Add support for the xalan/xalan2 XSLT processors. -if xsltproc --version &> /dev/null +if xsltproc --version > /dev/null 2>&1 then if test -z "$_fake_chunk_xsl" then -- cgit v1.2.3 From 5ffe3cf4797e7ad4dcf422474f3ac315f4d5a782 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 23:50:38 +0000 Subject: Add html-chunk.xsl and html-single.xsl to targets generated by configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30011 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 7f94dc5f37..19196d1aeb 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -31,7 +31,7 @@ xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) $(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)): -mkdir -p $@ -xsltproc.sh xmllint.sh: +html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh: sh configure define lang-def -- cgit v1.2.3 From 82624ac049656817805be1d05a9b61761fa70594 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 23:54:46 +0000 Subject: configure also generates all main.xml files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30012 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 19196d1aeb..2aca1c3586 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -31,7 +31,7 @@ xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) $(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)): -mkdir -p $@ -html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh: +html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml): sh configure define lang-def -- cgit v1.2.3 From 4a7eee53920f0a6c77d8e95dcb5318219e8e98fc Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 13 Dec 2009 23:59:10 +0000 Subject: Factorize generating the list of all main.xml files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30013 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 2aca1c3586..c7ce2e99f9 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -5,6 +5,8 @@ include ../../config.mak # Generated HTML files go here. HTML = ../HTML +MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) + all: html-chunked html-single help: @@ -31,7 +33,7 @@ xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) $(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)): -mkdir -p $@ -html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml): +html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh $(MAIN_XML_ALL): sh configure define lang-def @@ -51,7 +53,7 @@ clean: rm -rf $(HTML) releaseclean: - rm -f $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) + rm -f $(MAIN_XML_ALL) rm -f $$(find . -name *.xml -type l) rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh -- cgit v1.2.3 From b933c31df5e85b89e1610e91c933e587434c299e Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 00:16:32 +0000 Subject: Construct monolithic targets with the HTMLDIR instead of the HTMLFILE variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30014 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- DOCS/xml/Makefile.inc | 4 ++-- DOCS/xml/cs/Makefile | 3 +-- DOCS/xml/de/Makefile | 3 +-- DOCS/xml/en/Makefile | 3 +-- DOCS/xml/es/Makefile | 3 +-- DOCS/xml/fr/Makefile | 3 +-- DOCS/xml/hu/Makefile | 3 +-- DOCS/xml/it/Makefile | 3 +-- DOCS/xml/pl/Makefile | 3 +-- DOCS/xml/ru/Makefile | 3 +-- DOCS/xml/zh_CN/Makefile | 3 +-- 12 files changed, 13 insertions(+), 23 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index c7ce2e99f9..e9b0b2288f 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -41,7 +41,7 @@ html-chunked-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh $(MAKE) HTMLDIR=../$$< -C $(1) html-chunked html-single-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh - $(MAKE) HTMLFILE=../$$ Date: Mon, 14 Dec 2009 00:42:46 +0000 Subject: Factorize stylesheet installation into its own target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30015 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index d509d42e53..4f8628e7f9 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -35,12 +35,13 @@ SYMLINKS_DEPS:=$(if $(findstring yes,$(USE_SYMLINKS)), $(patsubst ../en/%,%,$(wi xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< -$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint - cp -f $(HTML_STYLESHEET) $(@D) +$(HTMLDIR)/default.css: + cp -f ../default.css $(@D) + +$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< -$(HTMLDIR)/MPlayer.html: main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint - cp -f $(HTML_STYLESHEET) $(@D) +$(HTMLDIR)/MPlayer.html: main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $@ $(HTML_SINGLE_XSL) $< ../html-chunk.xsl ../html-single.xsl main.xml: -- cgit v1.2.3 From 1f52f6765264b9ae3dff5d8ddd23bacfd8c714b6 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 00:57:33 +0000 Subject: Use variable for HTML stylesheet so individual languages can use their own. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30016 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 4f8628e7f9..f2a4060ef2 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -36,7 +36,7 @@ xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< $(HTMLDIR)/default.css: - cp -f ../default.css $(@D) + cp -f $(HTML_STYLESHEET) $(@D) $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< -- cgit v1.2.3 From 130e2f9b675dcc40f26743fb5bf068e75392532b Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 01:34:02 +0000 Subject: Unconditionally symlink documentation files missing from a translation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30017 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 3 +-- DOCS/xml/README.maintainers | 5 ----- DOCS/xml/cs/Makefile | 3 --- DOCS/xml/de/Makefile | 3 --- DOCS/xml/en/Makefile | 3 --- DOCS/xml/es/Makefile | 3 --- DOCS/xml/fr/Makefile | 3 --- DOCS/xml/hu/Makefile | 3 --- DOCS/xml/it/Makefile | 3 --- DOCS/xml/pl/Makefile | 3 --- DOCS/xml/ru/Makefile | 3 --- DOCS/xml/zh_CN/Makefile | 3 --- 12 files changed, 1 insertion(+), 37 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index f2a4060ef2..c260710479 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -30,7 +30,7 @@ all: html-chunked html-single html-chunked: $(HTMLDIR)/index.html html-single: $(HTMLDIR)/MPlayer.html -SYMLINKS_DEPS:=$(if $(findstring yes,$(USE_SYMLINKS)), $(patsubst ../en/%,%,$(wildcard ../en/*.xml))) +SYMLINKS_DEPS:=$(patsubst ../en/%,%,$(wildcard ../en/*.xml)) xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< @@ -48,7 +48,6 @@ $(HTMLDIR)/MPlayer.html: main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR cd .. && sh configure $(filter-out main.xml, $(patsubst ../en/%,%, $(wildcard ../en/*.xml))): - $(if $(findstring yes,$(USE_SYMLINKS)), ,exit 0;)\ for file in ../en/*.xml ; do \ if ! test -r `basename $$file` ; then \ ln -s $$file `basename $$file` ; \ diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers index 743d0a71e2..86be440a09 100644 --- a/DOCS/xml/README.maintainers +++ b/DOCS/xml/README.maintainers @@ -75,9 +75,4 @@ Adding new translations like , where 2 is the revision of corresponding English file (see comment at the top of file). -7) While your translation isn't finished, you can change USE_SYMLINKS - to "yes" in your Makefile. This will help you testing your translation: - English files will be used instead of untranslated ones, when generating - HTML docs. - That's all, in theory. diff --git a/DOCS/xml/cs/Makefile b/DOCS/xml/cs/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/cs/Makefile +++ b/DOCS/xml/cs/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/de/Makefile +++ b/DOCS/xml/de/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/en/Makefile b/DOCS/xml/en/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/en/Makefile +++ b/DOCS/xml/en/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/es/Makefile b/DOCS/xml/es/Makefile index 11dc2e788f..2b263eea93 100644 --- a/DOCS/xml/es/Makefile +++ b/DOCS/xml/es/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = yes - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/fr/Makefile b/DOCS/xml/fr/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/fr/Makefile +++ b/DOCS/xml/fr/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/hu/Makefile +++ b/DOCS/xml/hu/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/it/Makefile b/DOCS/xml/it/Makefile index 11dc2e788f..2b263eea93 100644 --- a/DOCS/xml/it/Makefile +++ b/DOCS/xml/it/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = yes - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/pl/Makefile +++ b/DOCS/xml/pl/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile index ea6cc92bcb..2b263eea93 100644 --- a/DOCS/xml/ru/Makefile +++ b/DOCS/xml/ru/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = no - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/zh_CN/Makefile b/DOCS/xml/zh_CN/Makefile index 11dc2e788f..2b263eea93 100644 --- a/DOCS/xml/zh_CN/Makefile +++ b/DOCS/xml/zh_CN/Makefile @@ -1,9 +1,6 @@ # Set if you are using your own HTML stylesheet... #HTML_STYLESHEET = mystyle.css -# Change to yes to enable symlinking missing files to English master versions -USE_SYMLINKS = yes - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) -- cgit v1.2.3 From a1c5ce61194e5bb12eb9e61076c241104ecc0e71 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 01:51:42 +0000 Subject: Drop support for per-language stylesheets. In all these years nobody ever used this feature. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30018 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 5 +---- DOCS/xml/README.maintainers | 6 +----- DOCS/xml/cs/Makefile | 3 --- DOCS/xml/de/Makefile | 3 --- DOCS/xml/en/Makefile | 3 --- DOCS/xml/es/Makefile | 3 --- DOCS/xml/fr/Makefile | 3 --- DOCS/xml/hu/Makefile | 3 --- DOCS/xml/it/Makefile | 3 --- DOCS/xml/pl/Makefile | 3 --- DOCS/xml/ru/Makefile | 3 --- DOCS/xml/zh_CN/Makefile | 3 --- 12 files changed, 2 insertions(+), 39 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index c260710479..72db2a0f24 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -22,9 +22,6 @@ 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-chunked html-single html-chunked: $(HTMLDIR)/index.html @@ -36,7 +33,7 @@ xmllint: main.xml $(SYMLINKS_DEPS) ../xmllint.sh $< $(HTMLDIR)/default.css: - cp -f $(HTML_STYLESHEET) $(@D) + cp -f ../default.css $(@D) $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers index 86be440a09..f2fb2e7e12 100644 --- a/DOCS/xml/README.maintainers +++ b/DOCS/xml/README.maintainers @@ -67,11 +67,7 @@ Adding new translations -5) If you are using your own HTML stylesheet, edit your Makefile and set - the HTML_STYLESHEET variable to its name. Please, don't call your HTML - stylesheet 'default.css'. - -6) In each translated file after the tag you must put a note +5) In each translated file after the tag you must put a note like , where 2 is the revision of corresponding English file (see comment at the top of file). diff --git a/DOCS/xml/cs/Makefile b/DOCS/xml/cs/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/cs/Makefile +++ b/DOCS/xml/cs/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/de/Makefile +++ b/DOCS/xml/de/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/en/Makefile b/DOCS/xml/en/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/en/Makefile +++ b/DOCS/xml/en/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/es/Makefile b/DOCS/xml/es/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/es/Makefile +++ b/DOCS/xml/es/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/fr/Makefile b/DOCS/xml/fr/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/fr/Makefile +++ b/DOCS/xml/fr/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/hu/Makefile +++ b/DOCS/xml/hu/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/it/Makefile b/DOCS/xml/it/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/it/Makefile +++ b/DOCS/xml/it/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/pl/Makefile +++ b/DOCS/xml/pl/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/ru/Makefile +++ b/DOCS/xml/ru/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) diff --git a/DOCS/xml/zh_CN/Makefile b/DOCS/xml/zh_CN/Makefile index 2b263eea93..db38611f41 100644 --- a/DOCS/xml/zh_CN/Makefile +++ b/DOCS/xml/zh_CN/Makefile @@ -1,6 +1,3 @@ -# Set if you are using your own HTML stylesheet... -#HTML_STYLESHEET = mystyle.css - # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) -- cgit v1.2.3 From 0886fd008923d8f881091ab5bb2d173418e18fdb Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:00:25 +0000 Subject: Remove pointless Polish stylesheet; it provides no real benefit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30019 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/pl/html-chunk.xsl | 8 -------- DOCS/xml/pl/html-common.xsl | 15 --------------- DOCS/xml/pl/html-single.xsl | 8 -------- 3 files changed, 31 deletions(-) delete mode 100644 DOCS/xml/pl/html-chunk.xsl delete mode 100644 DOCS/xml/pl/html-common.xsl delete mode 100644 DOCS/xml/pl/html-single.xsl (limited to 'DOCS') diff --git a/DOCS/xml/pl/html-chunk.xsl b/DOCS/xml/pl/html-chunk.xsl deleted file mode 100644 index 26cfa2f125..0000000000 --- a/DOCS/xml/pl/html-chunk.xsl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/DOCS/xml/pl/html-common.xsl b/DOCS/xml/pl/html-common.xsl deleted file mode 100644 index b3c85812ce..0000000000 --- a/DOCS/xml/pl/html-common.xsl +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/DOCS/xml/pl/html-single.xsl b/DOCS/xml/pl/html-single.xsl deleted file mode 100644 index b263daf761..0000000000 --- a/DOCS/xml/pl/html-single.xsl +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -- cgit v1.2.3 From 62197a7183ee35f97ed31d78f4c2794673828a0e Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:01:50 +0000 Subject: Drop support for per-language XSL stylesheets. The feature was never properly used and provides little benefit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30020 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 14 -------------- DOCS/xml/README.maintainers | 45 ++------------------------------------------- 2 files changed, 2 insertions(+), 57 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 72db2a0f24..7cd7436c4d 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -2,25 +2,11 @@ # Makefile.inc for Makefiles in subdirectories. # -# Use customized html-chunk.xsl and/or html-single.xsl file if they exist... -# Also add html-common.xsl to depends if it exists. -COMMON_XSL_DEPS := ../html-common.xsl $(wildcard html-common.xsl) - -ifeq (html-chunk.xsl,$(wildcard html-chunk.xsl)) -HTML_CHUNK_XSL := html-chunk.xsl -CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-chunk.xsl $(COMMON_XSL_DEPS) -else 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 -XSL_DEPS := $(HTML_SINGLE_XSL) ../html-single.xsl $(COMMON_XSL_DEPS) -else HTML_SINGLE_XSL := ../html-single.xsl XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl -endif # This is the main target... all: html-chunked html-single diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers index f2fb2e7e12..c39b5dc4ff 100644 --- a/DOCS/xml/README.maintainers +++ b/DOCS/xml/README.maintainers @@ -14,9 +14,7 @@ IMPORTANT: Do NOT place sensitive files under 'HTML'! Each subdirectory must have a Makefile. Its purpose is to include the toplevel Makefile.inc file (with the rules to build the docs) and add dependency information to the main target, $(HTMLDIR)/index.html. -The main target usually depends on all the XML and XSL files in the -subdirectory. (Note that the toplevel *.xsl files are added automatically -by Makefile.inc, so you do not have to list them.) +The main target usually depends on all the XML files in the subdirectory. Adding new translations @@ -28,46 +26,7 @@ Adding new translations 2) Make sure to create a 'Makefile' for the translation -- you can use 'en/Makefile' as an example. -3) If you want to use a customized XSL stylesheet, create one and name it - 'html-common.xsl'. Also create two additional XSL stylesheets - ('html-single.xsl' and 'html-chunk.xsl'), with content such as this: - - html-single.xsl: - - - - - - - - - - html-chunk.xsl: - - - - - - - - - - - Note: You mustn't xsl:include or xsl:import chunk.xsl directly! - Including it can (and will) break building of documentation if chunk.xsl - is installed at a nonstandard location. - -4) If you wish to change the output encoding of generated files, create - html-common.xsl as suggested in step 4) and add strings such as these - somewhere between the and tags - (please, pay attention to quotes): - - - - -5) In each translated file after the tag you must put a note +3) In each translated file after the tag you must put a note like , where 2 is the revision of corresponding English file (see comment at the top of file). -- cgit v1.2.3 From 24d9de2ce495266fa2c8c16c657d5567506cbd9c Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:25:40 +0000 Subject: cosmetics: Rename XSL_DEPS variable to SINGLE_XSL_DEPS for consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30021 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 7cd7436c4d..024ce11d87 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -6,7 +6,7 @@ HTML_CHUNK_XSL := ../html-chunk.xsl CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-common.xsl HTML_SINGLE_XSL := ../html-single.xsl -XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl +SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl # This is the main target... all: html-chunked html-single @@ -24,7 +24,7 @@ $(HTMLDIR)/default.css: $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< -$(HTMLDIR)/MPlayer.html: main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css +$(HTMLDIR)/MPlayer.html: main.xml $(SINGLE_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $@ $(HTML_SINGLE_XSL) $< ../html-chunk.xsl ../html-single.xsl main.xml: -- cgit v1.2.3 From 318f59cc4d037521d1002baeb71a06e89b77b485 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:34:41 +0000 Subject: Remove outdated comment about build system behavior. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30022 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/README.maintainers | 2 -- 1 file changed, 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers index c39b5dc4ff..73114f2359 100644 --- a/DOCS/xml/README.maintainers +++ b/DOCS/xml/README.maintainers @@ -8,8 +8,6 @@ IMPORTANT: Do NOT place sensitive files under 'HTML'! It is for generated documentation only. The whole directory tree is wiped out by the Makefile when running 'make distclean' or 'make clean'. - Also, subdirectories are wiped out one by one before - creating the HTML files. Each subdirectory must have a Makefile. Its purpose is to include the toplevel Makefile.inc file (with the rules to build the docs) -- cgit v1.2.3 From bd1e209f88bcada8ec245488f964c18c31d37106 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:39:22 +0000 Subject: Factorize all components generated by configure into a variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30023 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index e9b0b2288f..ed5646f5a3 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -6,6 +6,7 @@ include ../../config.mak HTML = ../HTML MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) +CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh all: html-chunked html-single @@ -53,9 +54,9 @@ clean: rm -rf $(HTML) releaseclean: + rm -f $(CONFIGURE_GENERATED) rm -f $(MAIN_XML_ALL) rm -f $$(find . -name *.xml -type l) - rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh distclean: clean releaseclean -- cgit v1.2.3 From 8bc89968cf5ac6a0be5078fdd981486abfdd2063 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:40:55 +0000 Subject: Exploit one more opportunity to make use of the CONFIGURE_GENERATED variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30024 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index ed5646f5a3..517b150cf1 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -34,7 +34,7 @@ xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) $(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)): -mkdir -p $@ -html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh $(MAIN_XML_ALL): +$(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def -- cgit v1.2.3 From 7cc9d58f73c0090a88c132728f72afb5584b56a2 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:42:59 +0000 Subject: Fix dependencies of html-chunked and html-single targets. All the files generated by configure are required. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30025 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 517b150cf1..79bd9f429f 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -25,7 +25,7 @@ help: @echo "distclean : Remove ALL generated files." @echo "Substitute LANG for one of $(DOC_LANG_ALL)" -html-chunked html-single: xsltproc.sh xmllint.sh +html-chunked html-single: $(CONFIGURE_GENERATED) html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) html-single: $(addprefix html-single-,$(DOC_LANGS)) @@ -38,10 +38,10 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def -html-chunked-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh +html-chunked-$(1): $(HTML)/$(1) $(CONFIGURE_GENERATED) $(MAKE) HTMLDIR=../$$< -C $(1) html-chunked -html-single-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh +html-single-$(1): $(HTML)/$(1) $(CONFIGURE_GENERATED) $(MAKE) HTMLDIR=../$$< -C $(1) html-single xmllint-$(1): xmllint.sh -- cgit v1.2.3 From 0ba35473ebe5f6a1b25c3e63c0c56eda989e23d7 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:45:55 +0000 Subject: Drop pointless dependencies of the phony targets html-chunked and html-single. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30026 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 79bd9f429f..62aa2e03ee 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -25,7 +25,6 @@ help: @echo "distclean : Remove ALL generated files." @echo "Substitute LANG for one of $(DOC_LANG_ALL)" -html-chunked html-single: $(CONFIGURE_GENERATED) html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) html-single: $(addprefix html-single-,$(DOC_LANGS)) -- cgit v1.2.3 From 6fe2e9b0acb580b2cda8d5d6b17a8abd00a363b6 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 02:59:39 +0000 Subject: Remove pointless dependency on xmllint.sh from phony xmllint target. The individual language targets carry that dependency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30027 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 62aa2e03ee..d3fed701cc 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -28,7 +28,7 @@ help: html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) html-single: $(addprefix html-single-,$(DOC_LANGS)) -xmllint: xmllint.sh $(addprefix xmllint-,$(DOC_LANG_ALL)) +xmllint: $(addprefix xmllint-,$(DOC_LANG_ALL)) $(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)): -mkdir -p $@ -- cgit v1.2.3 From 9e41ccd3bc38b99efe3c105a9ca9f495937c4d4e Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 03:01:40 +0000 Subject: spelling cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30028 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index d3fed701cc..04485c5bac 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -18,8 +18,8 @@ help: @echo "html-single-LANG : As above, but only one language." @echo "html-chunked : HTML documentation for configured languages (multiple files)" @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 "xmllint : Check syntax of all XML files." + @echo "xmllint-LANG : Check syntax of LANG XML files." @echo "clean : Purge the 'HTML' directory." @echo "releaseclean : Remove generated files but keep the HTML." @echo "distclean : Remove ALL generated files." -- cgit v1.2.3 From 1586e9212d0795948eec2d463046623ba8a30d94 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 03:07:35 +0000 Subject: Factorize dependencies of language-specific HTML generation targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30029 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 04485c5bac..108cad664b 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -37,10 +37,12 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def -html-chunked-$(1): $(HTML)/$(1) $(CONFIGURE_GENERATED) +html-chunked-$(1) html-single-$(1): $(HTML)/$(1) $(CONFIGURE_GENERATED) + +html-chunked-$(1): $(MAKE) HTMLDIR=../$$< -C $(1) html-chunked -html-single-$(1): $(HTML)/$(1) $(CONFIGURE_GENERATED) +html-single-$(1): $(MAKE) HTMLDIR=../$$< -C $(1) html-single xmllint-$(1): xmllint.sh -- cgit v1.2.3 From 055694d3cdb5e529d6626deddc02709cfe411f71 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 03:09:09 +0000 Subject: Improve declaration of phony targets. This prevents configure from being rerun all the time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30030 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 108cad664b..e850eeb9e9 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -61,4 +61,5 @@ releaseclean: distclean: clean releaseclean -.PHONY: all help html-chunked* html-single* xmllint xmllint-* *clean* +.PHONY: all help html-chunked html-single xmllint +.PHONY: html-chunked-* html-single-* xmllint-* *clean* -- cgit v1.2.3 From 35a7136f5c9f5acef3581f1ff1cc9fa17267aeed Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 14 Dec 2009 03:14:21 +0000 Subject: The general xmllint target should only check configured languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30031 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index e850eeb9e9..bedf6e1eab 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -18,7 +18,7 @@ help: @echo "html-single-LANG : As above, but only one language." @echo "html-chunked : HTML documentation for configured languages (multiple files)" @echo "html-chunked-LANG : As above, but only one language." - @echo "xmllint : Check syntax of all XML files." + @echo "xmllint : Check syntax of XML files for configured languages." @echo "xmllint-LANG : Check syntax of LANG XML files." @echo "clean : Purge the 'HTML' directory." @echo "releaseclean : Remove generated files but keep the HTML." @@ -28,7 +28,7 @@ help: html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) html-single: $(addprefix html-single-,$(DOC_LANGS)) -xmllint: $(addprefix xmllint-,$(DOC_LANG_ALL)) +xmllint: $(addprefix xmllint-,$(DOC_LANGS))