From 23cdbb74faf0266a4d16f13e82c4d3caf584f97d Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 10 May 2010 23:39:16 +0000 Subject: 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 --- DOCS/xml/Makefile.inc | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'DOCS/xml/Makefile.inc') 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 -- cgit v1.2.3 From e3d4e1a3cec01e18ea0a3bc4f4cd60247c1ae754 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 11:52:41 +0000 Subject: Get rid of pointless variable indirection for XSL stylesheets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31159 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'DOCS/xml/Makefile.inc') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc index 1cf2dcfbbd..95af9702d9 100644 --- a/DOCS/xml/Makefile.inc +++ b/DOCS/xml/Makefile.inc @@ -5,12 +5,6 @@ # Dependency information. $(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml) -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 @@ -22,11 +16,11 @@ xmllint: $(LANG)/main.xml $(HTMLDIR)/default.css: cp -f default.css $(@D) -$(HTMLDIR)/index.html: $(LANG)/main.xml $(CHUNK_XSL_DEPS) xmllint $(HTMLDIR)/default.css - ./xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $< +$(HTMLDIR)/index.html: $(LANG)/main.xml html-chunk.xsl html-common.xsl $(HTMLDIR)/default.css xmllint + ./xsltproc.sh $(HTMLDIR)/ html-chunk.xsl $< -$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml $(SINGLE_XSL_DEPS) xmllint $(HTMLDIR)/default.css - ./xsltproc.sh $@ $(HTML_SINGLE_XSL) $< +$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml html-single.xsl html-common.xsl $(HTMLDIR)/default.css xmllint + ./xsltproc.sh $@ html-single.xsl $< html-chunk.xsl html-single.xsl $(LANG)/main.xml: sh configure -- cgit v1.2.3 From 8de8a1c713af2d21cdb546ca4244bbb2f919b7f9 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 11 May 2010 13:13:32 +0000 Subject: Make XML documentation build process nonrecursive. This greatly simplifies the documentation build process and the Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31160 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile.inc | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 DOCS/xml/Makefile.inc (limited to 'DOCS/xml/Makefile.inc') diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc deleted file mode 100644 index 95af9702d9..0000000000 --- a/DOCS/xml/Makefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -# -# Makefile.inc for Makefiles in subdirectories. -# - -# Dependency information. -$(HTMLDIR)/index.html $(HTMLDIR)/MPlayer.html: $(wildcard $(LANG)/*.xml) - -# This is the main target... -all: html-chunked html-single -html-chunked: $(HTMLDIR)/index.html -html-single: $(HTMLDIR)/MPlayer.html - -xmllint: $(LANG)/main.xml - ./xmllint.sh $< - -$(HTMLDIR)/default.css: - cp -f default.css $(@D) - -$(HTMLDIR)/index.html: $(LANG)/main.xml html-chunk.xsl html-common.xsl $(HTMLDIR)/default.css xmllint - ./xsltproc.sh $(HTMLDIR)/ html-chunk.xsl $< - -$(HTMLDIR)/MPlayer.html: $(LANG)/main.xml html-single.xsl html-common.xsl $(HTMLDIR)/default.css xmllint - ./xsltproc.sh $@ html-single.xsl $< - -html-chunk.xsl html-single.xsl $(LANG)/main.xml: - sh configure - -.PHONY: all html-chunked html-single xmllint -- cgit v1.2.3