From 8c90e4efac0607bde661242bab34798a986f91a5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 18 May 2006 11:24:56 +0000 Subject: [PATCH] (OUT_PNG_IMAGES): generate PNG out image for illustration too. ($(outdir)/%.png): add more png <-> eps rules. --- ChangeLog | 6 ++++++ Documentation/user/GNUmakefile | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 101969076e..7efc86633a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-18 Han-Wen Nienhuys + + * 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 * Documentation/user/ various: remove trailing whitespace, cosmetic diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index a56214436c..e2bff524c1 100644 --- 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\ -- 2.39.2