From 2c135223b908538e8849a5fd9d37c572b40fba81 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Thu, 4 Dec 2008 01:02:50 +0100 Subject: [PATCH] Clean up mutopia makefiles and add .ily files to docball --- make/mutopia-inclusions.make | 1 - make/mutopia-rules.make | 5 ++++- make/mutopia-vars.make | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/make/mutopia-inclusions.make b/make/mutopia-inclusions.make index 28636f7de0..6b069a8900 100644 --- 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 de5152e7d2..b73dc96aac 100644 --- 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 1e09d8dcec..3cd87a7d05 100644 --- 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))) -- 2.39.2