lilypond-0.1.48

diff --git a/lily/Makefile b/lily/Makefile
index be43876df37bd7eb11c9ba0e77df5714bb5f267f..936d4c31a73fc0df74e31c42933b0928d3b453e8 100644 (file)
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -38,7 +38,7 @@ EXTRA_DISTFILES = VERSION
 # list of custom libraries:
 #
 MODULE_LIBDEPS= check-flower-deps check-lib-deps 
-MODULE_LIBES= -llily -lflower  -lmcheck
+MODULE_LIBES= -llily -lflower
 
 #
 

diff --git a/lily/include/staff-sym.hh b/lily/include/staff-sym.hh
index 4a4888a5226d17541488a5f8131ae1d52e975f2c..5051dd9e072ee0e6f35b734278a8adf9d6f8431c 100644 (file)
--- a/lily/include/staff-sym.hh
+++ b/lily/include/staff-sym.hh
@@ -17,12 +17,13 @@
   */
 class Staff_symbol : public Spanner
 {
+public:
   /// this many lines.
   int no_lines_i_;
   Real interline_f_;
-public:
+
   DECLARE_MY_RUNTIME_TYPEINFO;
-  Staff_symbol (int lines);
+  Staff_symbol ();
   Real inter_note_f() const;
   int steps_i() const;
 protected:

diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc
index ea4576e59bcbca41c382fb6d175c8b4584e4a8e6..e51f1d37c5f34a4f83af7b1d448794a73005c9de 100644 (file)
--- a/lily/staff-sym.cc
+++ b/lily/staff-sym.cc
@@ -13,9 +13,9 @@
 #include "dimen.hh"
 
 
-Staff_symbol::Staff_symbol (int l)
+Staff_symbol::Staff_symbol ()
 {
-  no_lines_i_ = l;
+  no_lines_i_ = 5;
   interline_f_ =  0 PT;
 }
 

diff --git a/make/Variables.make b/make/Variables.make
index e7564f48a4bc691081827005b58e52ef8dbc95a4..efe49e20f77cfe2ab7062e6aaae71cb689decfd6 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -153,7 +153,7 @@ CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)
 INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) 
 CXX_OUTPUT_OPTION = $< -o $@
 LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/$(OUTDIR_NAME) -L$(depth)/flower/$(OUTDIR_NAME)
-LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES) -lg++ -lstdc++ # need lg++ for win32, really!
+LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES)  -lstdc++ # need lg++ for win32, really!
 #
 
 # macro compiler: