X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmutopia-vars.make;h=60add179f276542dc4f13cb854c7e10368711132;hb=HEAD;hp=b09753c60d6fbd76a7bd2b483089fc3b2a224a25;hpb=0713e9256dc1f35299ce716cf29ddeab4ebca93b;p=lilypond.git

diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index b09753c60d..60add179f2 100644
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -2,25 +2,17 @@
 # UGH UGH
 include $(make-dir)/lilypond-vars.make
 
-LY_FILES = $(wildcard *.ly)
-SCORE_LY_FILES = $(shell fgrep -l score *.ly)
+# LY_FILES is defined the LY make template.
 
-FLY_FILES = $(wildcard *.fly)
-SLY_FILES = $(wildcard *.sly)
+SCORE_LY_FILES = $(shell cd $(src-dir) && fgrep -l score *.ly)
 
-M4_FILES = $(wildcard *.m4)
-LYM4_FILES = $(wildcard *.lym4)
-EXTRA_DIST_FILES += $(FLY_FILES) $(SLY_FILES) $(LY_FILES) $(M4_FILES) $(LYM4_FILES)
-
-# WWW.make
-
-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)
 
+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)))
 
@@ -29,7 +21,4 @@ html_subdirs=$(addprefix --subdirs ,$(SUBDIRS))
 
 name-stem= $(notdir $(basename $<))
 
-OUT_FILES = $(addprefix $(outdir)/,$(M4_FILES:%.m4=%)) \
- $(addprefix $(outdir)/,$(LYM4_FILES:%.lym4=%.ly))
-
-score_ps = $(addprefix $(outdir)/, $(addsuffix .ps.gz, $($SCORE_LY_FILES)))
\ No newline at end of file
+score_ps = $(addprefix $(outdir)/, $(addsuffix .ps.gz, $(SCORE_LY_FILES)))