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>

4 files changed, 61 insertions, 70 deletions

diff --git a/sc/CustomTarget_uiconfig.mk b/sc/CustomTarget_uiconfig.mk
index 8e4e1ae21cf9..24d2cf322825 100644
--- a/sc/CustomTarget_uiconfig.mk
+++ b/sc/CustomTarget_uiconfig.mk
@@ -9,14 +9,11 @@
 
 $(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
+$(eval $(call gb_CustomTarget_register_targets,sc/uiconfig,\
+	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
+$(call gb_CustomTarget_get_workdir,sc/uiconfig)/scalc/menubar/menubar.xml : $(SRCDIR)/sc/uiconfig/scalc/menubar/menubar.xml
 	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 2d8231f5a2bd..e651342e56e2 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -25,15 +25,21 @@ $(eval $(call gb_Module_Module,sc))
 
 $(eval $(call gb_Module_add_targets,sc,\
 	AllLangResTarget_sc \
-	CustomTarget_uiconfig \
 	Library_sc \
 	Library_scd \
 	Library_scfilt \
 	Library_scui \
-	Package_uiconfig \
 	UIConfig_scalc \
 ))
 
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+
+$(eval $(call gb_Module_add_targets,sc,\
+	CustomTarget_uiconfig \
+))
+
+endif
+
 ifneq ($(DISABLE_SCRIPTING),TRUE)
 
 $(eval $(call gb_Module_add_targets,sc,\
diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk
deleted file mode 100644
index f85a789709b9..000000000000
--- a/sc/Package_uiconfig.mk
+++ /dev/null
@@ -1,61 +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,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))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/basicshapes.xml,scalc/toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/calloutshapes.xml,scalc/toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/colorbar.xml,scalc/toolbar/colorbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/drawbar.xml,scalc/toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/drawobjectbar.xml,scalc/toolbar/drawobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/extrusionobjectbar.xml,scalc/toolbar/extrusionobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/findbar.xml,scalc/toolbar/findbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/flowchartshapes.xml,scalc/toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/fontworkobjectbar.xml,scalc/toolbar/fontworkobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/fontworkshapetype.xml,scalc/toolbar/fontworkshapetype.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formatobjectbar.xml,scalc/toolbar/formatobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formcontrols.xml,scalc/toolbar/formcontrols.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formdesign.xml,scalc/toolbar/formdesign.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formsfilterbar.xml,scalc/toolbar/formsfilterbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formsnavigationbar.xml,scalc/toolbar/formsnavigationbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/formtextobjectbar.xml,scalc/toolbar/formtextobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/fullscreenbar.xml,scalc/toolbar/fullscreenbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/graffilterbar.xml,scalc/toolbar/graffilterbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/graphicobjectbar.xml,scalc/toolbar/graphicobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/insertbar.xml,scalc/toolbar/insertbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/insertcellsbar.xml,scalc/toolbar/insertcellsbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/mediaobjectbar.xml,scalc/toolbar/mediaobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/moreformcontrols.xml,scalc/toolbar/moreformcontrols.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/previewbar.xml,scalc/toolbar/previewbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/standardbar.xml,scalc/toolbar/standardbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/starshapes.xml,scalc/toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/symbolshapes.xml,scalc/toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/textobjectbar.xml,scalc/toolbar/textobjectbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/toolbar.xml,scalc/toolbar/toolbar.xml))
-$(eval $(call gb_Package_add_file,sc_uiconfig,xml/uiconfig/modules/scalc/toolbar/viewerbar.xml,scalc/toolbar/viewerbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index e6b055f6f29b..3ff897342291 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -9,6 +9,55 @@
 
 $(eval $(call gb_UIConfig_UIConfig,modules/scalc))
 
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+$(eval $(call gb_UIConfig_add_generated_menubarfiles,modules/scalc,\
+	CustomTarget/sc/uiconfig/scalc/menubar/menubar \
+))
+else
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/scalc,\
+	sc/uiconfig/scalc/menubar/menubar \
+))
+endif
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\
+	sc/uiconfig/scalc/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
+	sc/uiconfig/scalc/toolbar/alignmentbar \
+	sc/uiconfig/scalc/toolbar/arrowshapes \
+	sc/uiconfig/scalc/toolbar/basicshapes \
+	sc/uiconfig/scalc/toolbar/calloutshapes \
+	sc/uiconfig/scalc/toolbar/colorbar \
+	sc/uiconfig/scalc/toolbar/drawbar \
+	sc/uiconfig/scalc/toolbar/drawobjectbar \
+	sc/uiconfig/scalc/toolbar/extrusionobjectbar \
+	sc/uiconfig/scalc/toolbar/findbar \
+	sc/uiconfig/scalc/toolbar/flowchartshapes \
+	sc/uiconfig/scalc/toolbar/fontworkobjectbar \
+	sc/uiconfig/scalc/toolbar/fontworkshapetype \
+	sc/uiconfig/scalc/toolbar/formatobjectbar \
+	sc/uiconfig/scalc/toolbar/formcontrols \
+	sc/uiconfig/scalc/toolbar/formdesign \
+	sc/uiconfig/scalc/toolbar/formsfilterbar \
+	sc/uiconfig/scalc/toolbar/formsnavigationbar \
+	sc/uiconfig/scalc/toolbar/formtextobjectbar \
+	sc/uiconfig/scalc/toolbar/fullscreenbar \
+	sc/uiconfig/scalc/toolbar/graffilterbar \
+	sc/uiconfig/scalc/toolbar/graphicobjectbar \
+	sc/uiconfig/scalc/toolbar/insertbar \
+	sc/uiconfig/scalc/toolbar/insertcellsbar \
+	sc/uiconfig/scalc/toolbar/mediaobjectbar \
+	sc/uiconfig/scalc/toolbar/moreformcontrols \
+	sc/uiconfig/scalc/toolbar/previewbar \
+	sc/uiconfig/scalc/toolbar/standardbar \
+	sc/uiconfig/scalc/toolbar/starshapes \
+	sc/uiconfig/scalc/toolbar/symbolshapes \
+	sc/uiconfig/scalc/toolbar/textobjectbar \
+	sc/uiconfig/scalc/toolbar/toolbar \
+	sc/uiconfig/scalc/toolbar/viewerbar \
+))
+
 $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/cellprotectionpage \
 	sc/uiconfig/scalc/ui/definename \