Merge branch 'master' into lilypond/translation

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

diff --git a/make/ly-vars.make b/make/ly-vars.make
index c566ce6e89388848967316c40cc3b5f4e412b9b9..7d572adb750c212847b326e9729adb16288d46ab 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -1,9 +1,7 @@
 # rules for directories with LilyPond files.
 
-# empty
-
-# huh ? these are for documentation?!
 TELY_FILES := $(call src-wildcard,*.tely)
+TEXI_FILES_FROM_TELY := $(TELY_FILES:%.tely=$(outdir)/%.texi) $(TEXI_FILES_FROM_TELY)
 
 OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
 
@@ -16,4 +14,8 @@ TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
 EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES)
 
-TEXI2PDF_FLAGS += -I $(top-build-dir)/$(outdir)/lys/
+# 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