X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=717c1904279dfb2ae860f1df04a74b86d056eff6;hb=36f2940b55faf9ec9bf1d33ae706981369be510f;hp=8a13e2051c73da4733b4643ebf447d4be7123702;hpb=a34b6c818f7168053cfa5fbcdd60e1b09db34ac8;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8a13e2051c..717c190427 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,6 +9,7 @@ depth = .
 # descent order into subdirectories
 # 
 SUBDIRS = buildscripts python scripts \
+	elisp \
 	flower lily \
 	mf ly tex ps scm \
 	po make \
@@ -16,11 +17,14 @@ SUBDIRS = buildscripts python scripts \
 	Documentation input
 #
 
-SCRIPTS = configure aclocal.m4 autogen.sh
-README_FILES =  ChangeLog  COPYING DEDICATION ROADMAP THANKS
+SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh
+README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS 
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) VERSION lilypond.vim vimrc  $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh
+PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
+VIM_FILES = vimrc lilypond.vim
+EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
+  $(PATCH_FILES) $(VIM_FILES)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -33,16 +37,13 @@ include $(depth)/make/stepmake.make
 doc: 
 	$(MAKE) -C Documentation
 
-LILYPOND_WORDS = $(outdir)/lilypond.words.el $(outdir)/lilypond.words.vim
-$(LILYPOND_WORDS): $(srcdir)/lily/my-lily-lexer.cc $(buildscript-dir)/lilypond.words.py $(srcdir)/scm/new-markup.scm $(srcdir)/ly/engraver-init.ly
-	cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir)
-
-all: $(LILYPOND_WORDS)
-
-web-install: 
+install-WWW:
 	-$(INSTALL) -m 755 -d $(webdir) 
 	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
 
+web-install:
+	$(MAKE) out=www install-WWW
+
 local-install:
 	$(INSTALL) -d $(local_lilypond_datadir)
 
@@ -75,15 +76,15 @@ 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')
+	etags $(shell find . $(src-ext:%=-name '*.%' -or) -false \
+		| grep -v '/out')
 
 web-clean:
-	$(SHELL) $(buildscript-dir)/clean-fonts.sh
 	$(MAKE) out=www clean
 	$(MAKE) $(builddir)/share/lilypond-force
 
-
 default: $(config_h) builddir-setup 
 
 builddir-setup: $(builddir)/share/lilypond-force
@@ -120,8 +121,8 @@ $(builddir)/share/lilypond-force:
 		ln -s ../../../mf/$(outconfbase) tfm && \
 		ln -s ../../../mf/$(outconfbase) type1
 	cd $(builddir)/share/lilypond/elisp && \
-		ln -sf ../../../$(outconfbase)/lilypond.words.el . && \
-		ln -s $(abs-srcdir)/*.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 && \
 		cd $(builddir)/share/locale/$i/LC_MESSAGES && \
@@ -146,12 +147,3 @@ $(config_h): config.hh.in
 	@false
 
 
-# maybe move into private script?
-rsync-web:
-	cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
-	cd out-www/web && \
-	chgrp -R lilypond . && \
-	chmod -R g+w  && \
-	chmod 2775 `find -type d` . && \
-	rsync --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
-	cd out-www && rm -rf web/