X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fpictures%2FGNUmakefile;h=131de3e32383b152b7a9fb22925544fc58f20153;hb=f493a944c074157669b020cfc28112f68a37829b;hp=d6cca648e276994d849405733fca6280884ec01a;hpb=1efdabf3b2349ea7fa3183dca5bba5104c347c36;p=lilypond.git

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index d6cca648e2..131de3e323 100644
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -1,16 +1,13 @@
 depth = ../..
 
-
 BITMAP_IMAGES = $(call src-wildcard,*.png) $(call src-wildcard,*.jpg)
 EPS_ILLUSTRATIONS = $(call src-wildcard,*.eps)
 SVG_FILES = $(call src-wildcard,*.svg)
-
-EXTRA_DIST_FILES = $(BITMAP_IMAGES) $(EPS_ILLUSTRATIONS) $(SVG_FILES)
+PDF_DIR = $(call src-wildcard,pdf/*.pdf)
 
 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)
+OUT_BITMAP_IMAGES += $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.png)
 
 STEPMAKE_TEMPLATES = documentation
 
@@ -22,7 +19,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 +31,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 +repage $< $@
-
 $(outdir)/%.png: %.png
 	ln -f $< $@
 
@@ -47,5 +41,5 @@ $(outdir)/%.png: %.eps
 	gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
 
 $(outdir)/%.pdf: %.eps
-	gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
+	gs -dAutoRotatePages=/None -q -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<