From 18df80ef5820186a2812cc8c20c2e982fc9504e9 Mon Sep 17 00:00:00 2001
From: matsb <matsb>
Date: Mon, 2 Aug 2004 12:56:41 +0000
Subject: [PATCH] 	* Fix some problems after the renaming of my-lily ->
 lily

---
 ChangeLog                      | 4 ++++
 buildscripts/lilypond-words.py | 2 +-
 elisp/GNUmakefile              | 2 +-
 elisp/SConscript               | 2 +-
 lily/GNUmakefile               | 4 ++--
 vim/GNUmakefile                | 2 +-
 vim/SConscript                 | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d65f974c2a..9f0f7146f7 100644
--- 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 7d28c72cbc..2f6945e987 100755
--- 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 b68847804c..8de1d552da 100644
--- 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 1247af9f41..950f34530a 100644
--- 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 235dc8ad0f..6e964e038f 100644
--- 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 81772b86f4..e5f12f14f1 100644
--- 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 40d915a4c4..9b3fc62e11 100644
--- 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',],
-- 
2.39.5