lilypond-0.1.54

diff --git a/Documentation/Makefile.am b/Documentation/Makefile.am
index 9942fb2d00a636d01e61bc6c1f410df1d990fba3..2d04c0c7d22e1bff70e650bb9776dd2159ab4062 100644 (file)
--- a/Documentation/Makefile.am
+++ b/Documentation/Makefile.am
@@ -38,4 +38,4 @@ clean-local:
 
 include $(top_srcdir)/Documentation/Rules.make
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/Makefile.am b/Makefile.am
index 09f1bcbe9bf95ec8852a7648ddd8c54321f757df..fbae3ff7cca80b9112a0654ae32bcc873a97eb71 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # title           top level makefile for LilyPond  
 # file    Makefile.am.wild
 
-SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\
+SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\
        Documentation init input tex make mutopia
 
 SCHRIFTEN = configure configure.in install-sh aclocal.m4
@@ -40,4 +40,4 @@ wild-check:
 make-in-build:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/VERSION b/VERSION
index b4ef45ec975977dac718d4b1e31707fa5441b85a..3729e0a8d1f0337fdb5e3d098abadbeac3469d70 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=53
+PATCH_LEVEL=54
 MY_PATCH_LEVEL=
 
 # now used as shell script in configure too

diff --git a/bin/Makefile.am b/bin/Makefile.am
index e571846fc195819f6116b581e325adf9e5788dd2..60fb6d97ea7da76a69924658cfceadd6ec57f26b 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -11,4 +11,4 @@ EXTRA_DIST = Makefile.am.wild $(PAREL_SCHRIFTEN) $(IN_SCHRIFTEN) $(SLANG_SCHRIFT
 clean-local:
        -rm -f flower.pyc
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/bin/mf-to-table.in b/bin/mf-to-table.in
index 58c96c384bbe0eb211266adada5faec4c025c1b5..08016d8128d8b76f128edbf235d71e19d5d9753e 100644 (file)
--- a/bin/mf-to-table.in
+++ b/bin/mf-to-table.in
@@ -15,6 +15,22 @@ import regsub
 import os
 import sys
 import time
+
+
+lilypath =''
+try:
+       lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/'
+except KeyError:
+       try:
+               lilypath = os.environ['top_srcdir'] + '/'
+       except KeyError:
+           print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/'
+
+           sys.exit(1)
+
+lilypath = lilypath + '/bin/'
+sys.path.append(lilypath)
+ 
 from flower import *
 
 begin_autometric_re = regex.compile('@{')

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 8942bdb91e5f2f08edb060a76f56a44d64ce538d..2055f2b3fd939e18c8078ea83850ca933e936366 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = Makefile.am.wild README.Debian TODO changelog control copyright \
        postinst postinst.old.sh postrm preinst rules watch
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/flower/Makefile.am b/flower/Makefile.am
index 99167e4bc6e75edc289b1e729425b552024287c2..952a5e89c28af51c20338d42e1bdfb81f55d9817 100644 (file)
--- a/flower/Makefile.am
+++ b/flower/Makefile.am
@@ -34,4 +34,4 @@ wild-check:
 make-in-build:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/flower/include/Makefile.am b/flower/include/Makefile.am
index 4602b2a2c5b3e615da184f3a3199cbf705c4cb73..e223c15d7e9c644d98d81dbff6e302cda2f9cdc7 100644 (file)
--- a/flower/include/Makefile.am
+++ b/flower/include/Makefile.am
@@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check
 wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/flowertest/Makefile.am b/flowertest/Makefile.am
index 6f8250cf7195f002c8a2afa6947c249426f02d00..240a54cfe4339df14a9b0a37623888f992aea4f1 100644 (file)
--- a/flowertest/Makefile.am
+++ b/flowertest/Makefile.am
@@ -7,13 +7,13 @@ bin_PROGRAMS = test
 
 TESTS = $(top_srcdir)/flowertest/check.sh
 
-test_SOURCES = 
+test_SOURCES = main.cc mat-test.cc pqtest.cc rattest.cc stringtest.cc
 
 test_LDADD = $(top_builddir)/flower/libflower.la @LEXLIB@
 
 EXTRA_DIST = result Makefile.am.wild GNUmakefile check.sh
 
-noinst_HEADERS = 
+noinst_HEADERS = flower-test.hh
 
 INCLUDES = -I$(top_srcdir)/flower/include
 
@@ -24,4 +24,4 @@ all-am: Makefile $(PROGRAMS) wild-check
 wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/init/Makefile.am b/init/Makefile.am
index 9d3d081e666f728a1ff9ff2d3fbf75a4bb7c8c62..1ee3ca1779fed0c8b4a2423a61c3e74b5d5ee1a0 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -1,10 +1,10 @@
 # Generated automatically by wild-perl 0.1
 # init/Makefile.am.wild
 
-INIFILES = deutsch.ly dynamic.ly engraver.ly feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly
+INIFILES = deutsch.ly dynamic.ly engraver.ly italiano.ly lily-init.ly midi.ly nederlands.ly norsk.ly paper11.ly paper13.ly paper16.ly paper20.ly paper26.ly performer.ly property.ly script.ly simple-init.ly svenska.ly table11.ly table13.ly table16.ly table20.ly table26.ly
 EXTRA_DIST = Makefile.am.wild $(INIFILES)
 
-CLEANFILES = feta11.ly feta13.ly feta16.ly feta19.ly feta20.ly feta23.ly feta26.ly
+CLEANFILES = 
 
 FONT_FILES = ../mf/feta-beams16.mf ../mf/feta-beams20.mf ../mf/feta-beams26.mf ../mf/feta-black16.mf ../mf/feta-braces16.mf ../mf/feta-braces20.mf ../mf/feta-din10.mf ../mf/feta-nummer10.mf ../mf/feta-nummer12.mf ../mf/feta-nummer3.mf ../mf/feta-nummer4.mf ../mf/feta-nummer5.mf ../mf/feta-nummer6.mf ../mf/feta-nummer7.mf ../mf/feta-nummer8.mf ../mf/feta-test16.mf ../mf/feta-test20.mf ../mf/feta11.mf ../mf/feta13.mf ../mf/feta16.mf ../mf/feta19.mf ../mf/feta20.mf ../mf/feta23.mf ../mf/feta26.mf
 TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES))
