remove <hr>.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5b2716a8e8ca9c4046ac2a3aadf12f57a31d5a4e..8ede7e6cda93b154269ca7f27b3bbda9ffd57ee6 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -14,17 +14,17 @@ 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
-README_FILES =  ChangeLog  COPYING DEDICATION ROADMAP THANKS
+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 = vimrc lilypond.vim
-EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
-  $(PATCH_FILES) $(VIM_FILES)
+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
@@ -40,10 +40,18 @@ doc:
 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
 
 web-install:
        $(MAKE) out=www install-WWW
 
+uninstall-WWW:
+       #TODO
+
+web-uninstall:
+       $(MAKE) out=www uninstall-WWW=
+
 local-install:
        $(INSTALL) -d $(local_lilypond_datadir)
 
@@ -52,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`
@@ -76,15 +81,10 @@ 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 
 
 builddir-setup: $(builddir)/share/lilypond-force
@@ -114,14 +114,15 @@ $(builddir)/share/lilypond-force:
                ln -s $(abs-srcdir)/scm
        cd $(builddir)/share/lilypond/tex && \
                ln -s $(abs-srcdir)/tex source && \
-               ln -s ../../../mf/$(outconfbase) generate
+               ln -s ../../../tex/$(outconfbase) tex-out && \
+               ln -s ../../../mf/$(outconfbase) mf-out
        cd $(builddir)/share/lilypond/fonts && \
                ln -s $(abs-srcdir)/mf source && \
                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 -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \
                ln -s $(abs-srcdir)/elisp/*.el .
        $(foreach i,$(CATALOGS), \
                mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \