* make/lilypond-vars.make (PYTHONPATH): Add python's outdir to

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

diff --git a/make/ly-rules.make b/make/ly-rules.make
index d7af4be24e697fbf3dfc6d594ad8a5edefebd191..4876e5bb9b1a6247a00915617fc7b5645de1b481 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,30 +1,58 @@
 # Mudela_rules.make
 
-.SUFFIXES: .doc .dvi .mudtex .tely .texi
+.SUFFIXES: .doc .dvi .mudtex .tely .texi .ly
 
-SUBST_TEXI_DEPS=sed 's! \.\./! !g' < $(basename $@).dep > $(outdir)/temp.dep ;         mv $(outdir)/temp.dep $(basename $@).dep 
 
 $(outdir)/%.latex: %.doc
-       LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $< 
-       $(SUBST_TEXI_DEPS)
+       -chmod a+w $@
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
+       chmod -w $@
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
-# it is not, for --scrdir builds
+# it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
-       LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
-       $(SUBST_TEXI_DEPS)
+       -chmod a+w $@
+       set|egrep '(TEX|LILY)'  # ugh, what's this?
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+       chmod -w $@
+
+$(outdir)/%.texi: $(outdir)/%.tely
+       -chmod a+w $@
+# debugging:
+#      set|egrep '(TEX|LILY)'
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
+#
+# DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
+#      rm -f $<
+       chmod -w $@
 
 # nexi: no-lily texi
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
-       LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
+       -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 $@
-       $(SUBST_TEXI_DEPS)
+       chmod -w $@
 
 # nfo: info from non-lily texi
 $(outdir)/%.info: $(outdir)/%.nexi
-       -$(MAKEINFO) --force --output=$(outdir)/$(*F).info $<
+       $(MAKEINFO) --output=$(outdir)/$(*F).info $<
 
 # nfo: info from non-lily texi
 #$(outdir)/%.nfo: $(outdir)/%.nexi
-#      -$(MAKEINFO) --force --output=$(outdir)/$(*F).info $<
+#      $(MAKEINFO) --output=$(outdir)/$(*F).info $<
+
+$(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 $@
+
+$(outdir)/%.pdf: $(outdir)/%.dvi
+       dvips -u lilypond.map -o $@.pdfps  -Ppdf $<
+       ps2pdf $@.pdfps $@
+