X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-rules.make;h=b27aa56e14ca1e8e0b429e1981a0b7c46bfc3ee2;hb=fea1a1b9be01d800e9a8f2d79a924d0db051a261;hp=3bdcf477455050bcf50b2bdb7d3a2cf0f0199e16;hpb=c08377573e22de6e76310f245c1d5bd20e921c3b;p=lilypond.git

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 3bdcf47745..b27aa56e14 100644
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -1,13 +1,21 @@
-.SUFFIXES: .html .xml .lytex .tex .latex
+.SUFFIXES: .html .xml .lytex .tex .latex .lyxml .tely .texi .texinfo
+
+############## HTML #########################
 
 $(outdir)/%.html:  %.html
 	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
+$(outdir)/%.html:  %.htmly
+	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
 $(outdir)/%.html:  %.xml
 	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
+
+############## LaTeX ########################
+
 $(outdir)/%.tex:  %.lytex
-	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
+	$(buildscript-dir)/run-and-check "$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<"  "$*.lytex.log"
 
 $(outdir)/%.tex:  %.tex
 	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
@@ -15,5 +23,34 @@ $(outdir)/%.tex:  %.tex
 $(outdir)/%.tex:  %.latex
 	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
+# Add the tex => pdf rule only if we have pdflatex
+ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-	cd $(outdir) && pdflatex $(notdir $<)
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log"
+endif
+
+############## Texinfo ######################
+
+$(outdir)/%.texi:  %.texi
+	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
+$(outdir)/%.texi:  %.itexi
+	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
+$(outdir)/%.texi:  %.texinfo
+	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
+$(outdir)/%.texi:  %.tely
+	$(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
+
+############## DocBook ######################
+
+$(outdir)/%.xml:  %.lyxml
+	$(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
+
+# Add the xml => pdf rule only if we have dblatex
+ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
+$(outdir)/%.pdf:  $(outdir)/%.xml
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(notdir $<)" "$*.dblatex.log"
+endif