MusicXML: Compressed MusicXML files should be compiled, too...

diff --git a/make/musicxml-rules.make b/make/musicxml-rules.make
index c00d2da87a189c4220c5bcd8da81ec8bee7fbb13..d0c46511975aed0cf1adad8f8cc08e4b14818258 100644 (file)
--- a/make/musicxml-rules.make
+++ b/make/musicxml-rules.make
@@ -1,5 +1,8 @@
-.SUFFIXES: .xml
+.SUFFIXES: .xml .mxl
 
 
 $(outdir)/%.ly:  %.xml
        $(PYTHON) $(MUSICXML2LY) -o $@ $<
+
+$(outdir)/%.ly:  %.mxl
+       $(PYTHON) $(MUSICXML2LY) -z -o $@ $<

diff --git a/make/musicxml-vars.make b/make/musicxml-vars.make
index 0844fa730e8e27fdb128494413e67e170a7a4ee5..a5ddb1bc3b6672c83cf0be2c58aa1f9ae611784c 100644 (file)
--- a/make/musicxml-vars.make
+++ b/make/musicxml-vars.make
@@ -1,10 +1,8 @@
 # rules for directories with MusicXML files.
 
 MUSICXML_FILES := $(call src-wildcard,*.xml)
-# LY_FILES=$(addprefix $(outdir)/, $(addsuffix .ly, $(MUSICXML_FILE)))
-# LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
-OUT_LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
-
+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})
 OUT_FILES = $(OUT_LY_FILES)
 
-EXTRA_DIST_FILES += $(MUSICXML_FILES)
+EXTRA_DIST_FILES += $(MUSICXML_FILES) $(MUSICMXL_FILES)