X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly-vars.make;h=4757ad8b57ccd2abcd5a2b75a0923625b0f5c132;hb=c20fff645e325d392d2588721144f4204d0ef9da;hp=08d608dfb215a04946fe567de179f2b0df04c4e9;hpb=402045837e7134cdf90d1fcf31768c62227a4936;p=lilypond.git

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 08d608dfb2..4757ad8b57 100644
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -1,19 +1,19 @@
 # rules for directories with LilyPond files.
 
-# empty
+TELY_FILES := $(call src-wildcard,*.tely)
+TEXI_FILES_FROM_TELY := $(TELY_FILES:%.tely=$(outdir)/%.texi) $(TEXI_FILES_FROM_TELY)
 
-# 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)
+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)
-
-DVIPS_FLAGS= -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