Various updates to reduce make doc output

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

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 6272085500e9d77c414751ec8be2b72ac5574f2a..946e5a4759c61887101adf4bb8b7a6815b4b0611 100644 (file)
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -1,11 +1,19 @@
-.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) $<
 
@@ -15,8 +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
 
-$(outdir)/%.xml:  %.lyxml
+############## 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) && $(DBLATEX) $(notdir $<)
+endif