X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-vars.make;h=612a2b3e4015e6ded16d1860c0785ad229e7acd2;hb=47e10b6a008f857df1fc6e2a7fd0fe6c7bd9d4b0;hp=4be6e91ab89447a14567c5b4302df146e16fa86f;hpb=5d7c09ae841d7d341603e320b810a9740200c8c1;p=lilypond.git

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 4be6e91ab8..612a2b3e40 100644
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -1,20 +1,21 @@
 # rules for directories with LilyPond files.
 
-# empty
+TELY_FILES := $(call src-wildcard,*.tely)
+TEXI_FILES_FROM_TELY += $(TELY_FILES:%.tely=$(outdir)/%.texi)
 
-# huh ? these are for documentation?!
-TELY_FILES := $(wildcard *.tely)
+OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
 
-OMF_FILES += $(foreach format, html pdf ps.gz, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
-
-ITELY_FILES := $(wildcard *.itely)
-ITEXI_FILES := $(wildcard *.itexi)
-LY_FILES := $(wildcard *.ly)
-LYINC_FILES := $(wildcard *.lyinc)
-ILY_FILES := $(wildcard *.ily)
+ITELY_FILES := $(call src-wildcard,*.itely)
+ITEXI_FILES := $(call src-wildcard,*.itexi)
+LY_FILES := $(call src-wildcard,*.ly)
+ILY_FILES := $(call src-wildcard,*.ily)
 
 TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
-EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(LYINC_FILES)  $(ILY_FILES)
+EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES)
 
-DVIPS_FLAGS= -u+ec-mftrace.map -u +lilypond.map  -Ppdf
+# prerequisites for all rules invoking compiled lilypond binary
+ifeq ($(LILYPOND_EXTERNAL_BINARY),)
+INIT_LY_SOURCES = $(wildcard $(top-src-dir)/scm/*.scm)
+SCHEME_SOURCES = $(wildcard $(top-src-dir)/ly/*.ly)
+endif