Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond into ralph

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

diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index 0eb68b09dbf1ff3249d756645f35212818276049..3cd87a7d05d6f2a5427726c8d565321934eb6c88 100644 (file)
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -4,19 +4,18 @@ include $(make-dir)/lilypond-vars.make
 
 # LY_FILES is defined the LY make template.
 
-SCORE_LY_FILES = $(shell fgrep -l score *.ly)
+SCORE_LY_FILES = $(shell cd $(src-dir) && fgrep -l score *.ly)
 
-M4_FILES = $(wildcard *.m4)
-LYM4_FILES = $(wildcard *.lym4)
-EXTRA_DIST_FILES +=  $(M4_FILES) $(LYM4_FILES)
-
-ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples)))
-fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples)))
-sly_examples=$(addprefix $(outdir)/, $(addsuffix .sly.txt, $(slexamples)))
-
-all_examples=$(flexamples) $(slexamples) $(examples)
+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)))
 gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
 png_examples=$(addprefix $(outdir)/, $(addsuffix .png, $(all_examples)))