@@ -20,4 +20,4 @@ uninstall-local:
        for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
        -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/input/Makefile.am b/input/Makefile.am
index e684494a8ab3f78a7bf6167d6aafe27a658c9542..3bdf8d9dc1385d445baa2ddeee3059e65fc04dfa 100644 (file)
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -11,4 +11,4 @@ OUTFILES = $(M4FILES:%.m4=%)
 default: all $(OUTFILES)
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6bb5a1746567fdeeef35aa5f9553fe7f67ed1a01..cc5cbdf37672fe4e38d378de46eed6d0524cf2f5 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,7 +12,7 @@ SUBDIRS = include
 
 lib_LTLIBRARIES = liblily.la
 
-liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc includable-lexer.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc
+liblily_la_SOURCES = binary-source-file.cc duration-convert.cc duration.cc input.cc mapped-file-storage.cc moment.cc plet.cc simple-file-storage.cc source-file.cc source.cc template.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc
 
 INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
 MODULE_CXXFLAGS += -D_REENTRANT
@@ -22,4 +22,4 @@ EXTRA_DIST = Makefile.am.wild GNUmakefile
 distclean-local:
        -rm -rf .deps
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/lib/include/Makefile.am b/lib/include/Makefile.am
index 1b8c110a786bd15fc817025696157f93577a542e..89cb06f55d7065639c9a983e26c19239ac9262db 100644 (file)
--- a/lib/include/Makefile.am
+++ b/lib/include/Makefile.am
@@ -1,7 +1,7 @@
 # Generated automatically by wild-perl 0.1
 # lib/include/Makefile
 
-noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh includable-lexer.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh
+noinst_HEADERS = binary-source-file.hh duration-convert.hh duration.hh file-storage.hh input.hh mapped-file-storage.hh moment.hh plet.hh proto.hh simple-file-storage.hh source-file.hh source.hh warn.hh windhoos-suck-suck-suck-thank-you-cygnus.hh
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile
 
@@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check
 wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/lily/Makefile.am b/lily/Makefile.am
index ceab122e88e2c6af4261ef0e41f8687071da5fcd..90903770554838067176fea8dd215e3b7cd1fc13 100644 (file)
--- a/lily/Makefile.am
+++ b/lily/Makefile.am
@@ -14,7 +14,7 @@ bin_PROGRAMS = lilypond
 # ignoring wildcards for `lexer.cc'
 IGNORE_WILDCARDS=lexer.cc parser.cc# ignoring wildcards for `parser.cc'
 IGNORE_WILDCARDS=lexer.cc parser.cc
-lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
+lilypond_SOURCES = abbrev.cc abbreviation-beam-engraver.cc abbreviation-beam.cc atom.cc audio-column.cc audio-element.cc audio-item.cc audio-staff.cc axis-group-administration.cc axis-group-element.cc axis-group-item.cc axis-group-spanner.cc axis.cc bar-column-grav.cc bar-column.cc bar-grav.cc bar-number-grav.cc bar.cc beam-grav.cc beam-swallow-trans.cc beam.cc bow.cc boxes.cc break-align-item.cc break.cc change-iterator.cc change-translator.cc chord-iterator.cc clef-grav.cc clef-item.cc col-info.cc colhpos.cc collision-grav.cc collision.cc command-request.cc crescendo.cc debug.cc dimen.cc directional-spanner.cc dot-column-grav.cc dot-column.cc dots.cc dynamic-grav.cc engraver-group.cc engraver.cc general-script-def.cc global-translator.cc gourlay-breaking.cc graphical-element.cc grouping.cc head-grav.cc header.cc horizontal-align-item.cc horizontal-group-elem.cc horizontal-group-item.cc horizontal-vertical-group-elem.cc horizontal-vertical-group-item.cc idealspacing.cc identifier.cc includable-lexer.cc ineq-constrained-qp.cc item.cc key-grav.cc key-item.cc key-performer.cc key.cc keyword.cc leastsquares.cc lexerinit.cc lily-version.cc line-group-grav.cc line-spacer.cc linear-programming.cc local-key-grav.cc local-key-item.cc lookup.cc lyric-grav.cc lyric-performer.cc main.cc meter-grav.cc meter-performer.cc meter.cc midi-def.cc midi-item.cc midi-stream.cc midi-walker.cc misc.cc molecule.cc music-iterator.cc music-list.cc music-output-def.cc music.cc musical-request.cc my-lily-lexer.cc my-lily-parser.cc note-column.cc note-head.cc note-performer.cc note.cc notename-table.cc offset.cc outputter.cc p-col.cc p-score.cc paper-def.cc performance.cc performer-group-performer.cc performer.cc pitch-squash-grav.cc plet-engraver.cc plet-spanner.cc plet-swallow-engraver.cc priority-halign-grav.cc property-iterator.cc ps-plet.cc qlp.cc qlpsolve.cc request-iterator.cc request.cc rest-collision-grav.cc rest-collision.cc rest-grav.cc rest.cc rhythmic-column-grav.cc rhythmic-head.cc rod.cc score-bar.cc score-column.cc score-elem-info.cc score-elem.cc score-grav.cc score-performer.cc score-priority-grav.cc score.cc scoreline.cc scores.cc script-column.cc script-def.cc script-grav.cc script.cc separating-group-spanner.cc separating-line-group-grav.cc single-malt-grouping-item.cc slur-grav.cc slur.cc span-bar-grav.cc span-bar.cc span-score-bar-grav.cc span-score-bar.cc spanner.cc spring-spacer.cc staff-info.cc staff-performer.cc staff-side.cc staff-sym-grav.cc staff-sym.cc stem-grav.cc stem-info.cc stem.cc super-elem.cc swallow-grav.cc swallow-perf.cc symtable.cc template1.cc template2.cc template3.cc template4.cc template5.cc template6.cc template7.cc template8.cc tex-beam.cc tex-slur.cc tex-stream.cc tex.cc text-def.cc text-item.cc text-spanner.cc tie-grav.cc tie.cc time-description.cc timing-grav.cc timing-translator.cc translation-property.cc translator-ctors.cc translator-group.cc translator.cc type-swallow-trans.cc version.cc vertical-align-elem.cc vertical-align-grav.cc vertical-align-spanner.cc vertical-group-elem.cc vertical-group-spanner.cc voice-iterator.cc warn.cc word-wrap.cc lexer.ll parser.yy
 
 # howto do this? info is not all that clear...
 # OMIT_DEPENDENCIES = lexer.cc parser.cc
@@ -58,4 +58,4 @@ wild-check:
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 make-in-build:
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/lily/include/Makefile.am b/lily/include/Makefile.am
index 2bf88e7bca26f808fab8b46f96025a8350a1b207..d63384fc770014233d70489c72a8268335b643c5 100644 (file)
--- a/lily/include/Makefile.am
+++ b/lily/include/Makefile.am
@@ -1,7 +1,7 @@
 # Generated automatically by wild-perl 0.1
 # lily/include/Makefile.am.wild
 
-noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
+noinst_HEADERS = abbrev.hh abbreviation-beam-engraver.hh abbreviation-beam.hh atom.hh audio-column.hh audio-element.hh audio-item.hh audio-staff.hh axes.hh axis-group-administration.hh axis-group-element.hh axis-group-item.hh axis-group-spanner.hh bar-align-grav.hh bar-column-grav.hh bar-column.hh bar-grav.hh bar-number-grav.hh bar.hh beam-grav.hh beam-swallow-trans.hh beam.hh bow.hh boxes.hh break-align-item.hh break-caching.hh break.hh change-iterator.hh change-translator.hh chord-iterator.hh clef-grav.hh clef-item.hh col-info.hh colhpos.hh collision-grav.hh collision.hh command-request.hh const.hh crescendo.hh debug.hh dimen.hh direction.hh directional-spanner.hh dot-column-grav.hh dot-column.hh dots.hh drul-array.hh dynamic-grav.hh elem-group.hh engraver-group.hh engraver.hh general-script-def.hh glob.hh global-translator.hh gourlay-breaking.hh graphical-element.hh grouping.hh head-column.hh head-grav.hh header.hh horizontal-align-item.hh horizontal-group-elem.hh horizontal-group-item.hh horizontal-vertical-group-elem.hh horizontal-vertical-group-item.hh idealspacing.hh identifier.hh includable-lexer.hh ineq-constrained-qp.hh item.hh key-grav.hh key-item.hh key-performer.hh key.hh keyword.hh leastsquares.hh lily-proto.hh line-group-grav.hh line-spacer.hh linear-programming.hh linespace.hh local-key-grav.hh local-key-item.hh lookup.hh lyric-engraver.hh lyric-performer.hh main.hh meter-grav.hh meter-performer.hh meter.hh midi-def.hh midi-item.hh midi-stream.hh midi-walker.hh minterval.hh misc.hh molecule.hh music-iterator.hh music-list.hh music-output-def.hh music-output.hh music.hh musical-request.hh my-lily-lexer.hh my-lily-parser.hh note-column.hh note-head.hh note-performer.hh notename-table.hh notename.hh offset.hh outputter.hh p-col.hh p-score.hh paper-def.hh parseconstruct.hh performance.hh performer-group-performer.hh performer.hh pitch-squash-grav.hh plet-engraver.hh plet-spanner.hh plet-swallow-engraver.hh priority-halign-grav.hh property-iterator.hh qlp.hh qlpsolve.hh request-iterator.hh request.hh rest-collision-grav.hh rest-collision.hh rest-column-grav.hh rest-column.hh rest-grav.hh rest.hh rhythmic-column-grav.hh rhythmic-head.hh rod.hh score-bar.hh score-column.hh score-elem-info.hh score-elem.hh score-grav.hh score-performer.hh score-priority-grav.hh score.hh scoreline.hh script-column.hh script-def.hh script-grav.hh script.hh separating-group-spanner.hh separating-line-group-grav.hh single-malt-grouping-item.hh slur-grav.hh slur.hh span-bar-grav.hh span-bar.hh span-score-bar-grav.hh span-score-bar.hh spanner.hh spring-spacer.hh staff-info.hh staff-performer.hh staff-side.hh staff-sym-grav.hh staff-sym.hh stem-grav.hh stem-info.hh stem.hh super-elem.hh swallow-grav.hh swallow-perf.hh symtable.hh tex-stream.hh tex.hh text-def.hh text-item.hh text-spanner.hh tie-grav.hh tie.hh time-description.hh timing-grav.hh timing-translator.hh todo-performer.hh translation-property.hh translator-change.hh translator-group.hh translator.hh type-swallow-trans.hh vertical-align-elem.hh vertical-align-grav.hh vertical-align-spanner.hh vertical-group-elem.hh vertical-group-spanner.hh voice-iterator.hh word-wrap.hh dummy.icc minmax.tcc
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile
 
