X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=elisp%2FGNUmakefile;h=b7308e2040d8a333974b92a629bb82238343ceb8;hb=635394275d8eff363b09b232bb84ec04d3bcf64b;hp=09e23a203ddb228e85f8a6ff206071b2defc36e4;hpb=c6544399495457808105187091178c023508a00f;p=lilypond.git

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index 09e23a203d..b7308e2040 100644
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -6,20 +6,23 @@ INSTALLATION_DIR=$(elispdir)
 INSTALLATION_FILES=$(EL_FILES)
 
 INSTALLATION_OUT_DIR=$(elispdir)
-INSTALLATION_OUT_FILES=$(outdir)/lilypond.words.el
+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 $(outdir)/lilypond.words.vim
+LILYPOND_WORDS = $(outdir)/lilypond-words.el
 LILYPOND_WORDS_DEPENDS =\
-  $(topdir)/lily/my-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 $(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)