X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-book-vars.make;h=8d9955b6a469262b858c46202874884d8aaba34d;hb=HEAD;hp=12e7581019599d8ae2f078625871e9da15884601;hpb=89a7d16d7c2ae6dc79d4345c5e926be93b77fdd9;p=lilypond.git

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 12e7581019..8d9955b6a4 100644
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -1,11 +1,68 @@
 # rules for directories with html files.
 
-LILYBOOK_HTML_FILES = $(call src-wildcard,*.html)
-LILYBOOK_XML_FILES = $(call src-wildcard,*.xml)
+LILYPOND_BOOK_COMMAND = LILYPOND_VERSION=$(TOPLEVEL_VERSION) \
+	PDFTEX=$(PDFTEX) PDFLATEX=$(PDFLATEX) \
+	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) \
+	--process='$(LILYPOND_BOOK_PROCESS) \
+	$(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) \
+	 --redirect-lilypond-output $(LILYPOND_BOOK_FLAGS)
 
-LILYBOOK_OUT_HTML_FILES = ${LILYBOOK_HTML_FILES:%.html=$(outdir)/%.html}
-LILYBOOK_OUT_XML_FILES = ${LILYBOOK_XML_FILES:%.xml=$(outdir)/%.html}
+HTML_FILES = $(call src-wildcard,*.html)
+HTMLY_FILES = $(call src-wildcard,*.htmly)
+XML_FILES = $(call src-wildcard,*.xml)
+LYTEX_FILES = $(call src-wildcard,*.lytex)
+LATEX_FILES = $(call src-wildcard,*.latex)
+TEX_FILES = $(call src-wildcard,*.tex)
+TEXI_FILES = $(call src-wildcard,*.texi)
+TEXINFO_FILES = $(call src-wildcard,*.texinfo)
+TELY_FILES = $(call src-wildcard,*.tely)
+DOCBOOK_FILES = $(call src-wildcard,*.lyxml)
 
-LILYBOOK_OUT_FILES = $(sort $(LILYBOOK_OUT_HTML_FILES) $(LILYBOOK_OUT_XML_FILES))
+OUT_HTML_FILES = ${HTML_FILES:%.html=$(outdir)/%.html}
+OUT_HTMLY_FILES = ${HTMLY_FILES:%.htmly=$(outdir)/%.html}
+OUT_XML_FILES = ${XML_FILES:%.xml=$(outdir)/%.html}
+# If we have pdflatex, create the pdf, otherwise only the .tex file!
+ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
+OUT_LYTEX_FILES = ${LYTEX_FILES:%.lytex=$(outdir)/%.pdf}
+OUT_LATEX_FILES = ${LATEX_FILES:%.latex=$(outdir)/%.pdf}
+OUT_TEX_FILES = ${TEX_FILES:%.tex=$(outdir)/%.pdf}
+else
+OUT_LYTEX_FILES = ${LYTEX_FILES:%.lytex=$(outdir)/%.tex}
+OUT_LATEX_FILES = ${LATEX_FILES:%.latex=$(outdir)/%.tex}
+OUT_TEX_FILES = ${TEX_FILES:%.tex=$(outdir)/%.tex}
+endif
+OUT_TEXI_FILES = ${TEXI_FILES:%.texi=$(outdir)/%.html}
+OUT_TEXINFO_FILES = ${TEXINFO_FILES:%.texinfo=$(outdir)/%.html}
+OUT_TELY_FILES = ${TELY_FILES:%.tely=$(outdir)/%.html}
+# If we have dblatex, create the pdf, otherwise only the .xml file!
+ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
+OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.pdf}
+else
+OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
+endif
+ifeq ($(PDFLATEX),xelatex)
+DBLATEX_BACKEND = -b xetex
+else
+DBLATEX_BACKEND =
+endif
 
-EXTRA_DIST_FILES += $(LILYBOOK_HTML_FILES)
+OUT_FILES = $(sort $(OUT_HTML_FILES) \
+                            $(OUT_HTMLY_FILES) \
+                            $(OUT_XML_FILES) \
+                            $(OUT_LYTEX_FILES) \
+                            $(OUT_LATEX_FILES) \
+                            $(OUT_TEX_FILES) \
+                            $(OUT_TEXI_FILES) \
+                            $(OUT_TEXINFO_FILES) \
+                            $(OUT_TELY_FILES) \
+                            $(OUT_DOCBOOK_FILES))
+
+ALL_SOURCES +=\
+ $(HTML_FILES)\
+ $(HTMLY_FILES)\
+ $(XML_FILES)\
+ $(LYTEX_FILES)\
+ $(LATEX_FILES)\
+ $(TEX_FILES)\
+ $(TEXINFO_FILES)\
+ $(DOCBOOK_FILES)