@@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check
 wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/make/Makefile.am b/make/Makefile.am
index 997ce5ec675964d2c0d0bf881d197ffc83c7969b..863e8dc713e6ad3ea203507cbb6cc6fbf9b05130 100644 (file)
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -34,4 +34,4 @@ lilypond.spec: lilypond.spec.in ../VERSION
        cat $< | $(SED_VERSION) | $(SED_DATE) > $@
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/mf/Makefile.am b/mf/Makefile.am
index cee785675fd0e228ab8ac90553708035801b112c..ad5e26321d037a9dc7a72ac6632eebeedec3138d 100644 (file)
--- a/mf/Makefile.am
+++ b/mf/Makefile.am
@@ -23,6 +23,7 @@ texout = $(top_builddir)/tex
 LYTABLES = $(addprefix $(lyout)/, $(FET_FILES:.mf=.ly))
 TEXTABLES = $(addprefix $(texout)/, $(FET_FILES:.mf=.tex))
 
+export top_srcdir
 
 all-local: $(LYTABLES) $(TEXTABLES)
 
@@ -59,4 +60,4 @@ include $(srcdir)/Rules.make
 include $(MFDEPS)
 #
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am
index b18b5e4f9f25459f00a17d0e2d7ed87624e5ded6..594ebdfff823ee75e1417e09e759b473e129bb29 100644 (file)
--- a/mi2mu/Makefile.am
+++ b/mi2mu/Makefile.am
@@ -33,4 +33,4 @@ all-am: Makefile $(PROGRAMS) wild-check
 wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/mi2mu/include/Makefile.am b/mi2mu/include/Makefile.am
index d68e0d2c497b647867c791316902f90678db2868..e5a3775a65c023c18c7625d36d3acd17544a9ef7 100644 (file)
--- a/mi2mu/include/Makefile.am
+++ b/mi2mu/include/Makefile.am
@@ -14,4 +14,4 @@ all: Makefile $(HEADERS) wild-check
 wild-check:
 
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/mutopia/Coriolan/Makefile.am b/mutopia/Coriolan/Makefile.am
new file mode 100644 (file)
index 0000000..933f834
--- /dev/null
+++ b/mutopia/Coriolan/Makefile.am
@@ -0,0 +1,14 @@
+# Generated automatically by wild-perl 0.1
+# mutopia/Coriolan/Makefile.am.wild
+
+LYFILES = clarinetti-part.ly clarinetti.ly clarinetto-1.ly clarinetto-2.ly contrabasso.ly coriolan.ly corni-part.ly corni.ly corno-1.ly corno-2.ly fagotti-part.ly fagotti.ly fagotto-1.ly fagotto-2.ly flauti-part.ly flauti.ly flauto-1.ly flauto-2.ly global.ly oboe-1.ly oboe-2.ly oboi-part.ly oboi.ly timpani.ly trombe-part.ly trombe.ly trombo-1.ly trombo-2.ly viola.ly violino-1.ly violino-2.ly violoncello.ly
+TEXFILES = 
+M4FILES = 
+EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES)
+
+OUTFILES = $(M4FILES:%.m4=%)
+
+default: all $(OUTFILES)
+
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/mutopia/J.S.Bach/Makefile.am b/mutopia/J.S.Bach/Makefile.am
index f87f282ea2cfd774e9ee21cc750c91e496953109..ae4b8fac30f4295d8b55cb293211aaff5ce88bd1 100644 (file)
--- a/mutopia/J.S.Bach/Makefile.am
+++ b/mutopia/J.S.Bach/Makefile.am
@@ -10,5 +10,11 @@ OUTFILES = $(M4FILES:%.m4=%)
 
 default: all $(OUTFILES)
 
+# ugh
+M4 = m4
+
+%.ly: $(srcdir)/%.ly.m4
+       $(M4) $< > $@
+
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/mutopia/Makefile.am b/mutopia/Makefile.am
index 1ea267e2800bbf9950bbc4f2d3890fb317d1e8e8..6271bc118ab71838a78d03219b1b7b3c87b645fd 100644 (file)
--- a/mutopia/Makefile.am
+++ b/mutopia/Makefile.am
@@ -1,7 +1,7 @@
 # Generated automatically by wild-perl 0.1
 # mutopia/Makefile.am.wild
 
-SUBDIRS = J.S.Bach
+SUBDIRS = J.S.Bach Coriolan
 
 LYFILES = gallina.ly los-toros-oboe.ly standchen-16.ly standchen-20.ly standchen.ly standje.ly
 TEXFILES = gallina.tex los-toros-oboe-20.tex standchen-16.tex standchen-20.tex
@@ -12,4 +12,4 @@ OUTFILES = $(M4FILES:%.m4=%)
 
 default: all $(OUTFILES)
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644 (file)
index 0000000..88f709d
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,24 @@
+# Generated automatically by wild-perl 0.1
+# project  LilyPond -- the musical typesetter
+# title           makefile for test
+# file    test/Makefile.am.wild
+
+TEST_SCHRIFTEN = check-lily-midi.sh check-lily-paper.sh check-mi2mu.sh
+
+# ugh ugh
+TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh
+
+INPUTS = test.midi
+
+RESULTS = ok.midi ok.tex ok.ly
+
+EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS)
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@

diff --git a/tex/Makefile.am b/tex/Makefile.am
index 292c05971084321f9a789fcb8ef75c0808104dc5..03be784a5bee582bbb1531062ff2b2698149a1ff 100644 (file)
--- a/tex/Makefile.am
+++ b/tex/Makefile.am
@@ -1,10 +1,10 @@
 # Generated automatically by wild-perl 0.1
 # tex/Makefile.am.wild
 
-TEXFILES = dyndefs.tex eglerdefs.tex feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex
+TEXFILES = dyndefs.tex eglerdefs.tex fetdefs.tex lily-mf-defs.tex lily-ps-defs.tex lilyponddefs.tex ltest.tex taupindefs.tex titledefs.tex
 EXTRA_DIST = Makefile.am.wild $(TEXFILES)
 
-CLEANFILES = feta11.tex feta13.tex feta16.tex feta19.tex feta20.tex feta23.tex feta26.tex
+CLEANFILES = 
 
 install-data-local:
        $(INSTALL) -d $(TEXDIR)/lilypond
@@ -14,4 +14,4 @@ uninstall-local:
        for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
        -rmdir $(TEXDIR)/lilypond/
 $(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
-       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@