+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_.
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:
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
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',],
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
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
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',],