diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-22 13:57:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-22 14:34:25 +0200 |
| commit | bec62421a45da89d2812bdff30fbbab73291cf91 (patch) | |
| tree | c342f24d7914e2dc2e03bc0e16766c91606c08ce | |
| parent | cbd9dddb4d259df3ab7b3e58e5b7165d18037c1a (diff) | |
factor out common code
Change-Id: I733dc593b2395e06bf86d8ad9dec16c958c880b9
| -rw-r--r-- | solenv/gbuild/CliAssembly.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index 13eaaa2ef8b0..b6e216a0dcb8 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -158,9 +158,14 @@ $(call gb_CliAssembly_get_clean_target,$(1)) : $(call gb_Package_get_clean_targe endef +define gb_CliAssembly__add_file +$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) + +endef + define gb_CliAssembly__set_configfile_impl $(call gb_CliAssemblyTarget_set_configfile,$(1),$(2)) -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) +$(call gb_CliAssembly__add_file,$(1),$(2)) endef @@ -185,15 +190,10 @@ $(call gb_CliAssemblyTarget_set_platform,$(1),$(2)) endef -define gb_CliAssembly__set_policy -$(call gb_Package_add_file,$(1)_assembly,bin/$(notdir $(2)),$(subst $(WORKDIR)/,,$(2))) - -endef - define gb_CliAssembly_set_policy $(call gb_CliAssemblyTarget_set_version,$(1),$(3)) $(call gb_CliAssemblyTarget_set_name,$(1),$(2)) -$(call gb_CliAssembly__set_policy,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2))) +$(call gb_CliAssembly__add_file,$(1),$(call gb_CliAssemblyTarget_get_assembly_target,$(2))) endef |