changeset 29972:03e8eec6e104

Construct monolithic targets with the HTMLDIR instead of the HTMLFILE variable.
author diego
date Mon, 14 Dec 2009 00:16:32 +0000
parents 582d78986e87
children 113ab3d1feab
files DOCS/xml/Makefile DOCS/xml/Makefile.inc DOCS/xml/cs/Makefile DOCS/xml/de/Makefile DOCS/xml/en/Makefile DOCS/xml/es/Makefile DOCS/xml/fr/Makefile DOCS/xml/hu/Makefile DOCS/xml/it/Makefile DOCS/xml/pl/Makefile DOCS/xml/ru/Makefile DOCS/xml/zh_CN/Makefile
diffstat 12 files changed, 13 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -41,7 +41,7 @@
 	$(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
--- a/DOCS/xml/Makefile.inc	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/Makefile.inc	Mon Dec 14 00:16:32 2009 +0000
@@ -28,7 +28,7 @@
 # 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 @@
 	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) $<
 
--- a/DOCS/xml/cs/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/cs/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/de/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/de/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/en/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/en/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/es/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/es/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -5,7 +5,6 @@
 USE_SYMLINKS = yes
 
 # Dependency information.
-$(HTMLDIR)/index.html: $(wildcard *.xml)
-$(HTMLFILE): $(wildcard *.xml)
+$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
 
 include ../Makefile.inc
--- a/DOCS/xml/fr/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/fr/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/hu/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/hu/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/it/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/it/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -5,7 +5,6 @@
 USE_SYMLINKS = yes
 
 # Dependency information.
-$(HTMLDIR)/index.html: $(wildcard *.xml)
-$(HTMLFILE): $(wildcard *.xml)
+$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
 
 include ../Makefile.inc
--- a/DOCS/xml/pl/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/pl/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/ru/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/ru/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -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
--- a/DOCS/xml/zh_CN/Makefile	Sun Dec 13 23:59:10 2009 +0000
+++ b/DOCS/xml/zh_CN/Makefile	Mon Dec 14 00:16:32 2009 +0000
@@ -5,7 +5,6 @@
 USE_SYMLINKS = yes
 
 # Dependency information.
-$(HTMLDIR)/index.html: $(wildcard *.xml)
-$(HTMLFILE): $(wildcard *.xml)
+$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
 
 include ../Makefile.inc