X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=663e8556a97f180b7c98da8676c7d632c0198d8a;hb=9a584f61c3e335e9661e647ebaa9147a2c35d2b8;hp=fec79a01d2f8fb2163a76769ed836d2b156c0b4b;hpb=2fd463683cab91b18c1d241bca208764867f1503;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fec79a01d2..663e8556a9 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,13 +17,17 @@ 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 DEDICATION ROADMAP THANKS HACKING \
+  COPYING.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 lilypond-texi2html.init \
-  $(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)
 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,8 +47,16 @@ $(outdir)/VERSION: $(config_make) VERSION
 	-mkdir -p $(outdir)
 	echo $(TOPLEVEL_VERSION) > $@
 
-ChangeLog: $(outdir)/VERSION
-	@echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > ChangeLog
+$(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
@@ -90,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
@@ -97,12 +110,11 @@ 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 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:
@@ -112,8 +124,12 @@ 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
+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
@@ -223,6 +239,14 @@ grand-replace:
 	$(MAKE) -C scripts/build
 	PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
+
+################################################################
+# website (without the rest of the docs)
+web-gop:
+	touch Documentation/web.texi
+	cd Documentation && make out=www out-www/web/index.html
+
+
 ################################################################
 # testing
 
@@ -235,6 +259,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 \
@@ -244,6 +269,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