diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-03 10:33:27 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-03 22:48:28 +0100 |
| commit | df37e6e98053d2f4a9f179c21a276c56dc3a90d9 (patch) | |
| tree | 783312657b525d9e0f2d8c07d73fd2e976f41141 /Repository.mk | |
| parent | 4ab7735fb4c88e54b42a94678b346ab501307db7 (diff) | |
Drop / merge some Haiku special build cases
Just don't test gtk3, so it's also not enabled. This way we can
also rename the kde install module to haiku on demand.
The kf5be1 is kept kde-only; no idea if that is intentional.
Change-Id: Id93b15fc6057a50da59efd655e1fc7d5f416c6de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127894
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 22 |
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 \ |