Pass a language variable to submakes instead of reading subdirectory Makefiles.

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

12 files changed, 18 insertions, 55 deletions

diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile
index c68c1b9570..795c4c6f59 100644
--- a/DOCS/xml/Makefile
+++ b/DOCS/xml/Makefile
@@ -40,10 +40,10 @@ define lang-def
 html-chunked-$(lang) html-single-$(lang): $(HTML)/$(lang) $(CONFIGURE_GENERATED)
 
 html-chunked-$(lang):
-	$(MAKE) HTMLDIR=../$$< -C $(lang) html-chunked
+	$(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-chunked
 
 html-single-$(lang):
-	$(MAKE) HTMLDIR=../$$< -C $(lang) html-single
+	$(MAKE) HTMLDIR=$$< LANG=$(lang) -f Makefile.inc html-single
 
 xmllint-$(lang): xmllint.sh
 	$(MAKE) -C $(lang) xmllint
diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc
index 44e022d56c..1cf2dcfbbd 100644
--- a/DOCS/xml/Makefile.inc
+++ b/DOCS/xml/Makefile.inc
@@ -2,30 +2,33 @@
 # Makefile.inc for Makefiles in subdirectories.
 #
 
-HTML_CHUNK_XSL := ../html-chunk.xsl
-CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-common.xsl
+# Dependency information.
+$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml)
 
-HTML_SINGLE_XSL := ../html-single.xsl
-SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl
+HTML_CHUNK_XSL := html-chunk.xsl
+CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) html-common.xsl
+
+HTML_SINGLE_XSL := html-single.xsl
+SINGLE_XSL_DEPS := $(HTML_SINGLE_XSL) html-common.xsl
 
 # This is the main target...
 all: html-chunked html-single
 html-chunked: $(HTMLDIR)/index.html
 html-single:  $(HTMLDIR)/MPlayer.html
 
-xmllint: main.xml
-	../xmllint.sh $<
+xmllint: $(LANG)/main.xml
+	./xmllint.sh $<
 
 $(HTMLDIR)/default.css:
-	cp -f ../default.css $(@D)
+	cp -f default.css $(@D)
 
-$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css
-	../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
+$(HTMLDIR)/index.html: $(LANG)/main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css
+	./xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
 
-$(HTMLDIR)/MPlayer.html: main.xml $(SINGLE_XSL_DEPS) xmllint $(HTMLDIR)/default.css
-	../xsltproc.sh $@ $(HTML_SINGLE_XSL) $<
+$(HTMLDIR)/MPlayer.html: $(LANG)/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
+html-chunk.xsl html-single.xsl $(LANG)/main.xml:
+	sh configure
 
 .PHONY: all html-chunked html-single xmllint
diff --git a/DOCS/xml/cs/Makefile b/DOCS/xml/cs/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/cs/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/de/Makefile b/DOCS/xml/de/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/de/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/en/Makefile b/DOCS/xml/en/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/en/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/es/Makefile b/DOCS/xml/es/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/es/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/fr/Makefile b/DOCS/xml/fr/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/fr/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/hu/Makefile b/DOCS/xml/hu/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/hu/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/it/Makefile b/DOCS/xml/it/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/it/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/pl/Makefile b/DOCS/xml/pl/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/pl/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc
diff --git a/DOCS/xml/ru/Makefile b/DOCS/xml/ru/Makefile
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/ru/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(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
deleted file mode 100644
index db38611f41..0000000000
--- a/DOCS/xml/zh_CN/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dependency information.
-$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard *.xml)
-
-include ../Makefile.inc