Build: end directories in their bare names and avoid some double slashes in logs.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5bcbcf43fe46ea2d9768ea54408ca4ea02aafbdd..f8e1d15e7ca6a81516b41bbf3f0e5653c98fa3cd 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,7 +17,8 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
+README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \
+  LICENSE LICENSE.DOCUMENTATION
 TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
@@ -38,7 +39,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-local-dist: refresh-release-files dist-toplevel-txt-files 
+local-dist: refresh-release-files dist-toplevel-txt-files
 
 all: $(outdir)/VERSION
 
@@ -69,8 +70,8 @@ local-clean-ChangeLog:
 
 dist-toplevel-txt-files: top-doc
        -mkdir -p $(distdir)
-       ln $(TOPDOC_TXT_FILES) $(distdir)/
-       ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
+       ln $(TOPDOC_TXT_FILES) $(distdir)
+       ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)
 
 info:
        $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true
@@ -100,7 +101,7 @@ ifeq ($(out),www)
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-       rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+       rsync -rl --exclude='*.signature' $(outdir)/offline-root $(DESTDIR)$(webdir)
        $(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
@@ -122,9 +123,13 @@ WWW-post:
        $(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
        find $(outdir) -name '*-root' | xargs rm -rf
        $(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
-       find $(outdir)/offline-root -type l -delete
-endif
+       find $(outdir)/offline-root -type l | xargs rm -f
+endif # ifeq ($(out),www)
 
+# For those who cannot for the life in them remember to type
+# WEB_TARGETS=..., just bloody make all doc stuff, already.
+all-doc:
+       $(MAKE) WEB_TARGETS='online offline' doc
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -151,9 +156,9 @@ build-dir-setup: $(tree-share-prefix)/lilypond-force
 
 PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
-CATALOGS = $(HELP_CATALOGS:lilypond=) 
+CATALOGS = $(HELP_CATALOGS:lilypond=)
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION 
+$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 # Preparing LilyPond tree for build-dir exec
        cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
        mkdir -p $(tree-bin)
@@ -205,10 +210,12 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
        rm -f $(tree-share-prefix)/fonts/type1/* &&  \
                cd $(tree-share-prefix)/fonts/otf && \
                ln -s ../../../../../../mf/$(outconfbase)/*.otf .
-       -cd $(tree-share-prefix)/fonts/ && \
+       -cd $(tree-share-prefix)/fonts && \
                ln -s ../../../../../mf/$(outconfbase)/fonts.conf .
        -cd $(tree-share-prefix)/fonts/svg && \
                ln -s ../../../../../../mf/$(outconfbase)/*.svg .
+       -cd $(tree-share-prefix)/fonts/svg && \
+               ln -s ../../../../../../mf/$(outconfbase)/*.woff .
        -cd $(tree-share-prefix)/fonts/tfm && \
                ln -s ../../../../../../mf/$(outconfbase)/*.tfm .
        -cd $(tree-share-prefix)/fonts/type1 && \
@@ -235,13 +242,6 @@ grand-replace:
        PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
 
-################################################################
-# website (without the rest of the docs)
-web-gop:
-       touch Documentation/general.texi
-       cd Documentation && make out=www out-www/general/index.html
-
-
 ################################################################
 # testing
 
@@ -249,28 +249,33 @@ RESULT_DIR=$(top-build-dir)/out/test-results
 
 
 test:
-       @echo -en 'For tracking crashes: use\n\n\t'
-       @echo 'grep sourcefilename `grep -L systems.texi out/lybook-db/*/*log|sed s/log/ly/g`'
+       @echo 'For tracking crashes: use'
        @echo
-       $(MAKE) -C input/regression/ out=test local-test
+       @echo '        grep sourcefilename `grep -L systems.texi out/lybook-testdb/*/*log|sed s/log/ly/g`'
+       @echo
+       $(MAKE) -C input/regression out=test local-test
        $(MAKE) -C input/regression/musicxml out=test local-test
+       $(MAKE) -C input/regression/abc2ly out=test local-test
+       $(MAKE) -C input/regression/lilypond-book out=test local-test
 
-test-baseline: 
+test-baseline:
        @if test -d .git ; then \
                $(if $(shell git diff), echo "commit before base lining" && false,true) ; \
        fi
-       $(MAKE) 
+       $(MAKE)
        $(MAKE) test
-       $(MAKE) out=test -C input/regression/ local-test-baseline
+       $(MAKE) out=test -C input/regression local-test-baseline
        $(MAKE) out=test -C input/regression/musicxml local-test-baseline
+       $(MAKE) out=test -C input/regression/abc2ly local-test-baseline
+       $(MAKE) out=test -C input/regression/lilypond-book local-test-baseline
        $(MAKE) test-snippets-clean
 
 
 local-check: test
        rm -rf $(RESULT_DIR)
        mkdir -p $(RESULT_DIR)
-       $(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
-       @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
+       $(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test
+       @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g'
 
 
 test-redo:
@@ -281,10 +286,18 @@ test-redo:
        $(MAKE) check
 
 test-clean: test-snippets-clean
-       $(MAKE) -C input/regression/ out=test clean
+       $(MAKE) -C input/regression out=test clean
 
 snippets-clean:
        rm -rf out/lybook-db
 
 test-snippets-clean:
        rm -rf out/lybook-testdb
+
+# we want this separate for security; see CG 4.2.  -gp
+website:
+       $(MAKE) config_make=$(config_make) \
+               top-src-dir=$(top-src-dir) \
+               -f $(top-src-dir)/make/website.make \
+               website
+