Merge ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index ac8eb3ffd3c6aa00f9283786fdcc6989d2de942e..03f132c43c7cf881871f73f6a0c08c8540b4cced 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -3,14 +3,15 @@ depth=../..
 LATEX_FILES =$(call src-wildcard,*.latex)
 
 
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(EPS_ILLUSTRATIONS)
+EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt convert-ly.txt $(EPS_ILLUSTRATIONS)
 
 IMAGES=$(call src-wildcard,*.png)
 EPS_ILLUSTRATIONS=context-example.eps
 PDF_ILLUSTRATIONS=context-example.pdf
 
 OUT_PDF_IMAGES=$(IMAGES:%.png=$(outdir)/%.pdf) $(addprefix $(outdir)/,$(PDF_ILLUSTRATIONS))
-OUT_PNG_IMAGES=$(OUT_EPS_IMAGES:%.eps=%.png)
+
+OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
@@ -194,19 +195,13 @@ $(outdir)/%.png: %.png
        convert -geometry 50x50% $< $@
 
 $(outdir)/%.png: %.eps
-       convert $< $@
-
-$(outdir)/%.eps: %.png
-       convert $< $@
-
-$(outdir)/%.eps: %.eps
-       cp $< $@
+       gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit
 
 $(outdir)/%.pdf: %.png
        convert $< $@
 
 $(outdir)/%.pdf: %.eps
-       convert $< $@
+       gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
 
 
 DEEP_HTML_FILES =\
@@ -223,10 +218,12 @@ $(outdir)/source:
 
 $(outdir)/lilypond/source:
        @rm -f $(@)
+       mkdir -p $(outdir)/lilypond
        ln -sf ../../../ $(@)
 
 $(outdir)/music-glossary/source:
        @rm -f $(@)
+       mkdir -p $(outdir)/music-glossary
        ln -sf ../../../ $(@)
 
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\