X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=elisp%2FGNUmakefile;h=9dcdf1ce6ed158339f0473176400d5a64078f3e5;hb=81b5ad4f11cdb296c69fcd2259effbc75a3c9054;hp=b68847804c1862dadba09f33d42b10137b3db896;hpb=d59c519d8248e9c337f9020e98242e2afbfcb3e8;p=lilypond.git

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index b68847804c..9dcdf1ce6e 100644
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -9,17 +9,21 @@ INSTALLATION_OUT_DIR=$(elispdir)
 INSTALLATION_OUT_FILES=$(outdir)/lilypond-words.el
 
 STEPMAKE_TEMPLATES=elisp install install-out
+EXTRA_DIST_FILES= emacsclient.patch server.el.patch 
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 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 --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)