* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b5958109610f94b7f68d088aee65d013237bdda5..5ae750579e50766245a2929522e992e9ea7e0da9 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -16,10 +16,10 @@ SUBDIRS = buildscripts scripts flower lily \
 #
 
 SCRIPTS = configure aclocal.m4 autogen.sh
-README_FILES =  ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
+README_FILES =  ChangeLog  COPYING DEDICATION NEWS README.mandrake ROADMAP THANKS
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(configuration) VERSION
@@ -44,6 +44,9 @@ doc: run-reqs
        $(MAKE) -C Documentation
 
 web-doc: web-reqs
+       $(MAKE) out=www -C input/regression/ WWW
+       $(MAKE) out=www -C input/template/ WWW
+       $(MAKE) out=www -C input/test/ WWW
        $(MAKE) out=www -C Documentation WWW
        $(MAKE) footify
 
@@ -86,7 +89,7 @@ lily/$(outdir)/lilypond:
 
 local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
-web-ext = gz html midi pdf png txt
+web-ext = gz html midi pdf png txt ly
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
        cd $(builddir) && find Documentation input \
@@ -123,40 +126,42 @@ builddir-setup: $(builddir)/share/lilypond-force
 
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
-       @echo Making $(builddir)/share 
-       @cd $(builddir) && rm -rf share
-       @mkdir -p $(builddir)/share/lilypond
-       @mkdir -p $(builddir)/share/lilypond/fonts
-       @mkdir -p $(builddir)/share/lilypond/tex
-       @cd $(builddir)/share/lilypond && \
+       cd $(builddir) && rm -rf share
+       mkdir -p $(builddir)/share/lilypond
+       mkdir -p $(builddir)/share/lilypond/fonts
+       mkdir -p $(builddir)/share/lilypond/tex
+       cd $(builddir)/share/lilypond && \
                ln -s $(abs-srcdir)/ly ly && \
                ln -s ../../mf/$(outconfbase) dvips && \
                ln -s ../../mf/$(outconfbase) afm && \
                ln -s ../../mf/$(outconfbase) tfm && \
                ln -s $(abs-srcdir)/mf && \
                ln -s $(abs-srcdir)/ps && \
+               ln -s ../../python/$(outconfbase) python && \
                ln -s $(abs-srcdir)/scm
-       @cd $(builddir)/share/lilypond/tex && \
+       cd $(builddir)/share/lilypond/tex && \
                ln -s $(abs-srcdir)/tex source && \
                ln -s ../../../mf/$(outconfbase) generate
-       @cd $(builddir)/share/lilypond/fonts && \
+       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
+       touch $@
 
 local-clean: builddir-setup-clean
 builddir-setup-clean:
-       @cd $(builddir) && rm -rf share
+       cd $(builddir) && rm -rf share
 
-$(config_h): configure
+$(config_h): configure.in aclocal.m4
 #
 # this is to prevent people from getting
 # undefined symbols  when we add them to config.h.in,
 # and they blindly run "cvs update; make".
 #
        @echo
-       @echo ' *** config.h file is out of date'
-       @echo ' *** Rerun configure or autogen.sh'
+       @echo ' *** config.h is out of date'
+       @echo ' *** Remove it and rerun autogen:'
+       @echo '         rm config.h; ./autogen.sh'
        @echo
        @false