Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 0684e47b3144d2bd0b53845b4c5e3017b35bc7bc..ca98bf838c0f646dbb5c4de565425cb223b7db6f 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)
@@ -25,8 +26,8 @@ IN_FILES := $(call src-wildcard,*.in)
 RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
-EXTRA_DIST_FILES = VERSION .gitignore \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES)
+EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) website.make
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -101,6 +102,7 @@ ifeq ($(out),www)
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
        rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+       $(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
        $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true
@@ -108,8 +110,7 @@ install-info-WWW:
 uninstall-WWW:
        rm -rf $(DESTDIR)$(webdir)
        -rmdir $(package_docdir)
-       $(MAKE) -C Documentation/user uninstall
-       $(MAKE) -C input/lsr uninstall
+       $(MAKE) -C Documentation uninstall
 
 
 # For online docs with content negotiation, issue `make doc WEB_TARGETS=online'
@@ -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
@@ -234,6 +239,7 @@ grand-replace:
        $(MAKE) -C scripts/build
        PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
+
 ################################################################
 # testing
 
@@ -246,6 +252,7 @@ test:
        @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
 
 test-baseline: 
        @if test -d .git ; then \
@@ -255,6 +262,7 @@ test-baseline:
        $(MAKE) test
        $(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) test-snippets-clean
 
 
@@ -280,3 +288,11 @@ snippets-clean:
 
 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)/website.make \
+               website
+