diff options
| author | Phil Holmes <mail@philholmes.net> | 2012-03-04 16:10:34 +0000 |
|---|---|---|
| committer | Phil Holmes <mail@philholmes.net> | 2012-03-18 12:23:14 +0000 |
| commit | 61f11056af686fde87a1b82936cf2a073b017b88 (patch) | |
| tree | 59aed3c5b26efbaf0ee9ba57498b59f8565c74ea /make | |
| parent | 0942948dca35950b6e9cd3529ada31c38360e184 (diff) | |
Various updates to reduce make doc output
Diffstat (limited to 'make')
| -rw-r--r-- | make/abc-rules.make | 2 | ||||
| -rw-r--r-- | make/lilypond-book-rules.make | 2 | ||||
| -rw-r--r-- | make/lysdoc-rules.make | 1 | ||||
| -rw-r--r-- | make/midi-rules.make | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/make/abc-rules.make b/make/abc-rules.make index 876d54e4b5..39ca43b170 100644 --- a/make/abc-rules.make +++ b/make/abc-rules.make @@ -1,4 +1,4 @@ .SUFFIXES: .abc $(outdir)/%.ly: %.abc - $(PYTHON) $(ABC2LY) -o $@ $< + $(PYTHON) $(ABC2LY) --quiet -o $@ $< diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make index b0cf7663b1..946e5a4759 100644 --- a/make/lilypond-book-rules.make +++ b/make/lilypond-book-rules.make @@ -26,7 +26,7 @@ $(outdir)/%.tex: %.latex # Add the tex => pdf rule only if we have pdflatex ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL))) $(outdir)/%.pdf: $(outdir)/%.tex - cd $(outdir) && $(PDFLATEX) $(notdir $<) + cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log" endif ############## Texinfo ###################### diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index 001148aec2..11248f5030 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -3,7 +3,6 @@ # Split it up into 10 300-element chunks, and one chunk containing the rest # if we have more than 3000 elements. $(outdir)/collated-files.list: $(COLLATED_FILES) - echo "(Re-)Generating $@" @echo $(wordlist 1, 299,$^)>$@ @echo $(wordlist 300, 599,$^)>>$@ @echo $(wordlist 600, 899,$^)>>$@ diff --git a/make/midi-rules.make b/make/midi-rules.make index 7b3f149d96..18dcc17246 100644 --- a/make/midi-rules.make +++ b/make/midi-rules.make @@ -1,7 +1,7 @@ .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) @@ -10,7 +10,7 @@ $(outdir)/%.midi: %.ly $(LILYPOND_BINARY) $(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) $< + $(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 $@ |