X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=b3c4f4108c1fad05886c37b258db026866dfd0f0;hb=b3cf2199183a184c7eef9a9f8f3c9a691db1f0ad;hp=d276e188ef044042be2080e7fb83e0ae7724e8bf;hpb=ef61cb7775f33d4a6cf46f2e54e07736ac8f5d09;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index d276e188ef..b3c4f4108c 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,18 +1,19 @@
 .SUFFIXES: .doc .dvi .tely .texi .ly
 
 
-$(outdir)/%.latex $(outdir)/%.fonts.ps:  %.doc
-	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $<
+$(outdir)/%.latex $(outdir)/%.psfonts:  %.doc
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $<
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
 	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
-	$(PYTHON) $(LILYPOND_BOOK) --psfonts=$(basename $<).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+	$(PYTHON) $(LILYPOND_BOOK) --psfonts $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+
 
 $(outdir)/%.texi: $(outdir)/%.tely
 	rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null)
-	$(PYTHON) $(LILYPOND_BOOK) --psfonts=$(notdir $(basename $<)).fonts.ps $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+	$(PYTHON) $(LILYPOND_BOOK) --psfonts $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
 #	rm -f $<
@@ -22,33 +23,11 @@ $(outdir)/%.texi: $(outdir)/%.tely
 $(outdir)/%.nexi: %.tely
 	rm -f $(outdir)/$*.texi
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) --process='true' $<
-	mv $(outdir)/$*.texinfo $@ 2>/dev/null || mv $(outdir)/$*.texi $@
+	mv -f $(outdir)/$*.texinfo $@ 2>/dev/null || mv -f $(outdir)/$*.texi $@
 
 $(outdir)/%.info: $(outdir)/%.nexi
 	$(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<
 
-# Timothy's booklet
-#
-$(outdir)/%-book.ps: $(outdir)/%.ps
-	psbook $< $<.tmp
-	pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
-
-$(outdir)/%.pdf: $(outdir)/%.dvi
-	$(shell cd $(outdir) \
-		&& dvips $(DVIPS_FLAGS) -t $(DVIPS_PAPERSIZE) \
-			-o $(notdir $@).pdfps $(notdir $<) \
-	 	&& gs -dCompatibilityLevel=1.2\
-			-sPAPERSIZE=a4\
-			-q\
-			-dNOPAUSE\
-			-dBATCH\
-			-sDEVICE=pdfwrite\
-			-sOutputFile=$(notdir $@)\
-			-dCompatibilityLevel=1.2\
-			-sPAPERSIZE=a4\
-			-c .setpdfwrite\
-			-f $(notdir $@).pdfps)
-
 $(outdir)/%.html.omf: %.tely
 	$(call GENERATE_OMF,html)
 
@@ -56,7 +35,7 @@ $(outdir)/%.pdf.omf: %.tely
 	$(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: %.tely
-	$(call GENERATE_OMF,ps.gz) 
+	$(call GENERATE_OMF,ps.gz)
 
 $(outdir)/%.html.omf: $(outdir)/%.texi
 	$(call GENERATE_OMF,html)
@@ -65,4 +44,4 @@ $(outdir)/%.pdf.omf: $(outdir)/%.texi
 	$(call GENERATE_OMF,pdf)
 
 $(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-	$(call GENERATE_OMF,ps.gz) 
+	$(call GENERATE_OMF,ps.gz)