summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk22
1 files changed, 6 insertions, 16 deletions
diff --git a/Repository.mk b/Repository.mk
index 812d47dc18df..bb3c995ddaa2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -292,32 +292,22 @@ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,gnome, \
$(if $(ENABLE_GTK4),vclplug_gtk4) \
))
+gb_haiku_or_kde := $(if $(filter HAIKU,$(OS)),haiku,kde)
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
- $(if $(ENABLE_KF5),kf5be1) \
+ $(if $(ENABLE_KF5),kf5be1) \
))
-ifneq (,$(USING_X11))
-$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,kde, \
+$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,$(gb_haiku_or_kde), \
$(if $(ENABLE_KF5),vclplug_kf5) \
$(if $(ENABLE_QT5),vclplug_qt5) \
$(if $(ENABLE_QT6),vclplug_qt6) \
$(if $(ENABLE_GTK3_KDE5),vclplug_gtk3_kde5) \
))
-endif
-ifneq ($(ENABLE_GTK3_KDE5),)
-$(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \
- lo_kde5filepicker \
+$(eval $(call gb_Helper_register_executables_for_install,OOO,$(gb_haiku_or_kde), \
+ $(if $(ENABLE_GTK3_KDE5),lo_kde5filepicker) \
))
-endif
-
-ifeq ($(OS),HAIKU)
-$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,haiku, \
- $(if $(ENABLE_QT5),vclplug_qt5) \
- $(if $(ENABLE_QT6),vclplug_qt6) \
- $(if $(ENABLE_KF5),vclplug_kf5) \
-))
-endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
sm \