Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / vim / GNUmakefile

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 03183df6a98ea92cd83f3e1c4c81d8ed462fa46b..ad032e42fe75d5542147a7dd6e756e9557ace988 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -9,49 +9,33 @@ EXTRA_DIST_FILES=$(call src-wildcard,*.vim) vimrc
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 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
 
 STEPMAKE_TEMPLATES=install-out
 
 # vimdir defined in config.make
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 local-install:
-       -$(INSTALL) -d $(DESTDIR)$(vimdir)/compiler
-       $(INSTALL) -m 644 lilypond-compiler.vim $(DESTDIR)$(vimdir)/compiler/lilypond.vim
-
-       -$(INSTALL) -d $(DESTDIR)$(vimdir)/ftdetect
-       $(INSTALL) -m 644 lilypond-ftdetect.vim $(DESTDIR)$(vimdir)/ftdetect/lilypond.vim
-
-       -$(INSTALL) -d $(DESTDIR)$(vimdir)/ftplugin
-       $(INSTALL) -m 644 lilypond-ftplugin.vim $(DESTDIR)$(vimdir)/ftplugin/lilypond.vim
-
-       -$(INSTALL) -d $(DESTDIR)$(vimdir)/indent
-       $(INSTALL) -m 644 lilypond-indent.vim $(DESTDIR)$(vimdir)/indent/lilypond.vim
-
-       -$(INSTALL) -d $(DESTDIR)$(vimdir)/syntax
-       $(INSTALL) -m 644 lilypond-syntax.vim $(DESTDIR)$(vimdir)/syntax/lilypond.vim
+       for a in compiler ftdetect ftplugin indent syntax; do \
+               $(INSTALL) -d $(DESTDIR)$(vimdir)/$$a \
+               && $(INSTALL) -m 644 $(src-dir)/lilypond-$$a.vim $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
+       done
 
 local-uninstall:
-       rm $(DESTDIR)$(vimdir)/compiler/lilypond.vim
-       -rmdir -p $(DESTDIR)$(vimdir)/compiler 
-
-       rm $(DESTDIR)$(vimdir)/ftdetect/lilypond.vim
-       -rmdir -p $(DESTDIR)$(vimdir)/ftdetect 
-
-       rm $(DESTDIR)$(vimdir)/ftplugin/lilypond.vim
-       -rmdir -p $(DESTDIR)$(vimdir)/ftplugin 
-
-       rm $(DESTDIR)$(vimdir)/indent/lilypond.vim
-       -rmdir -p $(DESTDIR)$(vimdir)/indent 
+       for a in compiler ftdetect ftplugin indent syntax; do \
+               rm $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
+               rmdir $(DESTDIR)$(vimdir)/$$a; \
+       done
+       -rmdir -p $(DESTDIR)$(vimdir)
 
-       rm $(DESTDIR)$(vimdir)/syntax/lilypond.vim
-       -rmdir -p $(DESTDIR)$(vimdir)/syntax
+$(buildscript-dir)/lilypond-words:
+       make -C $(depth)/scripts/build
 
-$(LILYPOND_WORDS): 
-       cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
+$(LILYPOND_WORDS):
+       cd $(top-src-dir) && $(buildscript-dir)/lilypond-words --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
 
 all: $(LILYPOND_WORDS)