summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-08-04 14:37:55 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:33 +0100
commitbfd20bfb3a0344cca10034674a822530ccb950f9 (patch)
tree3dab3b68acf2c00bdcb419fbe8e425c974c2c80c /sw
parent481e627aea2fa41ac433adbb7a9a77b6bf7b9200 (diff)
use UI gbuild class to package .ui files in sw
Change-Id: I3c6a8d3cbd9fad20506c1deb34d7a65c4fa76bc6
Diffstat (limited to 'sw')
-rw-r--r--sw/Module_sw.mk2
-rw-r--r--sw/Package_uiconfig.mk5
-rw-r--r--sw/UI_sw.mk18
-rw-r--r--sw/UI_swriter.mk16
4 files changed, 36 insertions, 5 deletions
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 76c8e1574bf2..77e0bf3947a6 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_swd \
Library_swui \
Package_uiconfig \
+ UI_sw \
+ UI_swriter \
))
ifneq ($(DISABLE_SCRIPTING),TRUE)
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
index 414630d40f17..150b3ae2b93b 100644
--- a/sw/Package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
@@ -28,11 +28,6 @@
$(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/ui/titlepage.ui,swriter/ui/titlepage.ui))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/sw/ui/20705.ui,sw/ui/20705.ui))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/sw/ui/20872.ui,sw/ui/20872.ui))
-$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/sw/ui/20876.ui,sw/ui/20876.ui))
-
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml))
diff --git a/sw/UI_sw.mk b/sw/UI_sw.mk
new file mode 100644
index 000000000000..789da4f42171
--- /dev/null
+++ b/sw/UI_sw.mk
@@ -0,0 +1,18 @@
+# -*- 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,sw))
+
+$(eval $(call gb_UI_add_uifiles,sw,\
+ sw/uiconfig/sw/ui/20705 \
+ sw/uiconfig/sw/ui/20872 \
+ sw/uiconfig/sw/ui/20876 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
new file mode 100644
index 000000000000..f1419ebb1ea1
--- /dev/null
+++ b/sw/UI_swriter.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,modules/swriter))
+
+$(eval $(call gb_UI_add_uifiles,modules/swriter,\
+ sw/uiconfig/swriter/ui/titlepage \
+))
+
+# vim: set noet sw=4 ts=4: