lilypond-0.1.50

diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc
index c3ea8c1e363a716ded4c4bbe69b463223555f532..453a955072379a86686b1c5887a3554e05629652 100644 (file)
--- a/lily/tie-grav.cc
+++ b/lily/tie-grav.cc
@@ -38,17 +38,12 @@ Tie_engraver::do_post_move_processing()
     }
 }
 
-bool
-Tie_engraver::acceptable_request_b (Request*r)
-{
-  return r->musical() && r->musical ()->tie ();
-}
-
 bool
 Tie_engraver::do_try_request (Request*r)
 {
-  if (!acceptable_request_b (r))
+  if (! (r->musical() && r->musical ()->tie ()))
     return false;
+  
   if (req_l_)
     {
       return false;

diff --git a/mi2mu/Makefile.am b/mi2mu/Makefile.am
index 174780582134effa2af6fc2c7f98e59d7fc11ed7..54b91154cdee75078bed06276cc6e81cb6fdfa7e 100644 (file)
--- a/mi2mu/Makefile.am
+++ b/mi2mu/Makefile.am
@@ -1,5 +1,4 @@
-# Automatically generated from ./lilypond-0.1.49/mi2mu/Makefile.am.wild by bin/autowild
-# Do not edit
+# Generated automatically by wild-perl 0.1
 # project  LilyPond -- the musical typesetter
 # title           makefile for mi2mu
 # file    mi2mu/Makefile.am.wild
@@ -14,11 +13,14 @@ bin_PROGRAMS = mi2mu
 
 mi2mu_SOURCES = main.cc mi2mu-version.cc midi-parser.cc midi-score-parser.cc midi-track-parser.cc mudela-column.cc mudela-item.cc mudela-score.cc mudela-staff.cc mudela-stream.cc mudela-voice.cc template.cc version.cc
 
-mi2mu_LDADD = -llily -lflower
+# ugh -lfl bo lib/FlexLexer stuff
+mi2mu_LDADD = -llily -lflower -lfl
 
-mi2mu_LDFLAGS = -L../lib -L../flower
+mi2mu_LDFLAGS = -L$(LILYPOND_SOURCEDIR)/lib/.libs -L$(LILYPOND_SOURCEDIR)/flower/.libs
 
-INCLUDES = -Iinclude -I../lib/include -I../flower/include
+INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
 
 EXTRA_DIST = Makefile.am.wild VERSION TODO
 
+$(srcdir)/Makefile.am: $(srcdir)/Makefile.am.wild
+       $(PERL) $(top_srcdir)/bin/wild-perl < $< > $@
\ No newline at end of file