summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-05-04 17:34:10 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-05-04 17:36:47 +0200
commit4004342ef9cc7b7015b1dfd92c3b1def4df87a5c (patch)
tree1e9282ce9d11011c1e1f1debaecefe3837c5e7bc /scp2
parentd0e099fb5fce0954a36767b62026477448600f68 (diff)
fdo#60924: autoinstall kde libraries
Change-Id: I4c67301b99c2eb066695fc1e85c1e16ea5902d9f
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_kde.mk9
-rw-r--r--scp2/source/kde/file_kde.scp35
-rw-r--r--scp2/source/kde/module_kde.scp12
3 files changed, 0 insertions, 56 deletions
diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk
index 11d5f96305e8..9130b620701c 100644
--- a/scp2/InstallModule_kde.mk
+++ b/scp2/InstallModule_kde.mk
@@ -11,15 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/kde))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde))
-$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
- ENABLE_KDE \
- ENABLE_KDE4 \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/kde,\
- scp2/source/kde/file_kde \
-))
-
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\
scp2/source/kde/module_kde \
))
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
deleted file mode 100644
index 2f0320a84c54..000000000000
--- a/scp2/source/kde/file_kde.scp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#ifdef ENABLE_KDE
-STD_LIB_FILE( gid_File_Lib_Kdebe, kdebe1 )
-#endif
-
-#ifdef ENABLE_KDE4
-STD_LIB_FILE( gid_File_Lib_Kde4be, kde4be1 )
-#endif
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 9d3719516a51..f066710b5603 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -29,7 +29,6 @@
#include "AutoInstallLibs/kde"
-#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
Module gid_Module_Optional_Kde
ParentID = gid_Module_Optional;
Default = YES;
@@ -37,16 +36,5 @@ Module gid_Module_Optional_Kde
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
Styles = ();
Files = (auto_Kde_Lib_ALL
-#ifdef ENABLE_KDE
- gid_File_Lib_Kdebe
-#ifdef ENABLE_KDE4
- ,
-#endif // ENABLE_KDE4
-#endif // ENABLE_KDE
-#ifdef ENABLE_KDE4
- gid_File_Lib_Kde4be
-#endif // ENABLE_KDE4
);
End
-#endif
-