unoidl/Module_unoidl.mk | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 399ed986e5a15988c8b08dc715ad698ef3f4fe83
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Aug 20 22:37:13 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Aug 21 07:25:40 2024 +0200
Clean up conditions in Module_unoidl
unoidl-check and unoidl-write are needed during the build.
unoidl-read and unoidl-write are part of the SDK.
Change-Id: I82fc79a09524fa14638b4d2daeafeeb024f1fd66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172159
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Jenkins
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index 834c8668c661..01f7f8852ae3 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -9,17 +9,13 @@
$(eval $(call gb_Module_Module,unoidl))
-# unoidl-check is needed as a component of the ODK / SDK package and
-# a build-tool. In case of cross-compiling a build-native tool must
-# be provided in addition to the ODK one (!CROSS_COMPILING phase).
-
$(eval $(call gb_Module_add_targets,unoidl, \
- $(if $(filter DESKTOP,$(BUILD_TYPE)), \
+ $(if $(call gb_not,$(CROSS_COMPILING)), \
+ Executable_unoidl-check) \
+ $(if $(filter ODK,$(BUILD_TYPE)), \
Executable_unoidl-read) \
$(if $(or $(filter ODK,$(BUILD_TYPE)),$(call gb_not,$(CROSS_COMPILING))), \
- Executable_unoidl-check \
- Executable_unoidl-write \
- ) \
+ Executable_unoidl-write) \
Library_unoidl \
))
