X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fpictures%2FGNUmakefile;h=8ae3e463bbe15e7aed5486ded25c7e5a2b2209bf;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=30873a98e33e431bff5008739ceba7f9eda2ee9f;hpb=d232ec8f99f1bcdf4781119ba28fc94a24a1e8db;p=lilypond.git

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 30873a98e3..8ae3e463bb 100644
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -1,44 +1,47 @@
 depth = ../..
 
-STEPMAKE_TEMPLATES=documentation
-XPM_FILES=$(wildcard *.xpm)
-OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif))
-OUTPNG_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.png))
+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= $(XPM_FILES)
-OUT_DIST_FILES = $(icon) #$(package-icon)
+OUT_PDF_IMAGES = $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.pdf)
+OUT_BITMAP_IMAGES = $(BITMAP_IMAGES:%=$(outdir)/%)
+OUT_BITMAP_IMAGES += $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.png)
 
-icon = $(outdir)/lilypond.ico
-ICON_SIZES=48 32 16
-
-#$(outdir)/lilypond.ico: platte-lucht-kikker-ly-48.xpm
+STEPMAKE_TEMPLATES = documentation
 
 include $(depth)/make/stepmake.make
 
-default: $(icon)
-local-dist: $(icon) # $(package-icon)
+###########
+### Targets
+
+default:
+
+ifeq ($(out),www)
+local-WWW-1: $(OUT_BITMAP_IMAGES) $(OUT_PDF_IMAGES) $(outdir)/pdf
+endif
 
-$(outdir)/%.ico: $(ICON_SIZES:%=$(outdir)/\%-%.png) $(ICON_SIZES:%=$(outdir)/\%-%-8.png)
-	#convert +adjoin $^ $@
-	icotool --output=$@ --create $^
+#########
+### Rules
 
-# cancel default rule that breaks transparency
-$(outdir)/%.png: %.xpm
+$(outdir)/%-flat-gray.png: %-flat-gray.png
+	convert -depth 8 -geometry 50x50% $< $@
 
-$(outdir)/%-48.png: %-48.xpm
-	convert -sample 48 -depth 24 $< $@
-		   
-$(outdir)/%-32.png: %-48.xpm
-	convert -depth 24 -sample 32 $< $@
+$(outdir)/%-flat-bw.png: %-flat-bw.png
+	convert -depth 8 -geometry 50x50% $< $@
 
-$(outdir)/%-16.png: %-48.xpm
-	convert -depth 24 -sample 16 $< $@
+$(outdir)/%.png: %.png
+	ln -f $< $@
 
-$(outdir)/%-8.png: $(outdir)/%.png
-	convert -depth 8 $< $@
+$(outdir)/%.jpg: %.jpg
+	ln -f $< $@
 
-xgifs: $(OUTGIF_FILES)
-pngs: $(OUTPNG_FILES)
+$(outdir)/%.png: %.eps
+	gs -dAutoRotatePages=/None -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
 
-local-WWW: $(OUTPNG_FILES)
+$(outdir)/%.pdf: %.eps
+	gs -dAutoRotatePages=/None -q -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
 
+$(outdir)/pdf:
+	ln -sf $(top-src-dir)/Documentation/pictures/pdf $@