1.1 --- a/en/Makefile	Wed Oct 18 12:06:56 2006 -0700
     1.2 +++ b/en/Makefile	Thu Oct 19 15:18:07 2006 -0700
     1.3 @@ -19,11 +19,15 @@
     1.4  	tour-merge.tex
     1.5  
     1.6  image-sources := \
     1.7 +	kdiff3.png \
     1.8  	mq-stack.svg \
     1.9  	tour-history.svg \
    1.10 -	tour-merge-sep-repos.svg \
    1.11 +	tour-merge-conflict.svg \
    1.12 +	tour-merge-merge.svg \
    1.13  	tour-merge-pull.svg \
    1.14 -	tour-merge-merge.svg
    1.15 +	tour-merge-sep-repos.svg
    1.16 +
    1.17 +image-svg := $(filter %.svg,$(image-sources))
    1.18  
    1.19  example-sources := \
    1.20  	daily.files \
    1.21 @@ -38,7 +42,8 @@
    1.22  	mq.tutorial \
    1.23  	template.simple \
    1.24  	template.svnstyle \
    1.25 -	tour
    1.26 +	tour \
    1.27 +	tour-merge-conflict
    1.28  
    1.29  latex-options = \
    1.30  	-interaction batchmode \
    1.31 @@ -134,5 +139,7 @@
    1.32  	echo -n $(hg_id) > build_id.tex
    1.33  
    1.34  clean:
    1.35 -	rm -rf beta html pdf *.eps *.pdf *.png *.aux *.dvi *.log *.out \
    1.36 +	rm -rf beta html pdf \
    1.37 +		$(image-svg:%.svg=%.pdf) \
    1.38 +		$(image-svg:%.svg=%.png) \
    1.39  		examples/*.{out,run} examples/.run build_id.tex