[MPlayer-DOCS] r30014 - in trunk/DOCS/xml: Makefile Makefile.inc cs/Makefile de/Makefile en/Makefile es/Makefile fr/Makefile hu/Makefile it/Makefile pl/Makefile ru/Makefile zh_CN/Makefile

[diego]

Author: diego
Date: Mon Dec 14 01:16:32 2009
New Revision: 30014

Log:
Construct monolithic targets with the HTMLDIR instead of the HTMLFILE variable.

Modified:
   trunk/DOCS/xml/Makefile
   trunk/DOCS/xml/Makefile.inc
   trunk/DOCS/xml/en/Makefile

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/cs/Makefile
   trunk/DOCS/xml/de/Makefile
   trunk/DOCS/xml/es/Makefile
   trunk/DOCS/xml/fr/Makefile
   trunk/DOCS/xml/hu/Makefile
   trunk/DOCS/xml/it/Makefile
   trunk/DOCS/xml/pl/Makefile
   trunk/DOCS/xml/ru/Makefile
   trunk/DOCS/xml/zh_CN/Makefile

Modified: trunk/DOCS/xml/Makefile
==============================================================================
--- trunk/DOCS/xml/Makefile	Mon Dec 14 00:59:10 2009	(r30013)
+++ trunk/DOCS/xml/Makefile	Mon Dec 14 01:16:32 2009	(r30014)
@@ -41,7 +41,7 @@ html-chunked-$(1): $(HTML)/$(1) xsltproc
 	$(MAKE) HTMLDIR=../$$< -C $(1) html-chunked
 
 html-single-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh
-	$(MAKE) HTMLFILE=../$$</MPlayer.html -C $(1) html-single
+	$(MAKE) HTMLDIR=../$$< -C $(1) html-single
 
 xmllint-$(1): xmllint.sh
 	$(MAKE) -C $(1) xmllint

Modified: trunk/DOCS/xml/Makefile.inc
==============================================================================
--- trunk/DOCS/xml/Makefile.inc	Mon Dec 14 00:59:10 2009	(r30013)
+++ trunk/DOCS/xml/Makefile.inc	Mon Dec 14 01:16:32 2009	(r30014)
@@ -28,7 +28,7 @@ HTML_STYLESHEET ?= ../default.css
 # This is the main target...
 all: html-chunked html-single
 html-chunked: $(HTMLDIR)/index.html
-html-single: $(HTMLFILE)
+html-single:  $(HTMLDIR)/MPlayer.html
 
 SYMLINKS_DEPS:=$(if $(findstring yes,$(USE_SYMLINKS)), $(patsubst ../en/%,%,$(wildcard ../en/*.xml)))
 
@@ -39,7 +39,7 @@ $(HTMLDIR)/index.html: main.xml $(CHUNK_
 	cp -f $(HTML_STYLESHEET) $(@D)
 	../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
 
-$(HTMLFILE): main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint
+$(HTMLDIR)/MPlayer.html: main.xml $(XSL_DEPS) $(SYMLINKS_DEPS) xmllint
 	cp -f $(HTML_STYLESHEET) $(@D)
 	../xsltproc.sh $@ $(HTML_SINGLE_XSL) $<
 

Modified: trunk/DOCS/xml/en/Makefile
==============================================================================
--- trunk/DOCS/xml/en/Makefile	Mon Dec 14 00:59:10 2009	(r30013)
+++ trunk/DOCS/xml/en/Makefile	Mon Dec 14 01:16:32 2009	(r30014)
@@ -5,7 +5,6 @@
 USE_SYMLINKS = no
 
 # Dependency information.
-$(HTMLDIR)/index.html: $(wildcard *.xml)
-$(HTMLFILE): $(wildcard *.xml)
+$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
 
 include ../Makefile.inc