From bcdf7c0b3dc61a09e0cd83d553bd21dc0f266d04 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 3 May 2010 23:00:58 +0000 Subject: Put symlinks under revision control instead of generating them during make. This simplifies the build system and should have no practical disadvantage. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31133 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 1 - DOCS/xml/Makefile.inc | 11 +++-------- DOCS/xml/es/encoding-guide.xml | 1 + DOCS/xml/es/radio.xml | 1 + DOCS/xml/it/ports.xml | 1 + DOCS/xml/it/skin.xml | 1 + DOCS/xml/zh_CN/encoding-guide.xml | 1 + DOCS/xml/zh_CN/faq.xml | 1 + DOCS/xml/zh_CN/install.xml | 1 + DOCS/xml/zh_CN/ports.xml | 1 + DOCS/xml/zh_CN/skin.xml | 1 + DOCS/xml/zh_CN/tvinput.xml | 1 + DOCS/xml/zh_CN/usage.xml | 1 + DOCS/xml/zh_CN/video.xml | 1 + 14 files changed, 15 insertions(+), 9 deletions(-) create mode 120000 DOCS/xml/es/encoding-guide.xml create mode 120000 DOCS/xml/es/radio.xml create mode 120000 DOCS/xml/it/ports.xml create mode 120000 DOCS/xml/it/skin.xml create mode 120000 DOCS/xml/zh_CN/encoding-guide.xml create mode 120000 DOCS/xml/zh_CN/faq.xml create mode 120000 DOCS/xml/zh_CN/install.xml create mode 120000 DOCS/xml/zh_CN/ports.xml create mode 120000 DOCS/xml/zh_CN/skin.xml create mode 120000 DOCS/xml/zh_CN/tvinput.xml create mode 120000 DOCS/xml/zh_CN/usage.xml create mode 120000 DOCS/xml/zh_CN/video.xml (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index ed0ec64ed6..c68c1b9570 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -57,7 +57,6 @@ clean: releaseclean: -rm -f $(CONFIGURE_GENERATED) -rm -f $(MAIN_XML_ALL) - -rm -f $$(find . -name *.xml -type l) distclean: clean releaseclean diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 33639bed7e..44e022d56c 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -13,24 +13,19 @@ all: html-chunked html-single html-chunked: $(HTMLDIR)/index.html html-single: $(HTMLDIR)/MPlayer.html -SYMLINKS_DEPS := $(filter-out $(wildcard *.xml),$(notdir $(wildcard ../en/*.xml))) - -xmllint: main.xml $(SYMLINKS_DEPS) +xmllint: main.xml ../xmllint.sh $< $(HTMLDIR)/default.css: cp -f ../default.css $(@D) -$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css +$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< -$(HTMLDIR)/MPlayer.html: main.xml $(SINGLE_XSL_DEPS) $(SYMLINKS_DEPS) xmllint $(HTMLDIR)/default.css +$(HTMLDIR)/MPlayer.html: 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 -$(SYMLINKS_DEPS): - ln -s ../en/$@ $@ - .PHONY: all html-chunked html-single xmllint diff --git a/DOCS/xml/es/encoding-guide.xml b/DOCS/xml/es/encoding-guide.xml new file mode 120000 index 0000000000..9c2c8fab3c --- /dev/null +++ b/DOCS/xml/es/encoding-guide.xml @@ -0,0 +1 @@ +../en/encoding-guide.xml \ No newline at end of file diff --git a/DOCS/xml/es/radio.xml b/DOCS/xml/es/radio.xml new file mode 120000 index 0000000000..8fd21a7d6b --- /dev/null +++ b/DOCS/xml/es/radio.xml @@ -0,0 +1 @@ +../en/radio.xml \ No newline at end of file diff --git a/DOCS/xml/it/ports.xml b/DOCS/xml/it/ports.xml new file mode 120000 index 0000000000..59b479c2ac --- /dev/null +++ b/DOCS/xml/it/ports.xml @@ -0,0 +1 @@ +../en/ports.xml \ No newline at end of file diff --git a/DOCS/xml/it/skin.xml b/DOCS/xml/it/skin.xml new file mode 120000 index 0000000000..3895b649ac --- /dev/null +++ b/DOCS/xml/it/skin.xml @@ -0,0 +1 @@ +../en/skin.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/encoding-guide.xml b/DOCS/xml/zh_CN/encoding-guide.xml new file mode 120000 index 0000000000..9c2c8fab3c --- /dev/null +++ b/DOCS/xml/zh_CN/encoding-guide.xml @@ -0,0 +1 @@ +../en/encoding-guide.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/faq.xml b/DOCS/xml/zh_CN/faq.xml new file mode 120000 index 0000000000..db2ee411a0 --- /dev/null +++ b/DOCS/xml/zh_CN/faq.xml @@ -0,0 +1 @@ +../en/faq.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/install.xml b/DOCS/xml/zh_CN/install.xml new file mode 120000 index 0000000000..64490ec871 --- /dev/null +++ b/DOCS/xml/zh_CN/install.xml @@ -0,0 +1 @@ +../en/install.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/ports.xml b/DOCS/xml/zh_CN/ports.xml new file mode 120000 index 0000000000..59b479c2ac --- /dev/null +++ b/DOCS/xml/zh_CN/ports.xml @@ -0,0 +1 @@ +../en/ports.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/skin.xml b/DOCS/xml/zh_CN/skin.xml new file mode 120000 index 0000000000..3895b649ac --- /dev/null +++ b/DOCS/xml/zh_CN/skin.xml @@ -0,0 +1 @@ +../en/skin.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/tvinput.xml b/DOCS/xml/zh_CN/tvinput.xml new file mode 120000 index 0000000000..3daed4bafe --- /dev/null +++ b/DOCS/xml/zh_CN/tvinput.xml @@ -0,0 +1 @@ +../en/tvinput.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/usage.xml b/DOCS/xml/zh_CN/usage.xml new file mode 120000 index 0000000000..5ba779b62a --- /dev/null +++ b/DOCS/xml/zh_CN/usage.xml @@ -0,0 +1 @@ +../en/usage.xml \ No newline at end of file diff --git a/DOCS/xml/zh_CN/video.xml b/DOCS/xml/zh_CN/video.xml new file mode 120000 index 0000000000..307779ea44 --- /dev/null +++ b/DOCS/xml/zh_CN/video.xml @@ -0,0 +1 @@ +../en/video.xml \ No newline at end of file -- cgit v1.2.3