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 /basctl | |
| 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 'basctl')
| -rw-r--r-- | basctl/Module_basctl.mk | 1 | ||||
| -rw-r--r-- | basctl/Package_uiconfig.mk | 42 | ||||
| -rw-r--r-- | basctl/UIConfig_basicide.mk | 19 |
3 files changed, 19 insertions, 43 deletions
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index ddb86ab445a9..d87463e16fea 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,basctl,\ endif $(eval $(call gb_Module_add_targets,basctl,\ - Package_uiconfig \ UIConfig_basicide \ )) diff --git a/basctl/Package_uiconfig.mk b/basctl/Package_uiconfig.mk deleted file mode 100644 index 229a4654ff43..000000000000 --- a/basctl/Package_uiconfig.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 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. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,basctl_uiconfig,$(SRCDIR)/basctl)) - -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/findbar.xml,uiconfig/basicide/toolbar/findbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,uiconfig/basicide/toolbar/fullscreenbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,uiconfig/basicide/toolbar/insertcontrolsbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/formcontrolsbar.xml,uiconfig/basicide/toolbar/formcontrolsbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,uiconfig/basicide/toolbar/macrobar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml)) -$(eval $(call gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml)) - -# vim: set noet sw=4 ts=4: diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk index 66dfb833e6a8..013df6e2c99c 100644 --- a/basctl/UIConfig_basicide.mk +++ b/basctl/UIConfig_basicide.mk @@ -9,6 +9,25 @@ $(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE)) +$(eval $(call gb_UIConfig_add_menubarfiles,modules/BasicIDE,\ + basctl/uiconfig/basicide/menubar/menubar \ +)) + +$(eval $(call gb_UIConfig_add_statusbarfiles,modules/BasicIDE,\ + basctl/uiconfig/basicide/statusbar/statusbar \ +)) + +$(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\ + basctl/uiconfig/basicide/toolbar/dialogbar \ + basctl/uiconfig/basicide/toolbar/findbar \ + basctl/uiconfig/basicide/toolbar/fullscreenbar \ + basctl/uiconfig/basicide/toolbar/insertcontrolsbar \ + basctl/uiconfig/basicide/toolbar/formcontrolsbar \ + basctl/uiconfig/basicide/toolbar/macrobar \ + basctl/uiconfig/basicide/toolbar/standardbar \ + basctl/uiconfig/basicide/toolbar/translationbar \ +)) + $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\ basctl/uiconfig/basicide/ui/basicmacrodialog \ )) |