summaryrefslogtreecommitdiff
path: root/desktop/Module_desktop.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2022-01-06 08:19:41 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-01-07 19:07:06 +0100
commit97e2dc2ed0c4602c7823bdd6c6d5376e8da60c62 (patch)
tree72556077dd3e5991c3f88068637b84cb2d880543 /desktop/Module_desktop.mk
parentb5d9fefe0e3ac56eef247c90b137d4b6d7a667c6 (diff)
Disable oosplash pagein feature for static builds
I'm not sure how useful this is today. Still hard-disabled on Mac and Win. Obviously unneeded for static builds. Change-Id: I3a95dede3c596ccdc0d15eba9edc072ad35f33fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128089 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jenkins
Diffstat (limited to 'desktop/Module_desktop.mk')
-rw-r--r--desktop/Module_desktop.mk21
1 files changed, 8 insertions, 13 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index ce8f254d7af1..ef74bd87aab4 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -39,17 +39,14 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_migrationoo3 \
Library_unopkgapp \
Package_scripts \
-))
-
-ifneq ($(OS),MACOSX)
-ifneq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,desktop,\
- Pagein_calc \
- Pagein_common \
- Pagein_draw \
- Pagein_impress \
- Pagein_writer \
- CustomTarget_soffice \
+ $(if $(ENABLE_PAGEIN), \
+ Pagein_calc \
+ Pagein_common \
+ Pagein_draw \
+ Pagein_impress \
+ Pagein_writer \
+ ) \
+ $(if $(filter-out MACOSX WNT,$(OS)),CustomTarget_soffice) \
))
ifeq ($(USING_X11),TRUE)
@@ -64,8 +61,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
))
endif
endif
-endif
-endif
ifeq ($(OS),WNT)