lilypond-0.0.45

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index cdbfd35b785da9624948664f38e721dee9f978dd..57909e87086413edc856c826600e7ab32b0f5e8c 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -29,13 +29,15 @@ static Keyword_ent the_key_tab[]={
     "dynamic", DYNAMIC,
     "geometric", GEOMETRIC,
     "in", IN_T,
-    "lyrics", LYRICS,
+    "lyric", LYRIC,
     "key", KEY,
     "melodic" , MELODIC,
+    "melodic_request", MELODIC_REQUEST,
     "meter", METER,
     "midi", MIDI,
     "mm", MM_T,
     "multivoice", MULTIVOICE,
+    "note", NOTE,
     "octave", OCTAVECOMMAND,
     "output", OUTPUT,
     "partial", PARTIAL,
@@ -56,7 +58,6 @@ static Keyword_ent the_key_tab[]={
     "transpose", TRANSPOSE,
     "unitspace", UNITSPACE,
     "width", WIDTH,
-    "music", MUSIC,
     "grouping", GROUPING,
     0,0
 };

diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
new file mode 100644 (file)
index 0000000..e9b0ef5
--- /dev/null
+++ b/make/Toplevel.make.in
@@ -0,0 +1,68 @@
+# -*-Makefile-*-
+#
+# @configure_input@
+#
+# project  LilyPond -- the musical typesetter
+# title           top level makefile for LilyPond  
+# file    Makefile 
+#
+# Copyright (c) 1997 by    
+#      Jan Nieuwenhuizen <jan@digicash.com>
+#      Han-Wen Nienhuys <hanwen@stack.nl>
+#              ...your sort order here, or how to comment-out a comment
+
+# subdir level:
+#
+depth = .
+#
+
+# identify module:
+#
+NAME = lilypond
+include .version
+include ./$(depth)/make/Version.make
+
+# generic variables:
+#
+include ./$(depth)/make/Variables.make 
+#
+
+# descent order into subdirectories:
+#
+SUBDIRS = flower lib lily mi2mu \
+       Documentation bin init input tex make
+#
+
+# list of distribution files:
+#
+SCRIPTS = configure configure.in install-sh
+README_FILES = ANNOUNCE COPYING NEWS README TODO INSTALL.text
+EXTRA_DISTFILES=  .dstreamrc .version $(README_FILES) $(SCRIPTS) $(SYMLINKS)
+
+# do not dist ./Makefile (is copied from make/Toplevel.make)
+DISTFILES:=$(EXTRA_DISTFILES)# Makefile $(ALL_SOURCES)
+#
+
+
+# generic targets and rules:
+#
+include ./$(depth)/make/Targets.make
+include ./$(depth)/make/Rules.make
+#
+
+localdist: configure
+
+INSTALL.text: check-doc-deps
+       rm -f INSTALL.text
+       ln `find -name INSTALL.text|head -1` .
+
+localclean:
+       rm -f $(allexe) core config.cache config.log config.status 
+       rm -f $(outdir)/*.{class,html,gif}
+
+localinstall: all
+       $(INSTALL) -d $(bindir)
+       $(INSTALL) -m 755 $(allexe) $(bindir)
+
+localuninstall:
+       for i in $(allexe); do rm -f $(bindir)/`basename $$i`; done