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>

3 files changed, 38 insertions, 48 deletions

diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index e72e4301bf77..08534f02e3fd 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
     Library_rpt \
     Library_rptui \
     Library_rptxml \
-    Package_uiconfig \
+    UIConfig_dbreport \
 ))
 
 # deactivated since sb123;
diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk
deleted file mode 100644
index 99b3f11c65ac..000000000000
--- a/reportdesign/Package_uiconfig.mk
+++ /dev/null
@@ -1,47 +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 or as specified alternatively below. 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# 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,reportdesign_uiconfig,$(SRCDIR)/reportdesign/uiconfig/dbreport))
-
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/menubar/menubar.xml,menubar/menubar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/statusbar/statusbar.xml,statusbar/statusbar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/alignmentbar.xml,toolbar/alignmentbar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/arrowshapes.xml,toolbar/arrowshapes.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/basicshapes.xml,toolbar/basicshapes.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/calloutshapes.xml,toolbar/calloutshapes.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/drawbar.xml,toolbar/drawbar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/flowchartshapes.xml,toolbar/flowchartshapes.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/Formatting.xml,toolbar/Formatting.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/reportcontrols.xml,toolbar/reportcontrols.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/resizebar.xml,toolbar/resizebar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionalignmentbar.xml,toolbar/sectionalignmentbar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/sectionshrinkbar.xml,toolbar/sectionshrinkbar.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/starshapes.xml,toolbar/starshapes.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/symbolshapes.xml,toolbar/symbolshapes.xml))
-$(eval $(call gb_Package_add_file,reportdesign_uiconfig,xml/uiconfig/modules/dbreport/toolbar/toolbar.xml,toolbar/toolbar.xml))
-
-# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/UIConfig_dbreport.mk b/reportdesign/UIConfig_dbreport.mk
new file mode 100644
index 000000000000..45e43b3fdec6
--- /dev/null
+++ b/reportdesign/UIConfig_dbreport.mk
@@ -0,0 +1,37 @@
+# -*- 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/dbreport))
+
+$(eval $(call gb_UIConfig_add_menubarfiles,modules/dbreport,\
+	reportdesign/uiconfig/dbreport/menubar/menubar \
+))
+
+$(eval $(call gb_UIConfig_add_statusbarfiles,modules/dbreport,\
+	reportdesign/uiconfig/dbreport/statusbar/statusbar \
+))
+
+$(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbreport,\
+	reportdesign/uiconfig/dbreport/toolbar/alignmentbar \
+	reportdesign/uiconfig/dbreport/toolbar/arrowshapes \
+	reportdesign/uiconfig/dbreport/toolbar/basicshapes \
+	reportdesign/uiconfig/dbreport/toolbar/calloutshapes \
+	reportdesign/uiconfig/dbreport/toolbar/drawbar \
+	reportdesign/uiconfig/dbreport/toolbar/flowchartshapes \
+	reportdesign/uiconfig/dbreport/toolbar/Formatting \
+	reportdesign/uiconfig/dbreport/toolbar/reportcontrols \
+	reportdesign/uiconfig/dbreport/toolbar/resizebar \
+	reportdesign/uiconfig/dbreport/toolbar/sectionalignmentbar \
+	reportdesign/uiconfig/dbreport/toolbar/sectionshrinkbar \
+	reportdesign/uiconfig/dbreport/toolbar/starshapes \
+	reportdesign/uiconfig/dbreport/toolbar/symbolshapes \
+	reportdesign/uiconfig/dbreport/toolbar/toolbar \
+))
+
+# vim: set noet sw=4 ts=4: