diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-27 12:32:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-28 16:34:23 +0200 |
| commit | f8bf72f44a39a01d421e1dadebc1aaf25151a8d2 (patch) | |
| tree | 3f37089a9c6197a03279d4eae84b86d84dec3b4a /solenv/gbuild | |
| parent | efd2ac98ecdd2cbf2c37efc03acdd72596031c1d (diff) | |
gbuild: copy resources into $(INSTDIR)
Change-Id: I06d20538ec2b4f80963e0e7c6c401b3d573aac86
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 2ac22b20b252..13fb13838bad 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -443,6 +443,8 @@ define gb_AllLangResTarget_set_langs gb_AllLangResTarget_LANGS := $(1) endef +gb_AllLangResTarget_get_packagename = AllLangResTarget/$(1) + $(call gb_AllLangResTarget_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_AllLangResTarget_get_target,$*)) @@ -455,6 +457,18 @@ define gb_AllLangResTarget_AllLangResTarget $(call gb_Postprocess_get_target,AllResources) : $(call gb_AllLangResTarget_get_target,$(1)) $(foreach lang,$(gb_AllLangResTarget_LANGS),\ $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang))) + +ifneq ($(gb_RUNNABLE_INSTDIR),) +$(call gb_Package_Package,$(call gb_AllLangResTarget_get_packagename,$(1)),$(WORKDIR)) +$(call gb_Package_set_outdir,$(call gb_AllLangResTarget_get_packagename,$(1)),$(INSTDIR)) +$(call gb_AllLangResTarget_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_AllLangResTarget_get_packagename,$(1))) +$(call gb_AllLangResTarget_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_AllLangResTarget_get_packagename,$(1))) +$(call gb_Package_add_files,$(call gb_AllLangResTarget_get_packagename,$(1)),program/resource,\ + $(foreach lang,$(gb_AllLangResTarget_LANGS),\ + $(subst $(WORKDIR)/,,$(call gb_ResTarget_get_target,$(1)$(lang)))) \ +) +endif + $$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),AllLangResTarget) |