*** empty log message ***

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 83eecd00827e82d61d229759e5145136dbe928ce..c69edbf9d939ea830f6a5a85ed878433555c4bf0 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
 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,22 +37,13 @@ include $(depth)/make/stepmake.make
 doc: 
        $(MAKE) -C Documentation
 
-pfa-fonts:
-       $(MAKE) MAKE_PFA_FILES=1 -C mf
-ifeq (0,1)
-       # the font ball; used for 1.8.0
-       (cd $(builddir)/share/lilypond/fonts && \
-               tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
-else
-       # the new font ball; to be used for for 1.8.1
-       (cd $(builddir)/share/lilypond && \
-               tar czvf ../../$(outbase)/type1-$(TOPLEVEL_VERSION).tar.gz fonts/type1/*.pfa fonts/type1/fonts.* dvips/*.map )
-endif
-
-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)
 
@@ -87,10 +82,10 @@ ALL-TAGS:
 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
 
@@ -103,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 && \
@@ -124,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 && \
@@ -134,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,
@@ -151,5 +150,9 @@ $(config_h): configure.in aclocal.m4
 # 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.8/
+       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/v$(MAJOR_VERSION).$(MINOR_VERSION)/
        cd out-www && rm -rf web/