From 4b8cef4f6e3a4eb5969631485a7c725252f3cabc Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sun, 16 Jan 2022 20:08:19 +0100 Subject: Add .*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 .all to .allbuild or .allcheck"). Change-Id: Ia74020375f0a024dc67ea37ae4b18655af9df084 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128490 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- Makefile.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile.in') 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 .all' is deprecated, use 'make .allcheck' (or 'make .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 -- cgit