diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-03-02 17:28:43 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-03-02 17:29:59 +0100 |
commit | 16a87cb29ec007ae7bed8d4116f1d6e3dd36a175 (patch) | |
tree | 751e1124f512c6fca0586af1cb2a7dc91f7152a4 | |
parent | 8ba5369032202fd727cbf1af61284fdb5e3f4ec7 (diff) |
shell, scp2: clean up empty script packages
Change-Id: I93abddac491578d470f85bf3e814a0d7a91f0351
-rw-r--r-- | scp2/source/kde/module_kde.scp | 4 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 25 | ||||
-rw-r--r-- | scp2/source/ooo/module_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/tde/module_tde.scp | 4 | ||||
-rw-r--r-- | shell/Module_shell.mk | 3 | ||||
-rw-r--r-- | shell/Package_scripts.mk | 12 | ||||
-rw-r--r-- | shell/Package_scripts_kde.mk | 12 | ||||
-rw-r--r-- | shell/Package_scripts_tde.mk | 12 |
8 files changed, 3 insertions, 72 deletions
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 2bf6ac58d0c3..6fa6155b6b16 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -26,7 +26,5 @@ Module gid_Module_Optional_Kde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); - Files = (auto_kde_ALL, - gid_File_Bin_Kde_Open_Url - ); + Files = (auto_kde_ALL); End diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index b98ed64c69c4..ce009ddd99ac 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -59,31 +59,6 @@ End #endif -#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS - -File gid_File_shell_scripts - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_scripts.filelist"; - Styles = (FILELIST, PACKED); -End - -File gid_File_Bin_Kde_Open_Url - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_scripts_kde.filelist"; - Styles = (FILELIST, PACKED); -End - -File gid_File_Bin_Tde_Open_Url - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_scripts_tde.filelist"; - Styles = (FILELIST, PACKED); -End - -#endif - #if defined UNX File gid_File_Bin_Senddoc BIN_FILE_BODY; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index e975fe8c436f..35fd16c79d05 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -23,8 +23,7 @@ Module gid_Module_Root PackageInfo = "packinfo_office.txt"; InstallOrder = "20"; MOD_NAME_DESC(MODULE_ROOT_OSL); - Files = (gid_File_shell_scripts, - gid_File_Bin_Senddoc, + Files = (gid_File_Bin_Senddoc, gid_File_Script_Gengal, gid_File_Txt_Pagein_Common, gid_File_Txt_Pagein_Calc, diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 8e273ab9385a..24725de25303 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -19,8 +19,6 @@ Module gid_Module_Optional_Tde PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); - Files = (auto_tde_ALL, - gid_File_Bin_Tde_Open_Url - ); + Files = (auto_tde_ALL); End diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index d0a3318ca15c..17661e9aa210 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -105,9 +105,6 @@ endif ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_targets,shell,\ Library_recentfile \ - Package_scripts \ - Package_scripts_kde \ - Package_scripts_tde \ )) endif diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk deleted file mode 100644 index 6962fe5567e4..000000000000 --- a/shell/Package_scripts.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk deleted file mode 100644 index 4dc1cf5bcdae..000000000000 --- a/shell/Package_scripts_kde.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_scripts_tde.mk b/shell/Package_scripts_tde.mk deleted file mode 100644 index d73d82417b2e..000000000000 --- a/shell/Package_scripts_tde.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,shell_scripts_tde,$(SRCDIR)/shell/source/unix/misc)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: |