X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fmidi-rules.make;h=51bf3f298f0f4f1a25689fcbbc520399871e04a3;hb=HEAD;hp=a5cee58b96a226dd70e3eb9b13bdfae9895bac4e;hpb=1be9b72e4f00f7273a8e5ff220b710a52f975344;p=lilypond.git

diff --git a/make/midi-rules.make b/make/midi-rules.make
index a5cee58b96..51bf3f298f 100644
--- a/make/midi-rules.make
+++ b/make/midi-rules.make
@@ -1,16 +1,16 @@
 .SUFFIXES: .midi
 
 $(outdir)/%.ly:  %.midi
-	$(PYTHON) $(MIDI2LY) -o $(outdir) $<
+	$(PYTHON) $(MIDI2LY) --quiet -o $(outdir) $<
 
 $(outdir)/%.midi: %.ly $(LILYPOND_BINARY)
 	touch $(foreach f, $(HEADER_FIELDS), $(outdir)/$*.$f)
-	$(LILYPOND_BINARY) $(HEADER_FIELDS:%=-H %) -o $(outdir) $<
+	$(buildscript-dir)/run-and-check "$(LILYPOND_BINARY) $(HEADER_FIELDS:%=-H %) -o $(outdir) $<" "$*.log"
 	cp $< $(outdir)
 
 $(outdir)/%-midi.ly: $(outdir)/%.midi $(MIDI2LY)
-	(echo '\header {'; for f in $(HEADER_FIELDS); do echo -n $$f'="'; cat $(outdir)/$*.$$f; echo '"'; done; echo '}') > $(outdir)/$*.header
-	$(PYTHON) $(MIDI2LY) $(shell cat $(outdir)/$*.options) --include-header=$(outdir)/$*.header -o $(outdir) $<
+	(echo '\header {'; for f in $(HEADER_FIELDS); do printf $$f'="'; cat $(outdir)/$*.$$f; echo '"'; done; echo '}') > $(outdir)/$*.header
+	$(PYTHON) $(MIDI2LY) $(shell cat $(outdir)/$*.options) --quiet --include-header=$(outdir)/$*.header -o $(outdir) $<
 
 $(outdir)/%.diff: %.ly $(outdir)/%-midi.ly
 	$(DIFF) -puN $(MIDI2LY_IGNORE_RES) $^ > $@ || cat $@