diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 08:14:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-23 08:16:13 +0100 |
| commit | 577c7ea310fa0417d2f2ca273f5541605883d2fd (patch) | |
| tree | 24b3a3d70cc9029f9e54394173822b0b29784939 /solenv/gbuild/Library.mk | |
| parent | ManageNames: handle formula errors in Define Names dialog correctly (diff) | |
| download | core-577c7ea310fa0417d2f2ca273f5541605883d2fd.tar.gz core-577c7ea310fa0417d2f2ca273f5541605883d2fd.zip | |
Clean up gb_Library_set_componentfile argument handling.
It is only ever called with 2, never with 3 arguments. And the
gb_ComponentTarget_ComponentTarget it calls only takes 3, not 4 arguments.
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 3e352280ebc1..7c55ec024eec 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -78,8 +78,8 @@ $(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_L endef define gb_Library_set_componentfile -$(call gb_ComponentTarget_ComponentTarget,$(or $(strip $(3)),$(strip $(2))),$(call gb_Library__get_componentprefix,$(1)),\ - $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1))),$(2)) +$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),\ + $(call gb_Library_get_runtime_filename,$(if $(MERGELIBS),$(if $(filter $(gb_MERGED_LIBS),$(1)),merged,$(1)),$(1)))) $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(or $(strip $(3)),$(strip $(2)))) |