Add <module>.*all aliases to .all* and update help

And just echo a rename info for the 'all' target and exit with
an error, so people will actually adapt. 'all' had been modified
to run 'allbuild' in the original commit anyway. And since there
is no toplevel 'all' target, this just seems consequent.
And .PHONY the new targets.

Also advertise "make help" a bit more at the end of configure.

Follow-up on commit d6496fce2e51a3e44753e6b5c462824f182b48d5
("split gbuild's <module>.all to <module>.allbuild or .allcheck").

Change-Id: Ia74020375f0a024dc67ea37ae4b18655af9df084
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128490
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

3 files changed, 26 insertions, 16 deletions

diff --git a/Makefile.in b/Makefile.in
index 9df9c8963140..300469aa0d5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,6 +95,7 @@ iwyudummy.generate:
 #
 define gb_Top_GbuildModuleRules
 .PHONY: $(1) $(1).build $(1).all $(1).check $(1).clean $(1).showdeliverables $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target))
+.PHONY: $(1).allbuild $(1).buildall $(1).allcheck $(1).checkall
 
 $(1): bootstrap fetch
 	cd $(SRCDIR)/$(2) && $$(MAKE) $(IWYU_OPTION) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS)
@@ -105,14 +106,15 @@ $(1).build $(1).check $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(tar
 $(1).clean $(1).showdeliverables:
 	cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
 
-$(1).allbuild: bootstrap fetch
+$(1).allbuild $(1).buildall: bootstrap fetch
 	$$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1)
 
-$(1).allcheck: bootstrap fetch
+$(1).allcheck $(1).checkall: bootstrap fetch
 	$$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)
 
-$(1).all: $(1).allbuild
-	echo "Using 'make <module>.all' is deprecated, use 'make <module>.allcheck' (or 'make <module>.allbuild')"
+$(1).all:
+	@echo "'make $(1).all' was renamed to 'make $(1).allcheck' (or use 'make $(1).allbuild' to build without unit tests)"
+	@exit 42
 
 endef
 
diff --git a/configure.ac b/configure.ac
index 911a02107f52..890f5eb47040 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14602,12 +14602,12 @@ fi
 cat << _EOF
 ****************************************************************************
 
-To build, run:
-$GNUMAKE
-
-To view some help, run:
+To show information on various make targets and make flags, run:
 $GNUMAKE help
 
+To just build, run:
+$GNUMAKE
+
 _EOF
 
 if test $_os != WINNT -a "$CROSS_COMPILING" != TRUE; then
@@ -14622,7 +14622,7 @@ _EOF
     fi
     cat << _EOF
 
-If you want to run the smoketest, run:
+If you want to run the unit tests, run:
 $GNUMAKE check
 
 _EOF
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index ead36694d107..acd16ed2e74e 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -33,12 +33,16 @@ AVAILABLE TARGETS
                             be run against it. You can provide additional
                             arguments to soffice.bin using the gb_DBGARGS
                             variable.
+
        check                run unit tests and if in toplevel subsequentcheck
        unitcheck            run unit tests
        slowcheck            run slow unit tests
        screenshot           create all screenshots
        subsequentcheck      run system tests (requires full installation)
        perfcheck            run performance/callgrind unit tests
+       uicheck              run UI tests
+
+       You can set gb_SUPPRESS_TESTS to just build but not run the tests.
 
        build-l10n-only      builds translation files for the build products
        build-non-l10n-only  builds the product without the localization files
@@ -49,16 +53,20 @@ AVAILABLE TARGETS
                             NOTE: needs graphviz to work
        showmodules          shows all registered modules
 
-       <module>         build the named module (without running unittests)
-       <module>.build   an alias for the above
-       <module>.check   run unittests of the named module
-       <module>.clean   clean the named module
-       <module>.all     build the named module and the pre-requisite modules for it
-       <module>.showdeliverables show the targets delivered to INSTDIR and their
-                        source
+       <module>         an alias for <module>.build
+       <module>.<toplevel target>  runs the toplevel target for the named
+                        module. Per default, all pre-requisite are excluded!
+       <module>.allbuild  as build + including all the pre-requisite modules
+       <module>.allcheck  as check + including all the pre-requisite modules
+       <module>.buildall  an alias for <module>.allbuild
+       <module>.checkall  an alias for <module>.allcheck
+       <module>.showdeliverables  show the targets delivered to INSTDIR and
+                        their source
+
        cmd              execute the command contained in the variable cmd=""
                         in a shell with config_host.mk or config_build.mk
                         environment set. (see gb_SIDE)
+
        <target>         build gbuild target (such as Library_vbaswobj or
                         CppunitTest_sw_macros_test)
        <target>.clean   clean gbuild target