X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=d4e8ae5ebe62b639d6bdf303e5be9b3fa9b6500d;hb=6eec99899bd33cf13da7e08974eb854aaa5bd153;hp=5d63d3513c46310840198851f01113890e2f53f9;hpb=8fd6fe798e32b3e3f097936fbe32f1db00e8b80f;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5d63d3513c..d4e8ae5ebe 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,18 +9,22 @@ depth = .
 # descent order into subdirectories
 # 
 SUBDIRS = buildscripts python scripts \
+	elisp \
 	flower lily \
 	mf ly tex ps scm \
 	po make \
-	cygwin debian $(builddir)/stepmake \
-	Documentation input
+	cygwin debian stepmake \
+	Documentation input \
+	vim 
 #
 
-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) lilypond.vim vimrc VERSION $(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
+EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -33,38 +37,20 @@ include $(depth)/make/stepmake.make
 doc: 
 	$(MAKE) -C Documentation
 
-pfa-fonts:
-	$(MAKE) MAKE_PFA_FILES=1 -C mf
-# don't make fontball - we have binary packages for that.
-
-install-pfa-fonts:
-	$(MAKE) MAKE_PFA_FILES=1 -C mf install
-
-fontball=type1-$(TOPLEVEL_VERSION).tar.gz
-deb=lilypond_$(TOPLEVEL_VERSION)-1_i386.deb
-debian-mirror=http://ftp.$(LANG).debian.org
-
-$(outdir)/$(deb):
-	wget -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(deb)
+install-WWW:
+	-$(INSTALL) -m 755 -d $(webdir) 
+	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
+# install-WWW does not recurse; fake it visiting Documentation/user manually
+	$(MAKE) -C Documentation/user local-install-WWW
 
-#lld=.$(local_lilypond_datadir)
-lld=./usr/share/lilypond/$(TOPLEVEL_VERSION)
-$(outdir)/$(fontball): $(outdir)/$(deb)
-	rm -rf $(outdir)/./usr
-	ar p $< data.tar.gz | \
-		tar -C $(outdir) -zxf - $(lld)/dvips $(lld)/fonts/type1
-# strip the $(lld) part?
-	tar -C $(outdir) -czf $@ ./usr
+web-install:
+	$(MAKE) out=www install-WWW
 
-get-pfa-fonts: $(outdir)/$(fontball)
-	# install by hand from $<
+uninstall-WWW:
+	#TODO
 
-lilypond.words:
-	cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir)/lilypond.words
-
-web-install: 
-	-$(INSTALL) -m 755 -d $(webdir) 
-	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
+web-uninstall:
+	$(MAKE) out=www uninstall-WWW=
 
 local-install:
 	$(INSTALL) -d $(local_lilypond_datadir)
@@ -74,16 +60,13 @@ final-install:
 	@echo " *** Before running, buildscripts/out/lilypond-{profile,login}"
 	@echo " *** must be run. You're advised to source these scripts from your "
 	@echo " *** login scripts. For more information, see Invoking LilyPond in the manual."
-	@echo 
+	@echo
 
 web-ext = gz html midi pdf png txt ly
 
 footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
 
-bla:
-	cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
-
-local-WWW-post:  
+local-WWW-post:
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
 	cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
 	cd $(builddir) && rm -f `find . -name \*.html~ -print`
@@ -98,16 +81,11 @@ local-WWW-post:
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-ALL-TAGS:
-	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
+default: $(config_h) builddir-setup 
 
 builddir-setup: $(builddir)/share/lilypond-force
 
@@ -120,6 +98,7 @@ $(builddir)/share/lilypond-force:
 	cd $(builddir) && rm -rf lib share
 	mkdir -p $(builddir)/lib/lilypond
 	mkdir -p $(builddir)/share/lilypond
+	mkdir -p $(builddir)/share/lilypond/elisp
 	mkdir -p $(builddir)/share/lilypond/fonts
 	mkdir -p $(builddir)/share/lilypond/tex
 	cd $(builddir)/lib/lilypond && \
@@ -141,6 +120,9 @@ $(builddir)/share/lilypond-force:
 		ln -s ../../../mf/$(outconfbase) afm && \
 		ln -s ../../../mf/$(outconfbase) tfm && \
 		ln -s ../../../mf/$(outconfbase) type1
+	cd $(builddir)/share/lilypond/elisp && \
+		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 && \
@@ -151,7 +133,7 @@ local-clean: builddir-setup-clean
 builddir-setup-clean:
 	cd $(builddir) && rm -rf share
 
-$(config_h): configure.in aclocal.m4
+$(config_h): config.hh.in 
 #
 # this is to prevent people from getting
 # undefined symbols  when we add them to config.h.in,
@@ -165,8 +147,3 @@ $(config_h): configure.in aclocal.m4
 	@false
 
 
-# maybe move into private script?
-rsync-web:
-	cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
-	cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
-	cd out-www && rm -rf web/