* Fix some problems after the renaming of my-lily -> lily

diff --git a/ChangeLog b/ChangeLog
index d65f974c2a0dd866323713211d858b5178f6a79a..9f0f7146f738fdd0e23a64b519d5470139543d0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-02  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * Fix some problems after the renaming of my-lily -> lily
+
 2004-08-02  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/lily-parser.cc (parse_string): don't overwrite keytable_.

diff --git a/buildscripts/lilypond-words.py b/buildscripts/lilypond-words.py
index 7d28c72cbc020dd26794274a399bd35f24a7bfa0..2f6945e9876a0091932e97285efc8c183ecf3e50 100755 (executable)
--- a/buildscripts/lilypond-words.py
+++ b/buildscripts/lilypond-words.py
@@ -16,7 +16,7 @@ for line in ['include','maininput','version']:
     kw = kw + [line]
 
 # the main keywords
-F = open('lily/my-lily-lexer.cc', 'r')
+F = open('lily/lily-lexer.cc', 'r')
 for line in F.readlines():
     m = re.search(r"(\s*{\")(.*)(\",\s*.*},\s*\n)",line)
     if m:

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index b68847804c1862dadba09f33d42b10137b3db896..8de1d552da83fcb87c6fe9aa2d4c520e8647aa41 100644 (file)
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -14,7 +14,7 @@ include $(depth)/make/stepmake.make
 
 LILYPOND_WORDS = $(outdir)/lilypond-words.el
 LILYPOND_WORDS_DEPENDS =\
-  $(topdir)/lily/my-lily-lexer.cc \
+  $(topdir)/lily/lily-lexer.cc \
   $(buildscript-dir)/lilypond-words.py \
   $(topdir)/scm/new-markup.scm \
   $(topdir)/ly/engraver-init.ly

diff --git a/elisp/SConscript b/elisp/SConscript
index 1247af9f41aba7321d5bc236bd6e539685f1a332..950f34530a120c4e7eae61faeb7ddfef5a15b969 100644 (file)
--- a/elisp/SConscript
+++ b/elisp/SConscript
@@ -6,7 +6,7 @@ sources = src_glob ('*.el') + ['lilypond-words.el']
 e = env.Copy ()
 a = '$PYTHON $srcdir/buildscripts/lilypond-words.py --el --dir=${TARGET.dir}'
 e.Command ('lilypond-words.el',
-          ['#/lily/my-lily-lexer.cc',
+          ['#/lily/lily-lexer.cc',
            '#/buildscripts/lilypond-words.py',
            '#/scm/new-markup.scm',
            '#/ly/engraver-init.ly',],

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 235dc8ad0feb30a1ec827a0432cb29fe37f50e62..6e964e038f29c9f6969478ce044fe189706ed106 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -25,8 +25,8 @@ ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 default:
 
 # force these: Make can't know these have to be generated in advance
-$(outdir)/my-lily-parser.o: $(outdir)/parser.hh
-$(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
+$(outdir)/lily-parser.o: $(outdir)/parser.hh
+$(outdir)/lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
 $(outdir)/kpath.o: $(outdir)/version.hh

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 81772b86f40d1a935aafd95d29fec61ec98a1b86..e5f12f14f1d14f4b8ab4198997408be0bc0e54f3 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -8,7 +8,7 @@ EXTRA_DIST_FILES=$(wildcard *.vim) vimrc
 
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\
-  $(topdir)/lily/my-lily-lexer.cc \
+  $(topdir)/lily/lily-lexer.cc \
   $(buildscript-dir)/lilypond-words.py \
   $(topdir)/scm/new-markup.scm \
   $(topdir)/ly/engraver-init.ly

diff --git a/vim/SConscript b/vim/SConscript
index 40d915a4c4685efa0040d5922822918388f59872..9b3fc62e11e5cb7266ac252a910aed77f20fc018 100644 (file)
--- a/vim/SConscript
+++ b/vim/SConscript
@@ -6,7 +6,7 @@ sources = src_glob ('*.vim') + ['lilypond-words.vim']
 e = env.Copy ()
 a = '$PYTHON $srcdir/buildscripts/lilypond-words.py --words --vim --dir=${TARGET.dir}'
 e.Command ('lilypond-words.vim',
-          ['#/lily/my-lily-lexer.cc',
+          ['#/lily/lily-lexer.cc',
            '#/buildscripts/lilypond-words.py',
            '#/scm/new-markup.scm',
            '#/ly/engraver-init.ly',],