(OUT_PNG_IMAGES): generate PNG

out image for illustration too.
($(outdir)/%.png): add more png <-> eps rules.

diff --git a/ChangeLog b/ChangeLog
index 101969076e40429039116fbb1bd44a73d056b6dd..7efc86633abd11a48a83f33f1f9665c4b31b0e0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-18  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * Documentation/user/GNUmakefile (OUT_PNG_IMAGES): generate PNG
+       out image for illustration too.
+       ($(outdir)/%.png): add more png <-> eps rules. 
+
 2006-05-17  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/ various: remove trailing whitespace, cosmetic

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index a56214436c8d7c35a5ce58742555826b3017036b..e2bff524c10fe57a62be30acfd9e87b21dae07f0 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -5,13 +5,14 @@ LATEX_FILES =$(call src-wildcard,*.latex)
 # todo: add latex.
 DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(ILLUSTRATIONS)
+EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(EPS_ILLUSTRATIONS)
 
 IMAGES=$(call src-wildcard,*.png)
-ILLUSTRATIONS=context-example.eps
+EPS_ILLUSTRATIONS=context-example.eps
+
+OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps) $(addprefix $(outdir)/,$(EPS_ILLUSTRATIONS))
+OUT_PNG_IMAGES=$(OUT_EPS_IMAGES:%.eps=%.png)
 
-OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps)
-OUT_PNG_IMAGES=$(IMAGES:%=$(outdir)/%)
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
 HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
@@ -150,7 +151,7 @@ $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 #
 # The split user manual
 #
-$(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
+$(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
        find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
@@ -199,9 +200,15 @@ $(outdir)/lilypond.dvi: $(OUT_EPS_IMAGES) $(OUT_PNG_IMAGES)
 $(outdir)/%.png: %.png
        convert -geometry 50x50% $< $@
 
+$(outdir)/%.png: %.eps
+       convert $< $@
+
 $(outdir)/%.eps: %.png
        convert $< $@
 
+$(outdir)/%.eps: %.eps
+       cp $< $@
+
 DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
  $(outdir)/lilypond-internals/index.html\