From e072903f502537b0157b85fcc5c32de1b736463a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:34:32 +0000 Subject: [PATCH] lilypond-0.0.40 --- Makefile | 9 +++++---- lily/voice-elt.cc | 18 +++++++++--------- make/Builtin-rules.make | 41 +++++++++++++++++++++++++++++++++++++++++ make/Include.make | 6 +++--- make/Sources.make | 16 ++++++++-------- make/User.make | 2 +- 6 files changed, 67 insertions(+), 25 deletions(-) create mode 100644 make/Builtin-rules.make diff --git a/Makefile b/Makefile index b8abfd8b66..bbbf5763ce 100644 --- a/Makefile +++ b/Makefile @@ -33,15 +33,16 @@ include ./$(depth)/make/Variables.make # descent order into subdirectories: # -SUBDIRS = flower lib lily m2m \ - Documentation bin init input make tex +SUBDIRS = flower lib lily mi2mu \ + Documentation bin init input tex make # # list of distribution files: # -SYMLINKS = configure +# SYMLINKS = # naah, configure +SCRIPTS = configure README_FILES = ANNOUNCE COPYING INSTALL NEWS README TODO -DISTFILES= Makefile .version $(README_FILES) $(SYMLINKS) +DISTFILES= Makefile .dstreamrc .version $(README_FILES) $(SCRIPTS) $(SYMLINKS) # # generic targets and rules: diff --git a/lily/voice-elt.cc b/lily/voice-elt.cc index 90060ec43c..e932e4d403 100644 --- a/lily/voice-elt.cc +++ b/lily/voice-elt.cc @@ -61,8 +61,8 @@ Voice_element::find_plet_start_bo(char c, Moment& moment_r) { assert( c == ']' ); moment_r += duration; - for ( PCursor req_l_pcur( reqs.top() ); req_l_pcur.ok(); req_l_pcur++ ) { - if (req_l_pcur->beam() && req_l_pcur->beam()->spantype == Span_req::START ) + for ( PCursor i( reqs.top() ); i.ok(); i++ ) { + if (i->beam() && i->beam()->spantype == Span_req::START ) return true; } return false; @@ -86,12 +86,12 @@ Voice_element::set_plet_backwards(Moment& now_moment_r, now_moment_r += duration; if ( now_moment_r > until_moment ) return; - for ( PCursor req_l_pcur( reqs.top() ); req_l_pcur.ok(); req_l_pcur++ ) { - if (req_l_pcur->beam() && req_l_pcur->beam()->spantype == Span_req::START ) - req_l_pcur->beam()->nplet = den_i; - if (req_l_pcur->rhythmic()) - req_l_pcur->rhythmic()->plet_factor = Moment(num_i, den_i); - if (req_l_pcur->stem()) - req_l_pcur->stem()->plet_factor = Moment(num_i, den_i); + for ( PCursor i( reqs.top() ); i.ok(); i++ ) { + if (i->beam() && i->beam()->spantype == Span_req::START ) + i->beam()->nplet = den_i; + if (i->rhythmic()) + i->rhythmic()->plet_factor = Moment(num_i, den_i); + if (i->stem()) + i->stem()->plet_factor = Moment(num_i, den_i); } } diff --git a/make/Builtin-rules.make b/make/Builtin-rules.make new file mode 100644 index 0000000000..b5fd253b0a --- /dev/null +++ b/make/Builtin-rules.make @@ -0,0 +1,41 @@ +# +# project LilyPond -- the musical typesetter +# title cancel all built-in rules +# file make/Builtin-rules.make +# +# Copyright (c) 1997 by +# Jan Nieuwenhuizen +# Han-Wen Nienhuys + +# no assembly sources +%.o : %.s + +# no c sources +%.o : %.c + +# not using RCS +% :: RCS/%,v +$(outdir)/% :: $(outdir)/RCS/%,v +% : RCS/%,v +$(outdir)/% : $(outdir)/RCS/%,v +%.c : RCS/%,v +%.cc : RCS/%,v +%.hh : RCS/%,v +%.make : RCS/%,v +$(outdir)/%.dep : $(outdir)/RCS/%,v +%.dep : RCS/%.dep,v +$(outdir)/%.dep : $(outdir)/RCS/%.dep,v + +# lily knows better +%.tab.c %.tab.h : %.y + +# fine suffixes: +Makefile : +%.cc : +%.dep : +$(outdir)/%.dep: +%.hh : +%.make : +%.p : + + diff --git a/make/Include.make b/make/Include.make index 987b1fa264..017694538f 100644 --- a/make/Include.make +++ b/make/Include.make @@ -25,17 +25,17 @@ include ./$(depth)/make/Variables.make # list of c++ header files: # -HHFILES = $(shell ls *.hh) +HHFILES = $(shell ls *.hh $(ERROR_LOG)) # # list of c++ inline files: # -INLFILES = $(shell ls *.inl) +INLFILES = $(shell ls *.inl $(ERROR_LOG)) # # list of c++ template files: # -TCCFILES = $(shell ls *.tcc) +TCCFILES = $(shell ls *.tcc $(ERROR_LOG)) # # list of distribution files: diff --git a/make/Sources.make b/make/Sources.make index 98eea71710..6411aa2e5a 100644 --- a/make/Sources.make +++ b/make/Sources.make @@ -87,9 +87,9 @@ stablecc=request.cc bar.cc boxes.cc break.cc \ voice.cc wordwrap.cc spanner.cc -# m2m headers +# mi2mu headers # -mym2mhh=\ +mymi2muhh=\ duration.hh\ lily-stream.hh\ midi-event.hh\ @@ -102,16 +102,16 @@ mym2mhh=\ # -# m2m shared headers +# mi2mu shared headers # -mym2msharedhh=\ +mymi2musharedhh=\ binary-source-file.hh\ # -# m2m source +# mi2mu source # -mym2mcc=\ +mymi2mucc=\ duration.cc\ lily-stream.cc\ midi-event.cc\ @@ -125,9 +125,9 @@ mym2mcc=\ # -# m2m shared source +# mi2mu shared source # -mym2msharedcc=\ +mymi2musharedcc=\ binary-source-file.cc\ inputfile.cc\ sourcefile.cc\ diff --git a/make/User.make b/make/User.make index 5a8be80454..383f6d4777 100644 --- a/make/User.make +++ b/make/User.make @@ -26,7 +26,7 @@ DEBUGFLAG=-g # turn off -pipe if linker doesn't support it # -USER_CXXFLAGS=-pipe -Wall -W -Wmissing-prototypes -DSTRING_UTILS_INLINED -O +USER_CXXFLAGS=-pipe -Wall -W -Wmissing-prototypes -DSTRING_UTILS_INLINED # # -- 2.39.5