From 12f67b8372d8f7146a2983f24727ea6306aa70c0 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 9 May 2010 14:45:29 +0000 Subject: Remove internal liba52 copy. Nowadays FFmpeg is faster than liba52 and external liba52 is well supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/MAINTAINERS | 1 - DOCS/tech/binary-packaging.txt | 2 +- DOCS/tech/general.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'DOCS') diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS index 7b7b1c710c..b9b84d8fc2 100644 --- a/DOCS/tech/MAINTAINERS +++ b/DOCS/tech/MAINTAINERS @@ -93,7 +93,6 @@ Imported libs/projects: * VIDIX core: Benjamin Zores * mp3lib: None * loader: None - * liba52: None * libmpeg2: None * libdvdcss: Diego Biurrun * libdvdread: Diego Biurrun diff --git a/DOCS/tech/binary-packaging.txt b/DOCS/tech/binary-packaging.txt index 9d852372db..3aec8b2312 100644 --- a/DOCS/tech/binary-packaging.txt +++ b/DOCS/tech/binary-packaging.txt @@ -45,7 +45,7 @@ the following features MUST be included in any official binary package: * codecs - FAAD(internal) - libavcodec(internal) - - native codecs (libmpeg2/liba52/mp3lib) + - native codecs (libmpeg2/mp3lib) - Vorbis Tremor codec(internal) - RealPlayer codecs support (*) - Win32/VfW/DShow/QT codecs support (*) diff --git a/DOCS/tech/general.txt b/DOCS/tech/general.txt index b9ac61ff10..36a584b746 100644 --- a/DOCS/tech/general.txt +++ b/DOCS/tech/general.txt @@ -196,7 +196,7 @@ Now, go on: Only used if none of the above works. 4. Codecs. Consists of libmpcodecs/* and separate files or libs, - for example liba52, libmpeg2, loader, mp3lib. + for example libmpeg2, loader, mp3lib. mplayer.c doesn't call them directly, but through the dec_audio.c and dec_video.c files, so the mplayer.c doesn't have to know anything about -- cgit v1.2.3 From 23cdbb74faf0266a4d16f13e82c4d3caf584f97d Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 10 May 2010 23:39:16 +0000 Subject: Pass a language variable to submakes instead of reading subdirectory Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31152 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 4 ++-- DOCS/xml/Makefile.inc | 29 ++++++++++++++++------------- DOCS/xml/cs/Makefile | 4 ---- DOCS/xml/de/Makefile | 4 ---- DOCS/xml/en/Makefile | 4 ---- DOCS/xml/es/Makefile | 4 ---- DOCS/xml/fr/Makefile | 4 ---- DOCS/xml/hu/Makefile | 4 ---- DOCS/xml/it/Makefile | 4 ---- DOCS/xml/pl/Makefile | 4 ---- DOCS/xml/ru/Makefile | 4 ---- DOCS/xml/zh_CN/Makefile | 4 ---- 12 files changed, 18 insertions(+), 55 deletions(-) delete mode 100644 DOCS/xml/cs/Makefile delete mode 100644 DOCS/xml/de/Makefile delete mode 100644 DOCS/xml/en/Makefile delete mode 100644 DOCS/xml/es/Makefile delete mode 100644 DOCS/xml/fr/Makefile delete mode 100644 DOCS/xml/hu/Makefile delete mode 100644 DOCS/xml/it/Makefile delete mode 100644 DOCS/xml/pl/Makefile delete mode 100644 DOCS/xml/ru/Makefile delete mode 100644 DOCS/xml/zh_CN/Makefile (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index c68c1b9570..795c4c6f59 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -40,10 +40,10 @@ define lang-def html-chunked-$(lang) html-single-$(lang): $(HTML)/$(lang) $(CONFIGURE_GENERATED) html-chunked-$(lang): - $(MAKE) HTMLDIR=../$$< -C $(lang) html-chunked + $(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-chunked html-single-$(lang): - $(MAKE) HTMLDIR=../$$< -C $(lang) html-single + $(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-single xmllint-$(lang): xmllint.sh $(MAKE) -C $(lang) xmllint diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 44e022d56c..1cf2dcfbbd 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -2,30 +2,33 @@ # Makefile.inc for Makefiles in subdirectories. # -HTML_CHUNK_XSL := ../html-chunk.xsl -CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-common.xsl +# Dependency information. +$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml) -HTML_SINGLE_XSL := ../html-single.xsl -SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl +HTML_CHUNK_XSL := html-chunk.xsl +CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) html-common.xsl + +HTML_SINGLE_XSL := html-single.xsl +SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) html-common.xsl # This is the main target... all: html-chunked html-single html-chunked: $(HTMLDIR)/index.html html-single: $(HTMLDIR)/MPlayer.html -xmllint: main.xml - ../xmllint.sh $< +xmllint: $(LANG)/main.xml + ./xmllint.sh $< $(HTMLDIR)/default.css: - cp -f ../default.css $(@D) + cp -f default.css $(@D) -$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css - ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< +$(HTMLDIR)/index.html: $(LANG)/main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css + ./xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< -$(HTMLDIR)/MPlayer.html: main.xml $(SINGLE_XSL_DEPS) xmllint $(HTMLDIR)/default.css - ../xsltproc.sh $@ $(HTML_SINGLE_XSL) $< +$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml $(SINGLE_XSL_DEPS) xmllint $(HTMLDIR)/default.css + ./xsltproc.sh $@ $(HTML_SINGLE_XSL) $< -../html-chunk.xsl ../html-single.xsl main.xml: - cd .. && sh configure +html-chunk.xsl html-single.xsl $(LANG)/main.xml: + sh configure .PHONY: all html-chunked html-single xmllint diff --git a/DOCS/xml/cs/Makefile b/DOCS/xml/cs/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/cs/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/de/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/en/Makefile b/DOCS/xml/en/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/en/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/es/Makefile b/DOCS/xml/es/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/es/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/fr/Makefile b/DOCS/xml/fr/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/fr/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/hu/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/it/Makefile b/DOCS/xml/it/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/it/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/pl/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/ru/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc diff --git a/DOCS/xml/zh_CN/Makefile b/DOCS/xml/zh_CN/Makefile deleted file mode 100644 index db38611f41..0000000000 --- a/DOCS/xml/zh_CN/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml) - -include ../Makefile.inc -- cgit v1.2.3 From e3d4e1a3cec01e18ea0a3bc4f4cd60247c1ae754 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 11:52:41 +0000 Subject: Get rid of pointless variable indirection for XSL stylesheets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31159 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 1cf2dcfbbd..95af9702d9 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -5,12 +5,6 @@ # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml) -HTML_CHUNK_XSL := html-chunk.xsl -CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) html-common.xsl - -HTML_SINGLE_XSL := html-single.xsl -SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) html-common.xsl - # This is the main target... all: html-chunked html-single html-chunked: $(HTMLDIR)/index.html @@ -22,11 +16,11 @@ xmllint: $(LANG)/main.xml $(HTMLDIR)/default.css: cp -f default.css $(@D) -$(HTMLDIR)/index.html: $(LANG)/main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css - ./xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< +$(HTMLDIR)/index.html: $(LANG)/main.xml html-chunk.xsl html-common.xsl $(HTMLDIR)/default.css xmllint + ./xsltproc.sh $(HTMLDIR)/ html-chunk.xsl $< -$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml $(SINGLE_XSL_DEPS) xmllint $(HTMLDIR)/default.css - ./xsltproc.sh $@ $(HTML_SINGLE_XSL) $< +$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml html-single.xsl html-common.xsl $(HTMLDIR)/default.css xmllint + ./xsltproc.sh $@ html-single.xsl $< html-chunk.xsl html-single.xsl $(LANG)/main.xml: sh configure -- cgit v1.2.3 From 8de8a1c713af2d21cdb546ca4244bbb2f919b7f9 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 13:13:32 +0000 Subject: Make XML documentation build process nonrecursive. This greatly simplifies the documentation build process and the Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31160 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 19 ++++++++++++------- DOCS/xml/Makefile.inc | 28 ---------------------------- 2 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 DOCS/xml/Makefile.inc (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 795c4c6f59..bdc29f1b5b 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -37,16 +37,21 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def -html-chunked-$(lang) html-single-$(lang): $(HTML)/$(lang) $(CONFIGURE_GENERATED) +html-chunked-$(lang): $(HTML)/$(lang)/index.html +html-single-$(lang): $(HTML)/$(lang)/MPlayer.html +$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) $(HTML)/$(lang) $(CONFIGURE_GENERATED) html-common.xsl $(HTML)/$(lang)/default.css xmllint-$(lang) -html-chunked-$(lang): - $(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-chunked +$(HTML)/$(lang)/default.css: $(HTML)/$(lang) + cp -f default.css $$(@D) -html-single-$(lang): - $(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-single +$(HTML)/$(lang)/index.html: + ./xsltproc.sh $$(@D)/ html-chunk.xsl $$< -xmllint-$(lang): xmllint.sh - $(MAKE) -C $(lang) xmllint +$(HTML)/$(lang)/MPlayer.html: + ./xsltproc.sh $$@ html-single.xsl $$< + +xmllint-$(lang): $(lang)/main.xml + ./xmllint.sh $$< endef $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def))) diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc deleted file mode 100644 index 95af9702d9..0000000000 --- a/DOCS/xml/Makefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -# -# Makefile.inc for Makefiles in subdirectories. -# - -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml) - -# This is the main target... -all: html-chunked html-single -html-chunked: $(HTMLDIR)/index.html -html-single: $(HTMLDIR)/MPlayer.html - -xmllint: $(LANG)/main.xml - ./xmllint.sh $< - -$(HTMLDIR)/default.css: - cp -f default.css $(@D) - -$(HTMLDIR)/index.html: $(LANG)/main.xml html-chunk.xsl html-common.xsl $(HTMLDIR)/default.css xmllint - ./xsltproc.sh $(HTMLDIR)/ html-chunk.xsl $< - -$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml html-single.xsl html-common.xsl $(HTMLDIR)/default.css xmllint - ./xsltproc.sh $@ html-single.xsl $< - -html-chunk.xsl html-single.xsl $(LANG)/main.xml: - sh configure - -.PHONY: all html-chunked html-single xmllint -- cgit v1.2.3 From 51ac7512412abf0835d36e873c3d1e29b806b4ce Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 13:17:26 +0000 Subject: docs: Update documentation to account for recent build system changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31161 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/README.maintainers | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers index 056a2ae039..bd3fb0c13a 100644 --- a/DOCS/xml/README.maintainers +++ b/DOCS/xml/README.maintainers @@ -1,19 +1,12 @@ 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' directory. +When building the documentation, the generated HTML files are +placed in subdirectories of the 'HTML' directory. 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'. -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 files in the subdirectory. - Adding new translations ~~~~~~~~~~~~~~~~~~~~~~~ @@ -21,10 +14,7 @@ Adding new translations 1) Create a new subdirectory and copy the XML files there. main.xml must not be copied, it is autogenerated. -2) Make sure to create a 'Makefile' for the translation -- you can - use 'en/Makefile' as an example. - -3) In each translated file after the tag you must put a note +2) 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 0e9b9da3b27e72bc0d82def6ddb1b85feed17eaa Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 13:27:13 +0000 Subject: Only mark targets whose names end in "clean" as phony. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31162 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 bdc29f1b5b..d363a72fee 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -66,4 +66,4 @@ releaseclean: distclean: clean releaseclean .PHONY: all help html-chunked html-single xmllint -.PHONY: html-chunked-* html-single-* xmllint-* *clean* +.PHONY: html-chunked-* html-single-* xmllint-* *clean -- cgit v1.2.3 From eabca4e7b273ca61022d7773ce3c2069aaef1ac5 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 14:27:26 +0000 Subject: XML docs: Make xmllint-* targets a dependency of html-chunked-*/html-single-*. Since the xmllint-* targets are phony, they should never be a dependency of real targets, so make them a dependency of the phony html-chunked-* / html-single-* targets instead. This is just as correct, but now the docs are regenerated when dependencies change and not with every make invocation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31163 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 d363a72fee..d385dd15a3 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -37,9 +37,9 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def -html-chunked-$(lang): $(HTML)/$(lang)/index.html -html-single-$(lang): $(HTML)/$(lang)/MPlayer.html -$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) $(HTML)/$(lang) $(CONFIGURE_GENERATED) html-common.xsl $(HTML)/$(lang)/default.css xmllint-$(lang) +html-chunked-$(lang): xmllint-$(lang) $(HTML)/$(lang)/index.html +html-single-$(lang): xmllint-$(lang) $(HTML)/$(lang)/MPlayer.html +$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) $(HTML)/$(lang) html-common.xsl $(HTML)/$(lang)/default.css $(HTML)/$(lang)/default.css: $(HTML)/$(lang) cp -f default.css $$(@D) -- cgit v1.2.3 From f7d7d2db33d527caea2cde299427ea2323e73bad Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 21:21:45 +0000 Subject: Do not run xmllint prior to building the XML documentation. xmllint is just a convenient way to check for syntax errors; it is not a requirement to build the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31164 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 d385dd15a3..a0f7597ed7 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -37,8 +37,8 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def -html-chunked-$(lang): xmllint-$(lang) $(HTML)/$(lang)/index.html -html-single-$(lang): xmllint-$(lang) $(HTML)/$(lang)/MPlayer.html +html-chunked-$(lang): $(HTML)/$(lang)/index.html +html-single-$(lang): $(HTML)/$(lang)/MPlayer.html $(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) $(HTML)/$(lang) html-common.xsl $(HTML)/$(lang)/default.css $(HTML)/$(lang)/default.css: $(HTML)/$(lang) -- cgit v1.2.3 From 5082b8de29a2e8e2cab9be3d54e813b9c29631c1 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 21:25:12 +0000 Subject: Merge both XML documentation README files into one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31165 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/README | 22 ++++++++++++++++++++++ DOCS/xml/README.maintainers | 21 --------------------- 2 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 DOCS/xml/README.maintainers (limited to 'DOCS') diff --git a/DOCS/xml/README b/DOCS/xml/README index 1897dd53eb..f05432aaa2 100644 --- a/DOCS/xml/README +++ b/DOCS/xml/README @@ -73,6 +73,28 @@ to see all available build targets and make your choice. If something goes wrong, check the Configuration section of the toplevel Makefile and adjust the variables. +The documentation and its translations reside in subdirectories. +When building the documentation, the generated HTML files are +placed in subdirectories of the 'HTML' directory. + +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'. + + +Adding new translations +~~~~~~~~~~~~~~~~~~~~~~~ + +1) Create a new subdirectory and copy the XML files there. main.xml must not be + copied, it is autogenerated. + +2) 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). + +That's all, in theory. + A few words about SGML catalog files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/DOCS/xml/README.maintainers b/DOCS/xml/README.maintainers deleted file mode 100644 index bd3fb0c13a..0000000000 --- a/DOCS/xml/README.maintainers +++ /dev/null @@ -1,21 +0,0 @@ -The documentation and its translations reside in subdirectories. -When building the documentation, the generated HTML files are -placed in subdirectories of the 'HTML' directory. - -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'. - - -Adding new translations -~~~~~~~~~~~~~~~~~~~~~~~ - -1) Create a new subdirectory and copy the XML files there. main.xml must not be - copied, it is autogenerated. - -2) 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). - -That's all, in theory. -- cgit v1.2.3 From 997f8e8c1094b85c4ef0ef9a80427265aecd6d44 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 21:31:36 +0000 Subject: Create output directory when copying stylesheet. This eliminates one rule and simplifies dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31166 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 a0f7597ed7..48fcab3864 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -30,18 +30,16 @@ html-single: $(addprefix html-single-,$(DOC_LANGS)) xmllint: $(addprefix xmllint-,$(DOC_LANGS)) -$(foreach lang,$(DOC_LANG_ALL),$(HTML)/$(lang)): - mkdir -p $@ - $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): sh configure define lang-def html-chunked-$(lang): $(HTML)/$(lang)/index.html html-single-$(lang): $(HTML)/$(lang)/MPlayer.html -$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) $(HTML)/$(lang) html-common.xsl $(HTML)/$(lang)/default.css +$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css -$(HTML)/$(lang)/default.css: $(HTML)/$(lang) +$(HTML)/$(lang)/default.css: + mkdir -p $$@ cp -f default.css $$(@D) $(HTML)/$(lang)/index.html: -- cgit v1.2.3 From 3dd0551a268730b3168f56e6e78b7264318ee4bb Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 21:33:15 +0000 Subject: cosmetics: Invoke all shell scripts during XML documentation build directly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31167 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 48fcab3864..a8e0f6dcf9 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -31,7 +31,7 @@ html-single: $(addprefix html-single-,$(DOC_LANGS)) xmllint: $(addprefix xmllint-,$(DOC_LANGS)) $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): - sh configure + ./configure define lang-def html-chunked-$(lang): $(HTML)/$(lang)/index.html -- cgit v1.2.3 From 885d95c7c5278162a10f1707cfd52cb7a88646cb Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 22:31:47 +0000 Subject: 10l: Use the directory part of the stylesheet path to create a directory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31168 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 a8e0f6dcf9..01f935293d 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -39,7 +39,7 @@ html-single-$(lang): $(HTML)/$(lang)/MPlayer.html $(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css $(HTML)/$(lang)/default.css: - mkdir -p $$@ + mkdir -p $$(@D) cp -f default.css $$(@D) $(HTML)/$(lang)/index.html: -- cgit v1.2.3