Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / pictures / GNUmakefile

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 301dccf5124466ab1d651fe6b1867780151cd867..c0f8fd9dd6d8589a6f31f402e565145b4ceb52de 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -4,13 +4,14 @@ depth = ../..
 BITMAP_IMAGES = $(call src-wildcard,*.png) $(call src-wildcard,*.jpg)
 EPS_ILLUSTRATIONS = $(call src-wildcard,*.eps)
 SVG_FILES = $(call src-wildcard,*.svg)
+PDF_DIR = $(call src-wildcard,pdf/*.pdf)
 
 EXTRA_DIST_FILES = $(BITMAP_IMAGES) $(EPS_ILLUSTRATIONS) $(SVG_FILES)
+EXTRA_DIST_FILES += $(PDF_DIR)
 
 OUT_PDF_IMAGES = $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.pdf)
 OUT_BITMAP_IMAGES = $(BITMAP_IMAGES:%=$(outdir)/%)
 OUT_BITMAP_IMAGES += $(EPS_ILLUSTRATIONS:%.pdf=$(outdir)/%.png)
-OUT_SVG_IMAGES = $(SVG_FILES:%.svg=$(outdir)/%.png)
 
 STEPMAKE_TEMPLATES = documentation
 
@@ -22,7 +23,7 @@ include $(depth)/make/stepmake.make
 default:
 
 ifeq ($(out),www)
-local-WWW-1: $(OUT_BITMAP_IMAGES) $(OUT_PDF_IMAGES) $(OUT_SVG_IMAGES)
+local-WWW-1: $(OUT_BITMAP_IMAGES) $(OUT_PDF_IMAGES)
 endif
 
 #########
@@ -34,9 +35,6 @@ $(outdir)/%-flat-gray.png: %-flat-gray.png
 $(outdir)/%-flat-bw.png: %-flat-bw.png
        convert -depth 8 -geometry 50x50% $< $@
 
-$(outdir)/%.png: %.svg
-       convert -depth 8 -alpha Off -background white -layers flatten -trim -page +0+0 $< $@
-
 $(outdir)/%.png: %.png
        ln -f $< $@