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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/Module_framework.mk | 2 | ||||
| -rw-r--r-- | framework/Package_uiconfig.mk | 25 | ||||
| -rw-r--r-- | framework/UIConfig_startmodule.mk | 24 |
3 files changed, 25 insertions, 26 deletions
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk index e408ffe70f0d..66e645fb0ec1 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,framework,\ Library_fwm \ Package_dtd \ Package_inc \ - Package_uiconfig \ + UIConfig_startmodule \ )) ifneq ($(OOO_JUNIT_JAR),) diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk deleted file mode 100644 index b655b407bf12..000000000000 --- a/framework/Package_uiconfig.mk +++ /dev/null @@ -1,25 +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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_Package_Package,framework_uiconfig,$(SRCDIR)/framework/uiconfig)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/menubar/menubar.xml,startmodule/menubar/menubar.xml)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/statusbar/statusbar.xml,startmodule/statusbar/statusbar.xml)) -$(eval $(call gb_Package_add_file,framework_uiconfig,xml/uiconfig/modules/StartModule/toolbar/standardbar.xml,startmodule/toolbar/standardbar.xml)) - -# vim: set noet sw=4 ts=4: diff --git a/framework/UIConfig_startmodule.mk b/framework/UIConfig_startmodule.mk new file mode 100644 index 000000000000..6bbb68d93798 --- /dev/null +++ b/framework/UIConfig_startmodule.mk @@ -0,0 +1,24 @@ +# -*- 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/StartModule)) + +$(eval $(call gb_UIConfig_add_menubarfiles,modules/StartModule,\ + framework/uiconfig/startmodule/menubar/menubar \ +)) + +$(eval $(call gb_UIConfig_add_statusbarfiles,modules/StartModule,\ + framework/uiconfig/startmodule/statusbar/statusbar \ +)) + +$(eval $(call gb_UIConfig_add_toolbarfiles,modules/StartModule,\ + framework/uiconfig/startmodule/toolbar/standardbar \ +)) + +# vim: set noet sw=4 ts=4: |