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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/Module_starmath.mk | 1 | ||||
| -rw-r--r-- | starmath/Package_uiconfig.mk | 30 | ||||
| -rw-r--r-- | starmath/UIConfig_smath.mk | 14 |
3 files changed, 14 insertions, 31 deletions
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 897f2f285846..4f7ed0fb3c73 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,starmath,\ AllLangResTarget_sm \ Library_sm \ Library_smd \ - Package_uiconfig \ UIConfig_smath \ )) diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk deleted file mode 100644 index 589f111498c9..000000000000 --- a/starmath/Package_uiconfig.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Mode: makefile-gmake; 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. 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 -# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2010, All Rights Reserved. -# -# 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,sm_uiconfig,$(SRCDIR)/starmath/uiconfig)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/menubar/menubar.xml,smath/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/statusbar/statusbar.xml,smath/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/toolbar.xml,smath/toolbar/toolbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/standardbar.xml,smath/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,sm_uiconfig,xml/uiconfig/modules/smath/toolbar/fullscreenbar.xml,smath/toolbar/fullscreenbar.xml)) - -# vim: set noet sw=4 ts=4: diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk index a88475d8b842..9fe1f8fa0f72 100644 --- a/starmath/UIConfig_smath.mk +++ b/starmath/UIConfig_smath.mk @@ -9,6 +9,20 @@ $(eval $(call gb_UIConfig_UIConfig,modules/smath)) +$(eval $(call gb_UIConfig_add_menubarfiles,modules/smath,\ + starmath/uiconfig/smath/menubar/menubar \ +)) + +$(eval $(call gb_UIConfig_add_statusbarfiles,modules/smath,\ + starmath/uiconfig/smath/statusbar/statusbar \ +)) + +$(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\ + starmath/uiconfig/smath/toolbar/toolbar \ + starmath/uiconfig/smath/toolbar/standardbar \ + starmath/uiconfig/smath/toolbar/fullscreenbar \ +)) + $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ starmath/uiconfig/smath/ui/printeroptions \ )) |