X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-rules.make;h=e5a03790b4ae37d9fee09a56aae7fa5303d8a122;hb=11acb4ce4e596f3484a2c9312e24fed0d16eb046;hp=6272085500e9d77c414751ec8be2b72ac5574f2a;hpb=f321911c01364d21adeea94a6979fd6e1393be4e;p=lilypond.git

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 6272085500..e5a03790b4 100644
--- 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 dblatex
+ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-	cd $(outdir) && pdflatex $(notdir $<)
+	cd $(outdir) && $(PDFLATEX) $(notdir $<)
+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