(Music_output_def): remove separate

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 62b9f40e7d89fcef9b14de7c9cae02eda7d22f10..7160e393a660bd0340954f536ae3488aee36501a 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -14,7 +14,8 @@ SUBDIRS = buildscripts python scripts \
        mf ly tex ps scm \
        po make \
        cygwin debian stepmake \
-       Documentation input
+       Documentation input \
+       vim 
 #
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh
@@ -22,9 +23,8 @@ README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
-VIM_FILES = vim/filetype.vim vim/compiler/lilypond.vim vim/ftplugin/lilypond.vimvim/indent/lilypond.vim vim/syntax/lilypond.vim
 EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
-  $(PATCH_FILES) $(VIM_FILES)
+  $(PATCH_FILES) 
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -45,7 +45,6 @@ install-WWW:
 
 web-install:
        $(MAKE) out=www install-WWW
-       $(MAKE) out=www 
 
 uninstall-WWW:
        #TODO
@@ -82,11 +81,6 @@ local-WWW-post:
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-# FIXME: rename to TAGS; should include deeper TAGS files, see guile-core
-ALL-TAGS:
-       etags $(shell find . $(src-ext:%=-name '*.%' -or) -false \
-               | grep -v '/out')
-
 web-clean:
        $(MAKE) out=www clean
        $(MAKE) $(builddir)/share/lilypond-force
@@ -127,7 +121,7 @@ $(builddir)/share/lilypond-force:
                ln -s ../../../mf/$(outconfbase) tfm && \
                ln -s ../../../mf/$(outconfbase) type1
        cd $(builddir)/share/lilypond/elisp && \
-               ln -sf ../../../elisp/$(outconfbase)/lilypond.words.el . && \
+               ln -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \
                ln -s $(abs-srcdir)/elisp/*.el .
        $(foreach i,$(CATALOGS), \
                mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \