lilypond-0.0.64

diff --git a/Documentation/INSTALL.pod b/Documentation/INSTALL.pod
index 556f8690f8c406cec0924c0b490cc943b6812d3a..ef26b32fd367f7903e7ae5519a837dc37974cafd 100644 (file)
--- a/Documentation/INSTALL.pod
+++ b/Documentation/INSTALL.pod
@@ -154,8 +154,9 @@ If you do
        make all
 
 everything will be compiled, but nothing will be installed.  The
-resulting binaries can be found in the subdirectory
-F<bin/>.
+resulting binaries can be found in the subdirectories F<out/> (which
+contain all files generated during compilation).
+
 
 =head1 INSTALLING
 
@@ -165,7 +166,7 @@ If you have done a successful C<make>, then a simple
 
 should do the trick. 
 
-[todo]
+[todo. Obsolete; fonts are in distribution now.]
 
 Install the musixtex fonts in a directory which TeX and MF knows (if
 you are root, look for a directory which contains the directories with

diff --git a/bin/Makefile b/bin/Makefile
index faa5163efe9182a1fa3a5328adf3cb3fcf374b04..ad9f6bb05b5b70613b469ca9ff7cba22df0bf468 100644 (file)
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -13,6 +13,7 @@ EXTRA_DISTFILES = $(SCRIPTS)
 #
 
 
+EXECUTABLES=convert-mudela 
 localinstall: all
        $(INSTALL) -d $(bindir)
        $(INSTALL) -m 755 convert-mudela $(bindir)

diff --git a/flower/test/Makefile b/flower/test/Makefile
index bf271c4d26575274e27a318c01cc7738dcf4ba1a..0cc3bb960c5d2515ad05e64939c25e49073fafff 100644 (file)
--- a/flower/test/Makefile
+++ b/flower/test/Makefile
@@ -42,7 +42,6 @@ MODULE_LIBES = -lflower
 
 # main target of this module:
 #
-MAINTARGET = $(lily_bindir)/$(EXECUTABLE)# huh?
 BUILDSTRINGTEST=$(MAINTARGET)
 EXECSTRINGTEST=$(EXECUTABLE)
 

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 068a30de4ecb92aca3953183ede2687b1faf3e89..fe236e4dca73eee8f6bcaec422f7f84839086418 100644 (file)
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -8,6 +8,7 @@
  copyright:public domain
 
  Tested Features: multiple meters, beaming
+       unsynced bars
 EndMudelaHeader
 %}
 \version "0.0.57";
@@ -50,7 +51,7 @@ ritme = \staff {
 another = \staff {
        melodicregs
        \melodic{ \meter 4/4; 
-               c1 c1 c1 c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+               c1.  c1. c4 c4 c4 c4  \meter  4/4; c1 c1 c1
         }
 }
 
@@ -66,6 +67,7 @@ yanother = \staff     {
        another
        yanother
        
+       \midi { }
        \paper{
                \unitspace 2\cm
                \geometric 1.3

diff --git a/lily/.version b/lily/.version
index e929572e511eb9d3ee1cf4d9995028e8a67bb54a..a01151100b75616c464676cca43edca578fbf52a 100644 (file)
--- a/lily/.version
+++ b/lily/.version
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 63
+PATCH_LEVEL = 64
 
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf

diff --git a/make/Targets.make b/make/Targets.make
index 52f0f96e6a5e93c8c17949be68335b435c53be75..0a5a87b61300f7dc8984f64844501a6740879da9 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -29,7 +29,7 @@ include ./$(depth)/make/out/Site.make
 
 # dependency list of executable:
 #
-EXECUTABLE = $(lily_bindir)/$(NAME)
+
 $(EXECUTABLE): $(build) $(OFILES)
        $(MAKE) $(MODULE_LIBDEPS) 
        $(INCREASE_BUILD)
@@ -64,14 +64,19 @@ $(SHAREDLIBRARY):  $(build) $(OFILES) $(MODULE_LIBDEPS)
 lib: $(LIBRARY)
 #
 TOCLEAN= $(allobs) $(alldeps)
+
+# be careful about deletion.
 clean: localclean
+       rm -f core 
+ifdef EXECUTABLE
+       rm -f $(EXECUTABLE)
+endif
 ifdef allobs
        rm -f $(allobs)
 endif
 ifdef alldeps
        rm -f $(alldeps)
 endif
-       rm -f core
 ifdef SUBDIRS
        set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
 endif
@@ -222,3 +227,9 @@ rpm:
        rpm -ba $(makeout)/lilypond.spec
 #
 
+installexe:
+       $(INSTALL) -d $(bindir)
+       $(INSTALL) -m 755 $(EXECUTABLES) $(bindir)
+
+uninstallexe:
+       for a in $(EXECUTABLES); do rm -f $(bindir)/`basename $a`; done

diff --git a/make/Variables.make b/make/Variables.make
index 4cc56e118bd815cef6be4a6fc9a51d756ce57941..9ddf1d56916c1641c381a58ffd0657de9092256b 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -95,7 +95,6 @@ DUMMYDEPS=\
 #
 ERROR_LOG = 2> /dev/null
 SILENT_LOG = 2>&1 >  /dev/null
-allexe = $(lily_bindir)/lilypond $(lily_bindir)/mi2mu
 date = $(shell date +%x)
 allhh := $(shell $(FIND) ./ -name "*.hh" $(ERROR_LOG))
 allcc := $(shell $(FIND)  ./ -name "*.cc" $(ERROR_LOG))
@@ -170,7 +169,8 @@ DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
 
 # generic target names:
 #
-EXECUTABLE = $(NAME)$(EXE)
+EXECUTABLE = $(outdir)/$(NAME)$(EXE)
+EXECUTABLES = $(EXECUTABLE)
 LIB_PREFIX = lib
 
 ifndef LIB_SUFFIX