summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-08-07 10:53:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:33 +0100
commit481e627aea2fa41ac433adbb7a9a77b6bf7b9200 (patch)
treede5cf8da8764c943ca714159848c75c873954104
parent210831bb479b67076bbca1b7926bccb0e29b1658 (diff)
use UI gbuild class to package .ui files in cui
Change-Id: I4ddeacdbf2bbe86d0351a2d6027e2d608b378731
-rw-r--r--cui/Module_cui.mk2
-rw-r--r--cui/Package_uiconfig.mk32
-rw-r--r--cui/UI_cui.mk16
3 files changed, 17 insertions, 33 deletions
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 6ed6ba37ed3d..895013eb2f8b 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,cui))
$(eval $(call gb_Module_add_targets,cui,\
AllLangResTarget_cui \
Library_cui \
- Package_uiconfig \
+ UI_cui \
))
# vim: set noet sw=4 ts=4:
diff --git a/cui/Package_uiconfig.mk b/cui/Package_uiconfig.mk
deleted file mode 100644
index 524a542ef20d..000000000000
--- a/cui/Package_uiconfig.mk
+++ /dev/null
@@ -1,32 +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) 2012 Red Hat, Inc., Caolán McNamara <caolanm@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,cui_uiconfig,$(SRCDIR)/cui/uiconfig))
-
-$(eval $(call gb_Package_add_file,cui_uiconfig,xml/uiconfig/cui/ui/10000.ui,ui/10000.ui))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
new file mode 100644
index 000000000000..a98e905893e1
--- /dev/null
+++ b/cui/UI_cui.mk
@@ -0,0 +1,16 @@
+# -*- 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_UI_UI,cui))
+
+$(eval $(call gb_UI_add_uifiles,cui,\
+ cui/uiconfig/ui/10000 \
+))
+
+# vim: set noet sw=4 ts=4: