lilypond-0.0.28

diff --git a/deps/Makefile b/deps/Makefile
index 4a3104af2ff9f9f7fb8fab2ab23edc269d84234e..79265b1c0f9615f77883bda077f21bdfc22ed4a8 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,9 +1,12 @@
-DISTFILES=Makefile
+DISTFILES=Makefile dummy.dep
 
-default:
 
 
-dist:
+dummy.dep:
+       touch dummy.dep
+
+
+dist: $(DISTFILES)
        ln $(DISTFILES) $(DDIR)/$(SUBDIR)
 
 clean:

diff --git a/src/pscore.cc b/src/pscore.cc
index 83f71f440cb4f434871691d519cb0396cf6231e7..89a58be790d59e0adce89aefbd1ffe8f26d9e226 100644 (file)
--- a/src/pscore.cc
+++ b/src/pscore.cc
@@ -9,7 +9,7 @@
 #include "pscore.hh"
 #include "tstream.hh"
 #include "item.hh"
-
+#include "break.hh"
 
 Idealspacing*
 PScore::get_spacing(PCol*l, PCol*r)
@@ -229,7 +229,7 @@ PScore::add_broken(Spanner*s)
 }
 
 void
-PScore::set_breaking(Array<Col_configuration> breaking)
+PScore::set_breaking(Array<Col_hpositions> breaking)
 {
     for (int j=0; j < breaking.size(); j++) {
        Array<PCol*> &curline(breaking[j].cols);