MusicXML: do not dist ily files twice.

[lilypond.git] / make / musicxml-vars.make

diff --git a/make/musicxml-vars.make b/make/musicxml-vars.make
index ecfd1a07cc54cd1188daa193c431b576071d894a..55cb25b75b7ad6187250d59422c49d44c471856f 100644 (file)
--- a/make/musicxml-vars.make
+++ b/make/musicxml-vars.make
@@ -1,17 +1,8 @@
 # rules for directories with MusicXML files.
 
-# empty
+MUSICXML_FILES = $(call src-wildcard,*.xml)
+MUSICMXL_FILES = $(call src-wildcard,*.mxl)  # Allow .mxl for compressed files
+OUT_LY_FILES = $(sort ${MUSICXML_FILES:%.xml=$(outdir)/%.ly} ${MUSICMXL_FILES:%.mxl=$(outdir)/%.ly} ${EXTRA_OUT_LY_FILES})
+OUT_FILES = $(OUT_LY_FILES)
 
-# UGH UGH
-include $(make-dir)/lilypond-vars.make
-
-# huh ? these are for documentation?!
-MUSICXML_FILES := $(call src-wildcard,*.xml)
-# LY_FILES=$(addprefix $(outdir)/, $(addsuffix .ly, $(MUSICXML_FILE)))
-# LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
-LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
-
-
-OUT_FILES = $(LY_FILES)
-
-EXTRA_DIST_FILES +=$(MUSICXML_FILES)
+EXTRA_DIST_FILES += $(MUSICXML_FILES) $(MUSICMXL_FILES)