X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=8e590cdb4e7b63710bcdfd2da575b2f7bb5188af;hb=03be123e98504554afbf0660a0b38edde4ee26e5;hp=5bcbcf43fe46ea2d9768ea54408ca4ea02aafbdd;hpb=99dc90bbc369722cf4d3bb9f30b7288762f2167f;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5bcbcf43fe..8e590cdb4e 100644
--- 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)
@@ -123,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
@@ -237,10 +242,8 @@ 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
-
+website:
+	$(MAKE) out=www -C Documentation website
 
 ################################################################
 # testing
@@ -254,6 +257,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 \
@@ -263,6 +267,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