Clean up buildscripts

[lilypond.git] / elisp / GNUmakefile

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index efb2026eab2abad084052174b0f88d90e9766fa4..9dcdf1ce6ed158339f0473176400d5a64078f3e5 100644 (file)
--- 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 =\
   $(top-src-dir)/lily/lily-lexer.cc \
-  $(buildscript-dir)/lilypond-words.py \
+  $(buildscript-dir)/lilypond-words \
   $(top-src-dir)/scm/markup.scm \
   $(top-src-dir)/ly/engraver-init.ly
 
-$(LILYPOND_WORDS): 
-       cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --el --dir=$(top-build-dir)/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)