Update.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8ad5ccc5a63d72ca288a6147510d324b9a44aea8..5c7e563e3b7b5e1c9885144c71140da5a16a6542 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
-README_FILES =  ChangeLog  COPYING DEDICATION README.mandrake ROADMAP THANKS
+SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh
+README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS TODO
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh  lilypond.words
+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,15 +37,13 @@ include $(depth)/make/stepmake.make
 doc: 
        $(MAKE) -C Documentation
 
-pfa-fonts:
-       $(MAKE) MAKE_PFA_FILES=1 -C mf
-       (cd $(builddir)/share/lilypond/fonts && \
-               tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
-
-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)
 
@@ -54,10 +56,14 @@ final-install:
 
 web-ext = gz html midi pdf png txt ly
 
-footify=$(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
 
-local-WWW-post: 
-       $(footify) `$(FIND) $(builddir) -name '*.html' -print`
+bla:
+       cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
+
+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`
        cd $(builddir) && find Documentation input \
                $(web-ext:%=-path '*/out-www/*.%' -or) -false \
@@ -67,18 +73,19 @@ local-WWW-post:
        cd $(builddir) && ls *.html >> $(outdir)/weblist
        cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
+
 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
+default: $(config_h) builddir-setup 
 
 builddir-setup: $(builddir)/share/lilypond-force
 
@@ -91,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 && \
@@ -112,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 && \
@@ -122,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,
@@ -134,3 +145,5 @@ $(config_h): configure.in aclocal.m4
        @echo '         rm $(config_h); ./autogen.sh'
        @echo
        @false
+
+