diff options
author | David Tardon <dtardon@redhat.com> | 2013-04-06 15:34:43 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-11 03:39:16 +0000 |
commit | bec67a2e7f532c29fe452c0fcc5817ea66fcaebd (patch) | |
tree | 12274cad4fa947a2a187e9719315b3b447948e1f /extensions | |
parent | 63c0d1a90f6cd2d681b3669260a02a80fa8190a7 (diff) |
deliver all uiconfig files by UIConfig
Change-Id: Ie78b7ce399ba34485146ca7622c59d31f8105d02
Reviewed-on: https://gerrit.libreoffice.org/3229
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/Module_extensions.mk | 2 | ||||
-rw-r--r-- | extensions/Package_uiconfig.mk | 35 | ||||
-rw-r--r-- | extensions/UIConfig_sbibliography.mk | 16 |
3 files changed, 17 insertions, 36 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 79a39c287118..4e59e12ace46 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_bib \ Library_dbp \ Library_pcr \ - Package_uiconfig \ + UIConfig_sbibliography \ )) endif diff --git a/extensions/Package_uiconfig.mk b/extensions/Package_uiconfig.mk deleted file mode 100644 index cf5a1824948f..000000000000 --- a/extensions/Package_uiconfig.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Peter Foley <pefoley2@verizon.net> -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# - -$(eval $(call gb_Package_Package,extensions_uiconfig,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar)) - -$(eval $(call gb_Package_add_file,extensions_uiconfig,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/UIConfig_sbibliography.mk b/extensions/UIConfig_sbibliography.mk new file mode 100644 index 000000000000..465563cfcc4f --- /dev/null +++ b/extensions/UIConfig_sbibliography.mk @@ -0,0 +1,16 @@ +# -*- 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_UIConfig_UIConfig,modules/sbibliography)) + +$(eval $(call gb_UIConfig_add_menubarfiles,modules/sbibliography,\ + extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar \ +)) + +# vim: set noet sw=4 ts=4: |