summaryrefslogtreecommitdiff
path: root/solenv/gbuild/TargetLocations.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-05-30 14:39:38 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-06-07 15:14:28 +0200
commitddb5edc8a6dcbe309daf4ec7356601a7dfee1700 (patch)
treec57cda78445cd97d610859551648a935025a1d35 /solenv/gbuild/TargetLocations.mk
parentbf06908b674251ea71875aa664a0f4a98d6781ab (diff)
gbuild: do not register static libraries
It does not make sense, there was only one group anyway. Change-Id: I606138ceed0bfc628b8a23abb864280d9626ed60
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
-rw-r--r--solenv/gbuild/TargetLocations.mk10
1 files changed, 3 insertions, 7 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 7a0b2b86055c..1bcc4dbc9c36 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -57,7 +57,7 @@ $(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_Library_FI
endef
define gb_StaticLibrary_get_target
-$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+$(gb_StaticLibrary_OUTDIRLOCATION)/$(call gb_StaticLibrary_get_filename,$(1))
endef
@@ -235,11 +235,11 @@ $(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILE
endef
define gb_StaticLibrary_get_external_headers_target
-$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+$(WORKDIR)/ExternalHeaders/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
endef
define gb_StaticLibrary_get_headers_target
-$(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+$(WORKDIR)/Headers/StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
endef
$(eval $(call gb_Helper_make_clean_targets,\
@@ -363,10 +363,6 @@ define gb_Library_get_filename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
endef
-define gb_StaticLibrary_get_filename
-$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
-endef
-
# Get dependencies needed for running the executable
#
# This is not strictly necessary, but it makes the use more similar to