Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 83c4955f90ef3d871db379ecee52dfa7facf3462..fec79a01d2f8fb2163a76769ed836d2b156c0b4b 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,7 +17,7 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING ChangeLog DEDICATION ROADMAP THANKS HACKING
+README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
 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)
@@ -49,25 +49,42 @@ ChangeLog: $(outdir)/VERSION
 python-modules:
        $(MAKE) -C python
 
-do-top-doc: python-modules
+top-doc: python-modules
 
 local-clean: local-clean-ChangeLog
 
 local-clean-ChangeLog:
        rm -f ChangeLog
 
-dist-toplevel-txt-files: do-top-doc
+dist-toplevel-txt-files: top-doc
        -mkdir -p $(distdir)
        ln $(TOPDOC_TXT_FILES) $(distdir)/
        ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
 
-doc: 
-       $(MAKE) -C Documentation
+info:
+       $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true
+
+install-info: info
+       $(MAKE) out=www COPY_INFO_IMAGES=1 install-info-WWW
 
 install-help2man:
        $(MAKE) -C scripts man install-help2man
        $(MAKE) -C lily man install-help2man
 
+install-doc:
+       $(MAKE) out=www install-WWW
+       $(MAKE) out=www install-info-WWW
+
+uninstall-doc:
+       $(MAKE) out=www uninstall-WWW
+
+local-install:
+       $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
+
+final-install:
+       @true
+
+ifeq ($(out),www)
 # All web targets, except info image symlinks and info docs are
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
@@ -75,14 +92,7 @@ install-WWW:
        rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
 
 install-info-WWW:
-       $(MAKE) -C Documentation/user install-info
-       $(MAKE) -C input/lsr install-info
-       (cd $(DESTDIR)$(infodir) && rm -f lilypond && ln -sf $(shell $(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/Documentation/user) lilypond)
-       (cd $(DESTDIR)$(infodir) && rm -f lilypond-snippets && ln -sf $(shell $(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/input/lsr) lilypond-snippets)
-
-web-install:
-       $(MAKE) out=www install-WWW
-       $(MAKE) out=www install-info-WWW
+       $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true
 
 uninstall-WWW:
        rm -rf $(DESTDIR)$(webdir)
@@ -90,15 +100,6 @@ uninstall-WWW:
        $(MAKE) -C Documentation/user uninstall
        $(MAKE) -C input/lsr uninstall
 
-web-uninstall:
-       $(MAKE) out=www uninstall-WWW
-
-local-install:
-       $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
-
-final-install:
-       @true
-
 
 # For online docs with content negotiation, issue `make web WEB_TARGETS=online'
 # For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
@@ -111,6 +112,7 @@ WWW-post:
        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
 
 
 tree-prefix = $(outdir)
@@ -130,7 +132,7 @@ c-clean:
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-web-clean: snippets-clean $(tree-share-prefix)/lilypond-force
+doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force
 
 default: $(config_h) build-dir-setup