X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vim%2FGNUmakefile;h=ad032e42fe75d5542147a7dd6e756e9557ace988;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=c33f0b02de1ec931658e88ee3b08380474cd0489;hpb=68cf7ef0e80c31fbe977f1aa3be601482440684e;p=lilypond.git

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index c33f0b02de..ad032e42fe 100644
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -4,54 +4,38 @@ INSTALLATION_OUT_DIR=$(vimdir)/syntax
 INSTALLATION_OUT_FILES=$(LILYPOND_WORDS)
 # $(outdir)/lilypond-words $(outdir)/lilypond-words.el
 
-EXTRA_DIST_FILES=$(wildcard *.vim) vimrc
+EXTRA_DIST_FILES=$(call src-wildcard,*.vim) vimrc
 
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\
-  $(topdir)/lily/lily-lexer.cc \
-  $(buildscript-dir)/lilypond-words.py \
-  $(topdir)/scm/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
 
 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 $(topdir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(builddir)/vim/$(outconfbase)
+$(LILYPOND_WORDS):
+	cd $(top-src-dir) && $(buildscript-dir)/lilypond-words --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
 
 all: $(LILYPOND_WORDS)