From fcc35aa46a102904e1f7630f759b3dfdbc0da554 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Wed, 14 Jan 2009 12:11:22 +0100 Subject: [PATCH] Makefiles: add dependency on ly/ and scm/ for lilypond(-book) rules --- make/ly-rules.make | 6 +++--- make/ly-vars.make | 8 +++++--- make/mutopia-rules.make | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/make/ly-rules.make b/make/ly-rules.make index c8605a3173..52ee4b015e 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -4,7 +4,7 @@ LYS_OUTPUT_OPTION= --lily-output-dir $(LYS_OUTPUT_DIR) LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-db/ LILYPOND_BOOK_FLAGS += $(LYS_OUTPUT_OPTION) -$(outdir)/%.latex: %.doc +$(outdir)/%.latex: %.doc $(INIT_LY_SOURCES) $(SCHEME_SOURCES) LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) $(LILYPOND_BOOK_FLAGS) $< @@ -19,11 +19,11 @@ $(eval $(firstword $(MASTER_TEXI_FILES)): $(foreach i, $(wordlist 2, $(words $(M # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds -$(outdir)/%.texi: %.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) +$(outdir)/%.texi: %.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES) LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< -$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) +$(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi $(DOCUMENTATION_LOCALE_TARGET) $(INIT_LY_SOURCES) $(SCHEME_SOURCES) LILYPOND_VERSION=$(TOPLEVEL_VERSION) $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $< diff --git a/make/ly-vars.make b/make/ly-vars.make index 498ad1ffa5..c3c8a24ba4 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -1,8 +1,5 @@ # rules for directories with LilyPond files. -# empty - -# huh ? these are for documentation?! TELY_FILES := $(call src-wildcard,*.tely) MASTER_TEXI_FILES := $(sort $(TELY_FILES:%.tely=$(outdir)/%.texi))\ $(OUT_MASTER_TEXI_FILES) @@ -18,3 +15,8 @@ TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES) EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES) +# 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 diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index b73dc96aac..82bc3ee13c 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -12,7 +12,7 @@ $(outdir)/%.ly: %.abc $(PYTHON) $(ABC2LY) --strict -o $@ $< # hmm. notdir builds src-dir builds? -$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly +$(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly $(INIT_LY_SOURCES) $(SCHEME_SOURCES) cd $(outdir); $(LILYPOND_BINARY) --pdf --png -dlog-file="'$(basename $(notdir $<)).log" -ddump-signatures -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(call absdir,$(src-dir))/ $(notdir $<) touch $(outdir)/$(basename $(notdir $<)).png -- 2.39.2