summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-01 13:49:30 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-02 22:07:54 +0100
commit43adc0cf01af3bb304baaeed9d5224a890edb407 (patch)
tree265d6f92ef3fcd8891ad1fb36c5d42e0aabb0a82 /solenv
parenta2649f4d4de723452bfbb959e12278e6fb1b019a (diff)
gbuild: StaticLibrary: remove gb_StaticLibrary__get_linktarget_target
Change-Id: I82ddbb3c82fa5f92e27a938a65a282ed67826a1e
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/TargetLocations.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index ad3655d673aa..07408d2898f3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -41,9 +41,6 @@ else
gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target)
endif
-gb_StaticLibrary_get_target = $(gb_StaticLibrary__get_linktarget_target)
-
-
# workdir target patterns
gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1)
@@ -389,12 +386,12 @@ endef
define gb_StaticLibrary__get_workdir_linktargetname
StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
endef
-define gb_StaticLibrary__get_linktarget_target
+define gb_StaticLibrary_get_target
$(WORKDIR)/LinkTarget/$(call gb_StaticLibrary__get_workdir_linktargetname,$(1))
endef
# this returns a tuple of both the linktargetname, and the target file
define gb_StaticLibrary_get_linktarget
-$(call gb_StaticLibrary__get_workdir_linktargetname,$(1))<>$(call gb_StaticLibrary__get_linktarget_target,$(1))
+$(call gb_StaticLibrary__get_workdir_linktargetname,$(1))<>$(call gb_StaticLibrary_get_target,$(1))
endef
define gb_CppunitTest__get_workdir_linktargetname