diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-19 00:15:27 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-02-19 19:24:35 +0100 |
| commit | b1a87ca7840ab4ed17e8a775fcd4726c2fc5b75d (patch) | |
| tree | 621c019b0f6b3be8deef7c9a875d2cedd40c5d6b /solenv | |
| parent | a62f426993835770a35f6d366047d8d5d6322e12 (diff) | |
fix handling of component files in mergelibs mode
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 1b7a2aae9b76..31c3e43c24f1 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -105,15 +105,19 @@ endef # But the component target also must be delivered, so a new phony target # gb_Library__get_final_target has been invented for that purpose... define gb_Library_set_componentfile -$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),\ - $(call gb_Library_get_runtime_filename,$(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1)))) -$(call gb_Library__get_final_target,$(1)) : \ +$(call gb_ComponentTarget_ComponentTarget,$(2),\ + $(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\ + $(call gb_Library_get_runtime_filename,$(gb_Library__get_name))) +$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) -$(call gb_ComponentTarget_get_target,$(2)) :| $(call gb_Library_get_target,$(1)) -$(call gb_Library_get_clean_target,$(1)) : \ +$(call gb_ComponentTarget_get_target,$(2)) :| \ + $(call gb_Library_get_target,$(gb_Library__get_name)) +$(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_clean_target,$(2)) endef +gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1)) + gb_Library__get_componentprefix = \ $(call gb_Library__get_layer_componentprefix,$(call \ gb_Library_get_layer,$(1))) |