X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-rules.make;h=acaa410b18785742f3bafddfac3b6b5712019cd4;hb=35f48f6592df5dabe2b2c4633953eb1547fc6607;hp=0577bae6e3390b37c3847c864ae829e57d250e81;hpb=a22b7ddea794271790a771b3f4bca86547071038;p=lilypond.git

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 0577bae6e3..acaa410b18 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -1,32 +1,56 @@
 # Mudela_rules.make
 
-.SUFFIXES: .doc .dvi .mudtex .tely .texi
+.SUFFIXES: .doc .dvi .mudtex .tely .texi .ly
 
 
 $(outdir)/%.latex: %.doc
 	rm -f $@
-	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $<
+	$(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
 	rm -f $@
-	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) -I $(pwd) -I $(input-dir)/test/ --dependencies --format=texi $<
+	set|egrep '(TEX|LILY)'
+
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $<
+	chmod -w $@
+
+$(outdir)/%.texi: $(outdir)/%.tely
+	rm -f $@
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $(LILYPOND_BOOK_FLAGS) $<
+	rm -f $<
 	chmod -w $@
 
 # nexi: no-lily texi
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
 	rm -f $@
-	LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/lilypond-book.py --outdir=$(outdir) --no-lily -I $(pwd) -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $(LILYPOND_BOOK_FLAGS) $<
 	mv $(@D)/$(*F).texi $@
 	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 $@
+