[MPlayer-DOCS] r31133 - in trunk/DOCS/xml: Makefile Makefile.inc es es/encoding-guide.xml es/radio.xml it it/ports.xml it/skin.xml zh_CN zh_CN/encoding-guide.xml zh_CN/faq.xml zh_CN/install.xml zh_CN/ports.xml zh...

diego subversion at mplayerhq.hu
Tue May 4 01:00:59 CEST 2010


Author: diego
Date: Tue May  4 01:00:58 2010
New Revision: 31133

Log:
Put symlinks under revision control instead of generating them during make.
This simplifies the build system and should have no practical disadvantage.

Modified:
   trunk/DOCS/xml/Makefile
   trunk/DOCS/xml/Makefile.inc
   trunk/DOCS/xml/es/   (props changed)
   trunk/DOCS/xml/it/   (props changed)
   trunk/DOCS/xml/zh_CN/   (props changed)

Changes in other areas also in this revision:
Added:
   trunk/DOCS/xml/es/encoding-guide.xml   (contents, props changed)
   trunk/DOCS/xml/es/radio.xml   (contents, props changed)
   trunk/DOCS/xml/it/ports.xml   (contents, props changed)
   trunk/DOCS/xml/it/skin.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/encoding-guide.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/faq.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/install.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/ports.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/skin.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/tvinput.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/usage.xml   (contents, props changed)
   trunk/DOCS/xml/zh_CN/video.xml   (contents, props changed)

Modified: trunk/DOCS/xml/Makefile
==============================================================================
--- trunk/DOCS/xml/Makefile	Tue May  4 00:45:00 2010	(r31132)
+++ trunk/DOCS/xml/Makefile	Tue May  4 01:00:58 2010	(r31133)
@@ -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
 

Modified: trunk/DOCS/xml/Makefile.inc
==============================================================================
--- trunk/DOCS/xml/Makefile.inc	Tue May  4 00:45:00 2010	(r31132)
+++ trunk/DOCS/xml/Makefile.inc	Tue May  4 01:00:58 2010	(r31133)
@@ -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


More information about the MPlayer-DOCS mailing list