X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=ca98bf838c0f646dbb5c4de565425cb223b7db6f;hb=6c79726094c01c51b64b5b0bb74faff6eaf5cd65;hp=cec5d29937371d6d3106fcc411c037f85b0662ab;hpb=375279298392a64be4f415b058fff88b3523540a;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index cec5d29937..ca98bf838c 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -2,7 +2,7 @@
 
 depth = .
 
-SUBDIRS = buildscripts python scripts \
+SUBDIRS = python scripts \
 	flower lily \
 	mf ly \
 	tex ps scm \
@@ -17,13 +17,17 @@ SUBDIRS = buildscripts 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)
 
-EXTRA_DIST_FILES = VERSION .gitignore SConstruct \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
+RELEASE_FILES = ChangeLog RELEASE-COMMIT
+RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
+OUT_DIST_FILES += $(RELEASE_OUT_FILES)
+EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) website.make
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -35,7 +39,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-local-dist: dist-toplevel-txt-files 
+local-dist: refresh-release-files dist-toplevel-txt-files 
 
 all: $(outdir)/VERSION
 
@@ -43,32 +47,47 @@ $(outdir)/VERSION: $(config_make) VERSION
 	-mkdir -p $(outdir)
 	echo $(TOPLEVEL_VERSION) > $@
 
-dist-toplevel-txt-files:
+$(outdir)/ChangeLog: $(outdir)/VERSION
+	@echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@
+
+$(outdir)/RELEASE-COMMIT: # FIXME: any file in $(top-src-dir)/.git/ we can depend on and be sure RELEASE-COMMIT is up to date?
+	git --git-dir=$(top-src-dir)/.git show HEAD | head -100 > $@
+
+# junk me as soon as RELEASE-COMMIT FIXME: has been addressed
+refresh-release-files:
+	test -d $(top-src-dir)/.git && rm -f $(RELEASE_OUT_FILES)
+	$(MAKE) $(RELEASE_OUT_FILES)
+
+python-modules:
+	$(MAKE) -C python
+
+top-doc: python-modules
+
+local-clean: local-clean-ChangeLog
+
+local-clean-ChangeLog:
+	rm -f ChangeLog
+
+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-WWW:
-	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-	rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
-	$(MAKE) -C Documentation/user local-install-WWW
-	$(MAKE) -C Documentation/user install-info
-	$(MAKE) -C input/lsr install-info
+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
 
-web-install:
+install-doc:
 	$(MAKE) out=www install-WWW
+	$(MAKE) out=www install-info-WWW
 
-uninstall-WWW:
-	echo TODO
-
-web-uninstall:
+uninstall-doc:
 	$(MAKE) out=www uninstall-WWW
 
 local-install:
@@ -77,19 +96,40 @@ local-install:
 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:
+	-$(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
+
+uninstall-WWW:
+	rm -rf $(DESTDIR)$(webdir)
+	-rmdir $(package_docdir)
+	$(MAKE) -C Documentation uninstall
+
 
-# 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"'
+# For online docs with content negotiation, issue `make doc WEB_TARGETS=online'
+# For both online and offline docs, issue `make doc WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
 WWW-post:
-# need UTF8 setting in case this is hosted on a website. 
+# need UTF8 setting in case this is hosted on a website.
 	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
+	$(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
 	find $(outdir) -name '*-root' | xargs rm -rf
-	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
-	find $(outdir)/offline-root -type l -delete
+	$(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
+	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
@@ -108,7 +148,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
 
@@ -195,6 +235,10 @@ $(config_h): config.hh.in
 	@echo
 	@false
 
+grand-replace:
+	$(MAKE) -C scripts/build
+	PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
+
 
 ################################################################
 # testing
@@ -208,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 \
@@ -217,13 +262,14 @@ 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
 
 
 local-check: test
 	rm -rf $(RESULT_DIR)
 	mkdir -p $(RESULT_DIR)
-	$(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+	$(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' 
 
 
@@ -242,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
+