summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-30 08:40:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-30 08:40:47 +0000
commitef80b86405bcdb57805f39bee82b95f4c1a8e53e (patch)
tree27b8fdec60c273e57ba4c659d276e5f36a14360c /DOCS
parentdf5c60506d9b8d40716d3d5ac90e33b44a5c3742 (diff)
downloadmpv-ef80b86405bcdb57805f39bee82b95f4c1a8e53e.tar.bz2
mpv-ef80b86405bcdb57805f39bee82b95f4c1a8e53e.tar.xz
Simplifications and bug fixes by Torinthiel.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11888 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/Makefile.inc40
1 files changed, 19 insertions, 21 deletions
diff --git a/DOCS/xml/Makefile.inc b/DOCS/xml/Makefile.inc
index c654875bac..4ae7c65b24 100644
--- a/DOCS/xml/Makefile.inc
+++ b/DOCS/xml/Makefile.inc
@@ -4,13 +4,15 @@
# Use customized html-chunk.xsl and/or html-single.xsl file if they exist...
# Also add html-common.xsl to depends if it exists.
-ifeq (html-chunk.xsl,$(wildcard html-chunk.xsl))
-HTML_CHUNK_XSL := html-chunk.xsl
ifeq (html-common.xsl,$(wildcard html-common.xsl))
-CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) html-common.xsl ../html-chunk.xsl ../html-common.xsl
+COMMON_XSL_DEPS := html-common.xsl ../html-common.xsl
else
-CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-chunk.xsl ../html-common.xsl
+COMMON_XSL_DEPS := ../html-common.xsl
endif
+
+ifeq (html-chunk.xsl,$(wildcard html-chunk.xsl))
+HTML_CHUNK_XSL := html-chunk.xsl
+CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-chunk.xsl $(COMMON_XSL_DEPS)
else
HTML_CHUNK_XSL := ../html-chunk.xsl
CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-common.xsl
@@ -18,11 +20,7 @@ endif
ifeq (html-single.xsl,$(wildcard html-single.xsl))
HTML_SINGLE_XSL := html-single.xsl
-ifeq (html-common.xsl,$(wildcard html-common.xsl))
-XSL_DEPS := $(HTML_SINGLE_XSL) html-common.xsl ../html-single.xsl ../html-common.xsl
-else
-XSL_DEPS := $(HTML_SINGLE_XSL) ../html-single.xsl ../html-common.xsl
-endif
+XSL_DEPS := $(HTML_SINGLE_XSL) ../html-single.xsl $(COMMON_XSL_DEPS)
else
HTML_SINGLE_XSL := ../html-single.xsl
XSL_DEPS := $(HTML_SINGLE_XSL) ../html-common.xsl
@@ -32,17 +30,18 @@ endif
HTML_STYLESHEET ?= ../default.css
# This is the main target...
+.PHONY: all html-chunked html-single
all: html-chunked html-single
html-chunked: $(HTMLDIR)/index.html
html-single: $(HTMLFILE)
$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS)
- if test "$(HTMLDIR)" = "" ; then \
- echo "Error: HTMLDIR not set!!!"; \
- echo "Typically this means, that you've run make from a subdir of DOCS/xml."; \
- echo "Don't do this!"; \
- false; \
- fi
+ifndef HTMLDIR
+ $(warning $(HTMLDIR))
+ $(warning Error: HTMLDIR not set!!!)
+ $(warning Typically this means, that you've run make from a subdir of DOCS/xml.)
+ $(error Don't do this!)
+endif
if test "$(USE_SYMLINKS)" = "yes" ; then \
for file in ../en/*.xml ; do \
if ! test -r `basename $$file` ; then \
@@ -56,12 +55,11 @@ $(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS)
../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
$(HTMLFILE): main.xml $(XSL_DEPS)
- if test "$(HTMLFILE)" = "" ; then \
- echo "Error: HTMLFILE not set!!!"; \
- echo "Typically this means, that you've run make from a subdir of DOCS/xml."; \
- echo "Don't do this!"; \
- false; \
- fi
+ifndef HTMLFILE
+ $(warning Error: HTMLFILE not set!!!)
+ $(warning Typically this means, that you've run make from a subdir of DOCS/xml.)
+ $(error Don't do this!)
+endif
if test "$(USE_SYMLINKS)" = "yes" ; then \
for file in ../en/*.xml ; do \
if ! test -r `basename $$file` ; then \