From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 30 Mar 2005 09:56:07 +0000 (+0000)
Subject: * buildscripts/lilypond-words.py (F):
X-Git-Tag: release/2.5.18~41
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=68cf7ef0e80c31fbe977f1aa3be601482440684e;p=lilypond.git

* 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 7373d2d612..b0e1c0b343 100644
--- 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 5075b6852c..9059b1d749 100755
--- 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 8de1d552da..97558ad019 100644
--- 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 950f34530a..380490c08b 100644
--- 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 33402fc846..c33f0b02de 100644
--- 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 9b3fc62e11..6896a7b6f6 100644
--- 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)