2003 -> 2004

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5612bade0e3b601ef1a05c73b2cbe1d4e71771a4..5b2716a8e8ca9c4046ac2a3aadf12f57a31d5a4e 100644 (file)
--- 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 \
+       cygwin debian stepmake \
        Documentation input
 #
 
-SCRIPTS = configure aclocal.m4 autogen.sh
+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  $(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,39 +37,13 @@ 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)
-
-#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
-
-get-pfa-fonts: $(outdir)/$(fontball)
-       # install by hand from $<
-
-lilypond.words:
-       cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir)/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)
 
@@ -107,14 +85,7 @@ web-clean:
        $(MAKE) $(builddir)/share/lilypond-force
 
 
-default: $(config_h) builddir-setup $(outdir)/VERSION
-
-
-$(outdir)/VERSION: $(config_make)
-       echo 'MAJOR_VERSION=$(MAJOR_VERSION)' > $@
-       echo 'MINOR_VERSION=$(MINOR_VERSION)' >> $@
-       echo 'PATCH_LEVEL=$(PATCH_LEVEL)' >> $@
-       echo 'MY_PATCH_LEVEL=$(MY_PATCH_LEVEL)' >> $@
+default: $(config_h) builddir-setup 
 
 builddir-setup: $(builddir)/share/lilypond-force
 
@@ -127,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 && \
@@ -148,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 && \
@@ -158,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,
@@ -172,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/