Whamcloud - gitweb
LUDOC-13 build: Disable diff in Makefile 79/2179/3
authorRichard Henwood <rhenwood@whamcloud.com>
Wed, 22 Feb 2012 18:23:25 +0000 (12:23 -0600)
committerRichard Henwood <rhenwood@whamcloud.com>
Wed, 22 Feb 2012 20:26:44 +0000 (14:26 -0600)
If diff fails, the build is marked as failing. Make all now doesn't
have diff enabled until it has had the bugs worked out.

Added epub to clean.

Signed-off-by: Richard Henwood <rhenwood@whamcloud.com>
Change-Id: I11464045679ea02105f0baebeddc7d2a6f86d80c

Makefile

index 5f30015..7570a8a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,14 +27,14 @@ XSL=$(or $(shell ls -d $(XSL_UBN) 2> /dev/null), \
         $(shell ls -d $(XSL_MAC) 2> /dev/null))
 
 .PHONY: all
-all: clean check xhtml html pdf epub diff
+all: clean check xhtml html pdf epub
 
 .PHONY: check
 check: $(SRC_XML)
        xmllint --noout --xinclude --noent --relaxng $(RNG) ./index.xml
 
 # Note: can't use "suffix" instead of "subst", because it keeps the '.'
-$(TGT_BASE).html $(TGT_BASE).xhtml $(TGT_BASE).fo $(TGT_BASE).epub: $(SRCS)
+$(TGT_BASE).html $(TGT_BASE).xhtml $(TGT_BASE).epub $(TGT_BASE).fo: $(SRCS)
        xsltproc --stringparam fop1.extensions  1 \
                --stringparam section.label.includes.component.label 1 \
                --stringparam section.autolabel 1 \
@@ -90,5 +90,5 @@ push:
 clean:
        rm -f $(TGT_BASE).html $(TGT_BASE).xhtml $(TGT_BASE).pdf\
                mastermanual.revision mastermanual.index mimetype\
-               $(TGT_BASE).diff.html
+               $(TGT_BASE).diff.html $(TGT_BASE).epub
        rm -rf ./META-INF ./OEBPS