From 72699595aaa3ecb8975050b6dfc6fde437770493 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 2 Sep 2015 14:37:23 +0200 Subject: remove KDE3 support, --enable-kde and --enable-kdeab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the new RHEL6-era baseline TDF can finally ship KDE4 support. Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3 Reviewed-on: https://gerrit.libreoffice.org/18267 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- scp2/InstallModule_ooo.mk | 1 - scp2/InstallScript_setup_osl.mk | 2 +- scp2/Module_scp2.mk | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'scp2') diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index b74dad3d0b42..112a65303523 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -19,7 +19,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ - ENABLE_KDE \ ENABLE_MACOSX_SANDBOX \ ENABLE_NPAPI_FROM_BROWSER \ ENABLE_ONLINE_UPDATE \ diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 0464d3542aed..68acb561ef68 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ scp2/gnome \ ) \ - $(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\ + $(if $(filter TRUE,$(ENABLE_KDE4)),\ scp2/kde \ ) \ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 5b8ad47e3c8c..c577a10ba379 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ InstallModule_gnome \ ) \ - $(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\ + $(if $(filter TRUE,$(ENABLE_KDE4)),\ InstallModule_kde \ ) \ $(if $(filter TRUE,$(ENABLE_TDE)),\ -- cgit