Web-ja: update introduction

[lilypond.git] / elisp / GNUmakefile

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index 8de1d552da83fcb87c6fe9aa2d4c520e8647aa41..b7308e2040d8a333974b92a629bb82238343ceb8 100644 (file)
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -10,16 +10,19 @@ INSTALLATION_OUT_FILES=$(outdir)/lilypond-words.el
 
 STEPMAKE_TEMPLATES=elisp install install-out
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 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)/ly/engraver-init.ly
+  $(top-src-dir)/lily/lily-lexer.cc \
+  $(buildscript-dir)/lilypond-words \
+  $(top-src-dir)/scm/markup.scm \
+  $(top-src-dir)/ly/engraver-init.ly
 
-$(LILYPOND_WORDS): 
-       cd $(topdir) && $(PYTHON) buildscripts/lilypond-words.py --el --dir=$(builddir)/elisp/$(outconfbase)
+$(buildscript-dir)/lilypond-words:
+       make -C $(depth)/scripts/build
+
+$(LILYPOND_WORDS):
+       cd $(top-src-dir) && $(buildscript-dir)/lilypond-words --el --dir=$(top-build-dir)/elisp/$(outconfbase)
 
 all: $(LILYPOND_WORDS)