* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf

$(outdir)/%.ly $(outdir)/%.ps): dump sigs for normal files too.

* stepmake/aclocal.m4: robuster version detection.

diff --git a/ChangeLog b/ChangeLog
index c172852516ca1e41d93f9b250b4ce0012148fe18..99cd569f5d1e168a01875d5b3c7aec765942976f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-01  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * 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 bc9ae17ab0d77bcd276c3a2cdfd94d9d8b637f68..13ba6a3dca0086a466f23fb5589ebb12fd34401e 100644 (file)
--- 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 e5d647d62649eff20d24ecb0f503e830274e2051..4a928509848167241500dc5428af5ef54b6b23a3 100644 (file)
--- 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 c3d41f612876775958d33ba4fd05e507d24eeaf0..dc44ed325f8a388f272e0f94b7ae2c996a72dd9a 100644 (file)
--- 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 \