diff options
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 10 |
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 |