postprocess/CustomTarget_components.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 28ff78c950e3480077145f15e7cff36c375a689c Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Dec 10 16:51:22 2021 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Tue Dec 14 07:37:41 2021 +0100 Build services_constructors.list from target component files ...rather than from source component files, so that <https://gerrit.libreoffice.org/c/core/+/126560> "Allow for conditional parts of component files" (which adds further processing to the translation from source to target component files) will also affect the contents of CustomTarget_postprocess/components's services_constructors.list Change-Id: Ie5ef42b91b09f5be0d8d512093a6b7e60aee5b50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126644 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/postprocess/CustomTarget_components.mk b/postprocess/CustomTarget_components.mk index 3c202ed9988d..934fa8f4564f 100644 --- a/postprocess/CustomTarget_components.mk +++ b/postprocess/CustomTarget_components.mk @@ -26,11 +26,11 @@ endef $(postprocess_WORKDIR)/services_componentfiles.list: \ $(call gb_Rdb_get_target,services) \ $(call gb_Rdb_get_target,ure/services) \ - $(foreach comp,$(gb_ComponentTarget__ALLCOMPONENTS),$(call gb_ComponentTarget_get_source,$(comp))) \ + $(foreach comp,$(gb_ComponentTarget__ALLCOMPONENTS),$(call gb_ComponentTarget_get_target,$(comp))) \ | $(postprocess_WORKDIR)/.dir $(call gb_Output_announce,$(subst $(BUILDDIR)/,,$@),$(true),GEN,2) TEMPFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),1, \ - $(foreach comp,$(sort $(gb_ComponentTarget__ALLCOMPONENTS)),$(call gb_ComponentTarget_get_source,$(comp))$(gb_NEWLINE))) && \ + $(foreach comp,$(sort $(gb_ComponentTarget__ALLCOMPONENTS)),$(call gb_ComponentTarget_get_target,$(comp))$(gb_NEWLINE))) && \ mv $$TEMPFILE $@ $(postprocess_WORKDIR)/services_constructors.list: \
