Clean up mutopia makefiles and add .ily files to docball

diff --git a/make/mutopia-inclusions.make b/make/mutopia-inclusions.make
index 28636f7de0368e76fe3eb1b5c98d7cd96d7f9440..6b069a8900ec00498b04a20ca1cf552ffd6d5768 100644 (file)
--- a/make/mutopia-inclusions.make
+++ b/make/mutopia-inclusions.make
@@ -2,7 +2,6 @@
 ifndef MUTOPIA_INCLUSIONS
 STEPMAKE_TEMPLATES := tex $(STEPMAKE_TEMPLATES)
 
--include $(stepdir)/tex-inclusions
 MUTOPIA_INCLUSIONS=done
 
 

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index de5152e7d270752130e6e0208e95e583c4e14f6c..b73dc96aac48f7d032f80d8a13d53d013c85a2d2 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,9 +1,12 @@
 $(outdir)/%.ly: %.ly
        cp $< $@
 
+$(outdir)/%.ily: %.ily
+       cp $< $@
+
 $(outdir)/%.ly: %.abc
 #which file to show here -- abc seems more cute?
-       ln -f $< $@
+       cp $< $@
 
 $(outdir)/%.ly: %.abc
        $(PYTHON) $(ABC2LY) --strict -o $@ $<

diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index 1e09d8dcec224621f5941b5fc8d5ab2837982578..3cd87a7d05d6f2a5427726c8d565321934eb6c88 100644 (file)
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -6,11 +6,13 @@ include $(make-dir)/lilypond-vars.make
 
 SCORE_LY_FILES = $(shell cd $(src-dir) && fgrep -l score *.ly)
 
+ILY_FILES = $(call src-wildcard,*.ily)
 M4_FILES = $(call src-wildcard,*.m4)
 LYM4_FILES = $(call src-wildcard,*.lym4)
 EXTRA_DIST_FILES += $(M4_FILES) $(LYM4_FILES)
 
 ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly, $(examples)))
+ly_examples+= $(ILY_FILES:%.ily=$(outdir)/%.ily)
 all_examples=$(examples)
 ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
 pdf_examples=$(addprefix $(outdir)/, $(addsuffix .pdf, $(all_examples)))