Mercurial > mplayer.hg

changeset 11887:b09020364bfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplifications and bug fixes by Torinthiel.
author diego
date Fri, 30 Jan 2004 08:40:47 +0000
parents 0d60e54ce395
children c0bb03056667
files DOCS/xml/Makefile.inc
diffstat 1 files changed, 20 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/Makefile.inc	Fri Jan 30 03:44:00 2004 +0000
+++ b/DOCS/xml/Makefile.inc	Fri Jan 30 08:40:47 2004 +0000
@@ -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-common.xsl,$(wildcard html-common.xsl))
+COMMON_XSL_DEPS := html-common.xsl ../html-common.xsl
+else
+COMMON_XSL_DEPS := ../html-common.xsl
+endif
+
 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
-else
-CHUNK_XSL_DEPS := $(HTML_CHUNK_XSL) ../html-chunk.xsl ../html-common.xsl
-endif
+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 @@
 
 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 @@
 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 @@
 	../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 \