* buildscripts/lilypond-words.py (F):

* elisp/SConscript (a):
* elisp/GNUmakefile (LILYPOND_WORDS_DEPENDS):
* vim/SConscript (a):
* vim/GNUmakefile (LILYPOND_WORDS_DEPENDS): Update.

diff --git a/ChangeLog b/ChangeLog
index 7373d2d612de3204a62a988204beb65a46975497..b0e1c0b343cf506ed500df439472c0245efe6a97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * buildscripts/lilypond-words.py (F): 
+       * elisp/SConscript (a): 
+       * elisp/GNUmakefile (LILYPOND_WORDS_DEPENDS):
+       * vim/SConscript (a): 
+       * vim/GNUmakefile (LILYPOND_WORDS_DEPENDS): Update.
+
        * lily/general-scheme.cc: Build fix.
 
        * scm/markup.scm:

diff --git a/buildscripts/lilypond-words.py b/buildscripts/lilypond-words.py
index 5075b6852c2e407b9cf774e902e2f46f7ae7c819..9059b1d749b24a2649f5e8b2bda77c061f40ca3c 100755 (executable)
--- a/buildscripts/lilypond-words.py
+++ b/buildscripts/lilypond-words.py
@@ -24,7 +24,7 @@ for line in F.readlines():
 F.close()
 
 # keywords in markup
-F = open('scm/new-markup.scm', 'r')
+F = open('scm/markup.scm', 'r')
 for line in F.readlines():
     m = re.search(r"^(\s*\(cons\s*)([a-z-]*)(-markup)",line)
     if m:

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index 8de1d552da83fcb87c6fe9aa2d4c520e8647aa41..97558ad019db00be159a5b87e35cb0cafbe772c4 100644 (file)
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -16,7 +16,7 @@ LILYPOND_WORDS = $(outdir)/lilypond-words.el
 LILYPOND_WORDS_DEPENDS =\
   $(topdir)/lily/lily-lexer.cc \
   $(buildscript-dir)/lilypond-words.py \
-  $(topdir)/scm/new-markup.scm \
+  $(topdir)/scm/markup.scm \
   $(topdir)/ly/engraver-init.ly
 
 $(LILYPOND_WORDS): 

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

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 33402fc846ce328727eee88b154a90aba7e1b41d..c33f0b02de1ec931658e88ee3b08380474cd0489 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -10,7 +10,7 @@ LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\
   $(topdir)/lily/lily-lexer.cc \
   $(buildscript-dir)/lilypond-words.py \
-  $(topdir)/scm/new-markup.scm \
+  $(topdir)/scm/markup.scm \
   $(topdir)/ly/engraver-init.ly
 
 STEPMAKE_TEMPLATES=install-out

diff --git a/vim/SConscript b/vim/SConscript
index 9b3fc62e11e5cb7266ac252a910aed77f20fc018..6896a7b6f633b65933c364fee5f85f844a916e8b 100644 (file)
--- a/vim/SConscript
+++ b/vim/SConscript
@@ -8,7 +8,7 @@ a = '$PYTHON $srcdir/buildscripts/lilypond-words.py --words --vim --dir=${TARGET
 e.Command ('lilypond-words.vim',
           ['#/lily/lily-lexer.cc',
            '#/buildscripts/lilypond-words.py',
-           '#/scm/new-markup.scm',
+           '#/scm/markup.scm',
            '#/ly/engraver-init.ly',],
           a)