summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-12-27 12:15:08 +0100
committerDavid Tardon <dtardon@redhat.com>2012-12-28 16:22:27 +0100
commitd250f6f5626056e94409cc0a6d64f5377bacfe84 (patch)
tree862046911b04997cdc4b557c953d36d5e9c6f66f /solenv
parent90c34cdfa0689167d9dee5df6459ed7449b76301 (diff)
simplify UI packaging
Change-Id: Id829cd4f12cb4d3fc8cb08dc5b297ee3cfc7591b (cherry picked from commit 4faaf5579937e2e2fc91aef28ba4974020d2fa9f) Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/UI.mk11
1 files changed, 4 insertions, 7 deletions
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 5a3f8fccf858..b56c8580b6cf 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -115,24 +115,21 @@ endif
$$(eval $$(call gb_Module_register_target,$(call gb_UI_get_target,$(1)),$(call gb_UI_get_clean_target,$(1))))
endef
-# gb_UI__get_outdir_filename target file lang?
-gb_UI__get_outdir_filename = xml/uiconfig/$(1)/ui/$(if $(3),res/$(3)/)$(notdir $(2))$(if $(3),,.ui)
-
-# gb_UI__add_uifile target package destfile srcfile lang?
+# gb_UI__package_uifile target package destfile srcfile
define gb_UI__package_uifile
-$(call gb_Package_add_file,$(2),$(call gb_UI__get_outdir_filename,$(1),$(3),$(5)),$(4))
+$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4))
endef
# gb_UI__add_uifile target file
define gb_UI__add_uifile
-$(call gb_UI__package_uifile,$(1),$(1)_ui,$(2),$(2).ui)
+$(call gb_UI__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui)
endef
# gb_UI__add_uifile_for_lang target file lang
define gb_UI__add_uifile_for_lang
-$(call gb_UI__package_uifile,$(1),$(1)_ui_localized,$(2),$(2)/$(3).ui,$(3))
+$(call gb_UI__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui)
endef