* buildscripts/new-chords.py (help): add help text

[lilypond.git] / make / ly-rules.make

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4876e5bb9b1a6247a00915617fc7b5645de1b481..f270389fbb0f161a314cafa306322fa25ac53cc2 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -30,8 +30,7 @@ $(outdir)/%.texi: $(outdir)/%.tely
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
        -chmod a+w $@
-       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --no-lily $(LILYPOND_BOOK_FLAGS) $<
-       mv $(@D)/$(*F).texi $@
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --no-lily $(LILYPOND_BOOK_FLAGS) -o $(notdir $@) $<
        chmod -w $@
 
 # nfo: info from non-lily texi
@@ -42,17 +41,39 @@ $(outdir)/%.info: $(outdir)/%.nexi
 #$(outdir)/%.nfo: $(outdir)/%.nexi
 #      $(MAKEINFO) --output=$(outdir)/$(*F).info $<
 
-$(outdir)/%.tex: $(outdir)/%.ly
-       $(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
+#
+# let's not do this: this interferes with the lilypond-book dependency mechanism.
+#
+##$(outdir)/%.tex: $(outdir)/%.ly
+##     $(LILYPOND) $(LILYPOND_BOOK_INCLUDES) -o $@ $< 
 
 #
 # Timothy's booklet
 #
 $(outdir)/%-book.ps: $(outdir)/%.ps
        psbook $< $<.tmp
-       pstops  '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
+       pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
-       dvips -u lilypond.map -o $@.pdfps  -Ppdf $<
-       ps2pdf $@.pdfps $@
+       dvips -u +lilypond.map -o $@.pdfps -t $(DVIPS_PAPERSIZE)  -Ppdf $<
+       ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
+
+
+$(outdir)/%.html.omf: %.tely
+       $(call GENERATE_OMF,html)
+
+$(outdir)/%.pdf.omf: %.tely
+       $(call GENERATE_OMF,pdf)
+
+$(outdir)/%.ps.gz.omf: %.tely
+       $(call GENERATE_OMF,ps.gz) 
+
+
+$(outdir)/%.html.omf: $(outdir)/%.texi
+       $(call GENERATE_OMF,html)
+
+$(outdir)/%.pdf.omf: $(outdir)/%.texi
+       $(call GENERATE_OMF,pdf)
 
+$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
+       $(call GENERATE_OMF,ps.gz)