Lilypond-book: Fix build rules for the regtests

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 6272085500e9d77c414751ec8be2b72ac5574f2a..bab711e6d3ca98cce89e1db101ed85e90701ba06 100644 (file)
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -1,4 +1,6 @@
-.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) $<
@@ -6,6 +8,9 @@ $(outdir)/%.html:  %.html
 $(outdir)/%.html:  %.xml
        $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
+
+############## LaTeX ########################
+
 $(outdir)/%.tex:  %.lytex
        $(LILYPOND_BOOK_COMMAND) --pdf -o $(outdir) $<
 
@@ -18,5 +23,26 @@ $(outdir)/%.tex:  %.latex
 $(outdir)/%.pdf:  $(outdir)/%.tex
        cd $(outdir) && pdflatex $(notdir $<)
 
-$(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) $<
+
+$(outdir)/%.pdf:  $(outdir)/%.xml
+       cd $(outdir) && dblatex $(notdir $<)

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 3ee72d98a4e4f113e15b8aa222bb6530e5311660..95960cd1a2b02cf285126f4eee8d96dd8a7f0d69 100644 (file)
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -20,9 +20,9 @@ LILYBOOK_OUT_XML_FILES = ${LILYBOOK_XML_FILES:%.xml=$(outdir)/%.html}
 LILYBOOK_OUT_LYTEX_FILES = ${LILYBOOK_LYTEX_FILES:%.lytex=$(outdir)/%.pdf}
 LILYBOOK_OUT_LATEX_FILES = ${LILYBOOK_LATEX_FILES:%.latex=$(outdir)/%.pdf}
 LILYBOOK_OUT_TEX_FILES = ${LILYBOOK_TEX_FILES:%.tex=$(outdir)/%.pdf}
-LILYBOOK_OUT_TEXI_FILES = ${LILYBOOK_TEXI_FILES:%.texi=$(outdir)/%.texi}
-LILYBOOK_OUT_TELY_FILES = ${LILYBOOK_TELY_FILES:%.tely=$(outdir)/%.texi}
-LILYBOOK_OUT_DOCBOOK_FILES = ${LILYBOOK_DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
+LILYBOOK_OUT_TEXI_FILES = ${LILYBOOK_TEXI_FILES:%.texi=$(outdir)/%.html}
+LILYBOOK_OUT_TELY_FILES = ${LILYBOOK_TELY_FILES:%.tely=$(outdir)/%.html}
+LILYBOOK_OUT_DOCBOOK_FILES = ${LILYBOOK_DOCBOOK_FILES:%.lyxml=$(outdir)/%.pdf}
 
 LILYBOOK_OUT_FILES = $(sort $(LILYBOOK_OUT_HTML_FILES) \
                             $(LILYBOOK_OUT_XML_FILES) \
@@ -31,10 +31,10 @@ LILYBOOK_OUT_FILES = $(sort $(LILYBOOK_OUT_HTML_FILES) \
                             $(LILYBOOK_OUT_TEX_FILES) \
                             $(LILYBOOK_OUT_TEXI_FILES) \
                             $(LILYBOOK_OUT_TELY_FILES) \
-                            $(LILYBOOK_OUT_DOOCBOOK_FILES)) \
+                            $(LILYBOOK_OUT_DOCBOOK_FILES))
 
 EXTRA_DIST_FILES += $(LILYBOOK_HTML_FILES) $(LILYBOOK_XML_FILES) \
                     $(LILYBOOK_LYTEX_FILES) $(LILYBOOK_LATEX_FILES) \
-                    $(LILYBOOK_TEX_FILES) $(LILYBOOK_TEXI_FILES)
+                    $(LILYBOOK_TEX_FILES) $(LILYBOOK_TEXI_FILES) \
                     $(LILYBOOK_TELY_FILES) $(LILYBOOK_DOCBOOK_FILES)