From 99848e5b8f678547fb031cb736e318ee3e688090 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 1 Jun 2006 00:40:02 +0000 Subject: [PATCH] * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps): dump sigs for normal files too. * stepmake/aclocal.m4: robuster version detection. --- ChangeLog | 3 +++ GNUmakefile.in | 1 - make/mutopia-rules.make | 2 +- stepmake/aclocal.m4 | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c172852516..99cd569f5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-01 Han-Wen Nienhuys + * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf + $(outdir)/%.ly $(outdir)/%.ps): dump sigs for normal files too. + * stepmake/aclocal.m4: robuster version detection. * buildscripts/output-distance.py diff --git a/GNUmakefile.in b/GNUmakefile.in index bc9ae17ab0..13ba6a3dca 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -173,7 +173,6 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo -cd $(tree-share-prefix)/fonts/type1 && \ ln -s ../../../../../../mf/$(outconfbase)/*.pfa . - TAGS.make: dummy etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make') diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index e5d647d626..4a92850984 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -15,7 +15,7 @@ $(outdir)/%.ly: %.abc # hmm. notdir builds src-dir builds? $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly - cd $(outdir); $(LILYPOND_BINARY) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(call absdir,$(src-dir))/ $(notdir $<) + cd $(outdir); $(LILYPOND_BINARY) --pdf --png -ddump-signatures -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(call absdir,$(src-dir))/ $(notdir $<) touch $(outdir)/$(basename $(notdir $<)).png $(outdir)/%.ly: %.ly diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index c3d41f6128..dc44ed325f 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -27,6 +27,10 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ changequote(<<, >>)#dnl + ## Assume and hunt for dotted version multiplet. + ## use eval trickery, because we cannot use multi-level $() instead of `` + ## for compatibility reasons. + ## grab the first version number in --version output. eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \ | head -n 1 \ -- 2.39.2