1.1 --- a/en/Makefile	Wed May 09 14:35:23 2007 -0700
     1.2 +++ b/en/Makefile	Wed May 09 15:17:10 2007 -0700
     1.3 @@ -52,6 +52,9 @@
     1.4  image-svg := $(filter %.svg,$(image-sources))
     1.5  image-png := $(filter %.png,$(image-sources))
     1.6  
     1.7 +image-pdf := $(image-dot:%.dot=%.pdf) $(image-svg:%.svg=%.pdf) $(image-png)
     1.8 +image-html := $(image-dot:%.dot=%.png) $(image-svg:%.svg=%.png) $(image-png)
     1.9 +
    1.10  example-sources := \
    1.11  	backout \
    1.12  	bisect \
    1.13 @@ -118,8 +121,6 @@
    1.14  	if grep 'Reference.*undefined' $(@:.pdf=.log); then exit 1; fi
    1.15  endef
    1.16  
    1.17 -image-pdf := $(image-dot:%.dot=%.pdf) $(image-svg:%.svg=%.pdf) $(image-png)
    1.18 -
    1.19  pdf/hgbook.pdf: $(sources) $(image-pdf) examples
    1.20  	$(call pdf)
    1.21  
    1.22 @@ -127,9 +128,15 @@
    1.23  
    1.24  htlatex := /usr/bin/htlatex
    1.25  
    1.26 -onepage: $(htlatex) html/onepage/hgbook.html
    1.27 -
    1.28 -split: $(htlatex) html/split/hgbook.html
    1.29 +onepage: $(htlatex) html/onepage/hgbook.html html/onepage/hgbook.css $(image-html:%=html/onepage/%)
    1.30 +
    1.31 +html/onepage/%: %
    1.32 +	cp $< $@
    1.33 +
    1.34 +split: $(htlatex) html/split/hgbook.html html/split/hgbook.css $(image-html:%=html/split/%)
    1.35 +
    1.36 +html/split/%: %
    1.37 +	cp $< $@
    1.38  
    1.39  # This is a horrible hack to work around the fact that the htlatex
    1.40  # command in tex4ht is itself a horrible hack.  I really don't want to
    1.41 @@ -145,17 +152,11 @@
    1.42  	./fixhtml.py $(dir $(1))/*.html
    1.43  endef
    1.44  
    1.45 -image-html := $(image-dot:%.dot=%.png) $(image-svg:%.svg=%.png) $(image-png)
    1.46 -
    1.47 -html/onepage/hgbook.html: $(sources) $(image-html) examples hgbook.css bookhtml.cfg
    1.48 +html/onepage/hgbook.html: $(sources) $(image-html) examples bookhtml.cfg
    1.49  	$(call htlatex,$@,$<)
    1.50 -	cp $(image-sources:%.svg=%.png) $(dir $@)
    1.51 -	cp hgbook.css $(dir $@)
    1.52 -
    1.53 -html/split/hgbook.html: $(sources) $(image-html) examples hgbook.css bookhtml.cfg
    1.54 +
    1.55 +html/split/hgbook.html: $(sources) examples bookhtml.cfg
    1.56  	$(call htlatex,$@,$<,2)
    1.57 -	cp $(image-sources:%.svg=%.png) $(dir $@)
    1.58 -	cp hgbook.css $(dir $@)
    1.59  
    1.60  # Produce 90dpi PNGs for the web.
    1.61