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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30014 b3059339-0415-0410-9bf9-f77b7e298cf2

12 files changed, 13 insertions, 23 deletions

diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile
index c7ce2e99f9..e9b0b2288f 100644
--- a/DOCS/xml/Makefile
+++ b/DOCS/xml/Makefile
@@ -41,7 +41,7 @@ html-chunked-$(1): $(HTML)/$(1) xsltproc.sh xmllint.sh
 	$(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
diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc
index 30c18d7535..d509d42e53 100644
--- a/DOCS/xml/Makefile.inc
+++ b/DOCS/xml/Makefile.inc
@@ -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_XSL_DEPS) $(SYMLINKS_DEPS) xmllint
 	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) $<
 
diff --git a/DOCS/xml/cs/Makefile b/DOCS/xml/cs/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/cs/Makefile
+++ b/DOCS/xml/cs/Makefile
@@ -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
diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/de/Makefile
+++ b/DOCS/xml/de/Makefile
@@ -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
diff --git a/DOCS/xml/en/Makefile b/DOCS/xml/en/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/en/Makefile
+++ b/DOCS/xml/en/Makefile
@@ -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
diff --git a/DOCS/xml/es/Makefile b/DOCS/xml/es/Makefile
index e18885f6df..11dc2e788f 100644
--- a/DOCS/xml/es/Makefile
+++ b/DOCS/xml/es/Makefile
@@ -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
diff --git a/DOCS/xml/fr/Makefile b/DOCS/xml/fr/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/fr/Makefile
+++ b/DOCS/xml/fr/Makefile
@@ -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
diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/hu/Makefile
+++ b/DOCS/xml/hu/Makefile
@@ -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
diff --git a/DOCS/xml/it/Makefile b/DOCS/xml/it/Makefile
index e18885f6df..11dc2e788f 100644
--- a/DOCS/xml/it/Makefile
+++ b/DOCS/xml/it/Makefile
@@ -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
diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/pl/Makefile
+++ b/DOCS/xml/pl/Makefile
@@ -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
diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile
index e36fbfffa5..ea6cc92bcb 100644
--- a/DOCS/xml/ru/Makefile
+++ b/DOCS/xml/ru/Makefile
@@ -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
diff --git a/DOCS/xml/zh_CN/Makefile b/DOCS/xml/zh_CN/Makefile
index e18885f6df..11dc2e788f 100644
--- a/DOCS/xml/zh_CN/Makefile
+++ b/DOCS/xml/zh_CN/Makefile
@@ -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