diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-03 12:40:14 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:20 +0200 |
| commit | 1c15d509daff7835b02f8c5c47efca31b2788d61 (patch) | |
| tree | 2892ce096e17821614f5d8cbcf5b8999b4bb7b2e | |
| parent | tubes: fix makefiles after rebase (diff) | |
| download | core-1c15d509daff7835b02f8c5c47efca31b2788d61.tar.gz core-1c15d509daff7835b02f8c5c47efca31b2788d61.zip | |
tubes: add Collaborate menu item only in telepathy enabled build
Change-Id: Ibfd90941a64540d0e59f1e884a0992758cbc3bb8
| -rw-r--r-- | sc/CustomTarget_uiconfig.mk | 22 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 1 | ||||
| -rw-r--r-- | sc/Package_uiconfig.mk | 2 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/menubar/menubar.xml | 3 | ||||
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 1 |
5 files changed, 27 insertions, 2 deletions
diff --git a/sc/CustomTarget_uiconfig.mk b/sc/CustomTarget_uiconfig.mk new file mode 100644 index 000000000000..8e4e1ae21cf9 --- /dev/null +++ b/sc/CustomTarget_uiconfig.mk @@ -0,0 +1,22 @@ +# -*- 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_CustomTarget_CustomTarget,sc/uiconfig)) + +ifeq ($(ENABLE_TELEPATHY),TRUE) +$(call gb_CustomTarget_get_target,sc/uiconfig) : \ + $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml + +$(OUTDIR)/xml/uiconfig/modules/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml \ + | $(OUTDIR)/xml/uiconfig/modules/scalc/menubar/.dir + sed 's/.*.uno:Collaborate.*/ <menu:menuseparator\/>\n <menu:menuitem menu:id=".uno:Collaborate"\/>/' $< > $@ + +endif + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index b2cd2abbd0c2..bf606dfc0fe8 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,sc)) $(eval $(call gb_Module_add_targets,sc,\ AllLangResTarget_sc \ + CustomTarget_uiconfig \ Library_sc \ Library_scd \ Library_scfilt \ diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk index bc3ec4d945c6..f85a789709b9 100644 --- a/sc/Package_uiconfig.mk +++ b/sc/Package_uiconfig.mk @@ -21,7 +21,9 @@ # instead of those above. $(eval $(call gb_Package_Package,sc_uiconfig,$(SRCDIR)/sc/uiconfig)) +ifneq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/menubar/menubar.xml,scalc/menubar/menubar.xml)) +endif $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/statusbar/statusbar.xml,scalc/statusbar/statusbar.xml)) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/alignmentbar.xml,scalc/toolbar/alignmentbar.xml)) $(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/arrowshapes.xml,scalc/toolbar/arrowshapes.xml)) diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index ac94fa01354e..5a95a265a4e6 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -15,8 +15,7 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:Reload"/> <menu:menuitem menu:id=".uno:VersionDialog"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:Collaborate"/> + <!-- .uno:Collaborate menuitem, see CustomTarget_uiconfig.mk --> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ExportTo"/> <menu:menuitem menu:id=".uno:ExportToPDF"/> diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 31c5e9caa456..d8b59d2b15c3 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -43,6 +43,7 @@ $(call gb_CustomTarget_get_clean_target,%) : define gb_CustomTarget_CustomTarget $(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1)))) +$(call gb_CustomTarget_get_target,$(1)) :| $(dir $(call gb_CustomTarget_get_target,$(1))).dir endef |