solenv/gbuild/AllLangHelp.mk | 21 +++++++++------------ solenv/gbuild/TargetLocations.mk | 3 ++- 2 files changed, 11 insertions(+), 13 deletions(-)
New commits: commit 6cb16d12c6314171e6efc5bf75255ced51d49801 Author: Christian Lohmaier <[email protected]> AuthorDate: Tue Oct 21 14:17:25 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Thu Oct 23 13:52:23 2025 +0200 makefile simplification: replace $(call gb_AllLangHelpl_get_target,foo) by a simple/static $(gb_AllLangHelp_targetdir)/foo and also drop the duplicated .dir target Change-Id: I0cae21a3f16aeb82fc4546962f890ccb465d2413 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192872 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index 32d38166d53f..1d01cb081728 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -24,13 +24,10 @@ $(call gb_AllLangHelp_get_helpfiles_target,%): | \ touch $@ endif -$(dir $(call gb_AllLangHelp_get_target,%)).dir : - $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) +$(gb_AllLangHelp_targetdir)%.dir : + mkdir -p $(@D) && touch $@ -$(dir $(call gb_AllLangHelp_get_target,%))%/.dir : - $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) - -$(call gb_AllLangHelp_get_target,%) : +$(gb_AllLangHelp_targetdir)/% : ifeq ($(ENABLE_HTMLHELP),) $(call gb_Output_announce,$*,$(true),ALH,5) $(call gb_Trace_MakeMark,$*,ALH) @@ -42,7 +39,7 @@ ifeq ($(ENABLE_HTMLHELP),) $(call gb_Output_announce,$*,$(false),ALH,5) endif $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_AllLangHelp_get_target,$*) $(call gb_AllLangHelp_get_helpfiles_target,$*) \ + rm -f $(gb_AllLangHelp_targetdir)/$* $(call gb_AllLangHelp_get_helpfiles_target,$*) \ ) # gb_AllLangHelp_AllLangHelp__one_lang module lang helpname @@ -50,9 +47,9 @@ define gb_AllLangHelp_AllLangHelp__one_lang $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) -$(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_target,$(3)) +$(gb_AllLangHelp_targetdir)/$(1) : $(call gb_HelpTarget_get_target,$(3)) ifeq ($(ENABLE_HTMLHELP),) -$(call gb_AllLangHelp_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_HelpTarget_get_packagename,$(3))) +$(gb_AllLangHelp_targetdir)/$(1) : $(call gb_Package_get_target,$(call gb_HelpTarget_get_packagename,$(3))) endif $(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_HelpTarget_get_clean_target,$(3)) ifeq ($(ENABLE_HTMLHELP),) @@ -71,10 +68,10 @@ gb_AllLangHelp_ALLTARGETS += $(1) $(foreach lang,$(gb_HELP_LANGS),\ $(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call gb_AllLangHelp__get_helpname,$(1),$(lang)))) -$(call gb_AllLangHelp_get_target,$(1)) :| $(dir $(call gb_AllLangHelp_get_target,$(1))).dir +$(gb_AllLangHelp_targetdir)/$(1) :| $(dir $(gb_AllLangHelp_targetdir)/$(1)).dir -$$(eval $$(call gb_Module_register_target,$(call gb_AllLangHelp_get_target,$(1)),$(call gb_AllLangHelp_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),AllLangHelp) +$$(eval $$(call gb_Module_register_target,$(gb_AllLangHelp_targetdir)/$(1),$(call gb_AllLangHelp_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),AllLangHelp,$(gb_AllLangHelp_targetdir)/$(1)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 9b950eb3f94e..fbad3c932c42 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -35,7 +35,8 @@ gb_UnoApi_get_target_for_build = $(INSTROOT_FOR_BUILD)/$(if $(filter udkapi,$(1) gb_AutoInstall_get_target = $(error please use plain gb_AutoInstall_targetdir instead) gb_AutoInstall_targetdir := $(WORKDIR)/AutoInstall -gb_AllLangHelp_get_target = $(WORKDIR)/AllLangHelp/$(1) +gb_AllLangHelp_get_target = $(error please use plain gb_AllLangHelp_targetdir instead) +gb_AllLangHelp_targetdir := $(WORKDIR)/AllLangHelp gb_AllLangHelp_get_helpfiles_target = $(WORKDIR)/AllLangHelp/$(1).helpfiles gb_AllLangPackage_get_target = $(WORKDIR)/AllLangPackage/$(1) gb_AllLangMoTarget_get_target = $(WORKDIR)/AllLangMo/$(1)
