lilypond-book-vars.make: Play together with other stepmake files. Fixes dist.

   * Drop `LILYPOND_BOOK_'-prefix from variables; there is nothing
     lilypond-bookness about these
   * Drop all regular (ly/doc) *_FILES from extra-dist files.  Fixes
     duplicate files in dist list.

diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index 584310fdb3390a70c29df19d2bd0debd9e988881..8b549e0646aba2c18f06c8617a466858a17c9fe8 100644 (file)
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -6,50 +6,53 @@ LILYPOND_BOOK_COMMAND = LILYPOND_VERSION=$(TOPLEVEL_VERSION) \
        $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) \
        $(LILYPOND_BOOK_FLAGS)
 
-LILYBOOK_HTML_FILES = $(call src-wildcard,*.html)
-LILYBOOK_HTMLY_FILES = $(call src-wildcard,*.htmly)
-LILYBOOK_XML_FILES = $(call src-wildcard,*.xml)
-LILYBOOK_LYTEX_FILES = $(call src-wildcard,*.lytex)
-LILYBOOK_LATEX_FILES = $(call src-wildcard,*.latex)
-LILYBOOK_TEX_FILES = $(call src-wildcard,*.tex)
-LILYBOOK_TEXI_FILES = $(call src-wildcard,*.texi)
-LILYBOOK_TELY_FILES = $(call src-wildcard,*.tely)
-LILYBOOK_DOCBOOK_FILES = $(call src-wildcard,*.lyxml)
+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)
+TELY_FILES = $(call src-wildcard,*.tely)
+DOCBOOK_FILES = $(call src-wildcard,*.lyxml)
 
-LILYBOOK_OUT_HTML_FILES = ${LILYBOOK_HTML_FILES:%.html=$(outdir)/%.html}
-LILYBOOK_OUT_HTMLY_FILES = ${LILYBOOK_HTML_FILES:%.htmly=$(outdir)/%.html}
-LILYBOOK_OUT_XML_FILES = ${LILYBOOK_XML_FILES:%.xml=$(outdir)/%.html}
+OUT_HTML_FILES = ${HTML_FILES:%.html=$(outdir)/%.html}
+OUT_HTMLY_FILES = ${HTML_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 dblatex,$(MISSING_OPTIONAL)))
-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}
+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
-LILYBOOK_OUT_LYTEX_FILES = ${LILYBOOK_LYTEX_FILES:%.lytex=$(outdir)/%.tex}
-LILYBOOK_OUT_LATEX_FILES = ${LILYBOOK_LATEX_FILES:%.latex=$(outdir)/%.tex}
-LILYBOOK_OUT_TEX_FILES = ${LILYBOOK_TEX_FILES:%.tex=$(outdir)/%.tex}
+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
-LILYBOOK_OUT_TEXI_FILES = ${LILYBOOK_TEXI_FILES:%.texi=$(outdir)/%.html}
-LILYBOOK_OUT_TELY_FILES = ${LILYBOOK_TELY_FILES:%.tely=$(outdir)/%.html}
+OUT_TEXI_FILES = ${TEXI_FILES:%.texi=$(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)))
-LILYBOOK_OUT_DOCBOOK_FILES = ${LILYBOOK_DOCBOOK_FILES:%.lyxml=$(outdir)/%.pdf}
+OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.pdf}
 else
-LILYBOOK_OUT_DOCBOOK_FILES = ${LILYBOOK_DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
+OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
 endif
 
-LILYBOOK_OUT_FILES = $(sort $(LILYBOOK_OUT_HTML_FILES) \
-                            $(LILYBOOK_OUT_HTMLY_FILES) \
-                            $(LILYBOOK_OUT_XML_FILES) \
-                            $(LILYBOOK_OUT_LYTEX_FILES) \
-                            $(LILYBOOK_OUT_LATEX_FILES) \
-                            $(LILYBOOK_OUT_TEX_FILES) \
-                            $(LILYBOOK_OUT_TEXI_FILES) \
-                            $(LILYBOOK_OUT_TELY_FILES) \
-                            $(LILYBOOK_OUT_DOCBOOK_FILES))
-
-EXTRA_DIST_FILES += $(LILYBOOK_HTML_FILES) $(LILYBOOK_HTMLY_FILES) $(LILYBOOK_XML_FILES) \
-                    $(LILYBOOK_LYTEX_FILES) $(LILYBOOK_LATEX_FILES) \
-                    $(LILYBOOK_TEX_FILES) $(LILYBOOK_TEXI_FILES) \
-                    $(LILYBOOK_TELY_FILES) $(LILYBOOK_DOCBOOK_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_TELY_FILES) \
+                            $(OUT_DOCBOOK_FILES))
 
+EXTRA_DIST_FILES +=\
+ $(HTML_FILES)\
+ $(HTMLY_FILES)\
+ $(XML_FILES)\
+ $(LYTEX_FILES)\
+ $(LATEX_FILES)\
+ $(TEX_FILES)\
+ $(DOCBOOK_FILES)