summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Library.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-05-01 09:46:11 +0200
committerDavid Tardon <dtardon@redhat.com>2013-05-01 16:55:38 +0200
commit61f59c46f6476a5e96fea143bc31d87c7de58ed2 (patch)
treee3d47d826a86ec6f8f8712bc1ceaf1cce1bb658a /solenv/gbuild/Library.mk
parent17edefac370b86fb22255e7e92468bb5206d36c8 (diff)
add function for adding runtime libs to ExternalPackage
This allows us to deliver libs needed at runtime to instdir in addition to solver. It could possibly also be used for autoinstalling external libs, just like we can already do for internal libs. Change-Id: I96d314c55581190e129adae8383224535748ac43
Diffstat (limited to 'solenv/gbuild/Library.mk')
-rw-r--r--solenv/gbuild/Library.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 643073c2666d..aa92d85fb356 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -55,7 +55,7 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
gb_Library_get_packagename = Library/$(1)
gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS)))
-gb_Library__get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1)))
+gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1)))
define gb_Library_Library
$(call gb_Postprocess_get_target,AllLibraries) : $(call gb_Library_get_target,$(1))
@@ -98,7 +98,7 @@ endef
define gb_Library__Library_package
$(call gb_Package_Package_internal,$(2),$(gb_Helper_OUTDIRLIBDIR))
$(call gb_Package_set_outdir,$(2),$(INSTDIR))
-$(call gb_Package_add_file,$(2),$(call gb_Library__get_instdir,$(1))/$(3),$(3))
+$(call gb_Package_add_file,$(2),$(call gb_Library_get_instdir,$(1))/$(3),$(3))
$(call gb_Library__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
$(call gb_Package_get_target,$(2)) : $(call gb_Library_get_target,$(1))
@@ -127,7 +127,7 @@ endef
define gb_Library__add_soversion_link
$(call gb_Library_add_auxtarget,$(1),$(3))
ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(call gb_Package_add_file,$(2),$(call gb_Library__get_instdir,$(1))/$(notdir $(3)),$(notdir $(3)))
+$(call gb_Package_add_file,$(2),$(call gb_Library_get_instdir,$(1))/$(notdir $(3)),$(notdir $(3)))
endif
endef