diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-01 13:44:05 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 22:07:54 +0100 |
| commit | a2649f4d4de723452bfbb959e12278e6fb1b019a (patch) | |
| tree | 2f247423511c924966fb7f361d82306d153f2858 /solenv | |
| parent | 8ec6c54a8c57dbc6f217a0fc16d992716b9c0555 (diff) | |
gbuild: Library: remove pointless functions
gb_Library_get_install_target and gb_Library__get_linktarget_target
Change-Id: I446e642fb43cf9804900b99b32dcc4c621dcb1c7
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index ba5839c67552..71ed8b55d5f2 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -51,7 +51,6 @@ $(WORKDIR)/Clean/Library/% : 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_install_target = $(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1)) gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 01db721f8e3b..ad3655d673aa 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 -# FIXME: cleanup? -gb_Library_get_target = $(gb_Library__get_linktarget_target) - gb_StaticLibrary_get_target = $(gb_StaticLibrary__get_linktarget_target) @@ -381,12 +378,12 @@ endef define gb_Library__get_workdir_linktargetname Library/$(call gb_Library_get_filename,$(1)) endef -define gb_Library__get_linktarget_target -$(call gb_Library_get_install_target,$(1)) +define gb_Library_get_target +$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1)) endef # this returns a tuple of both the linktargetname, and the target file define gb_Library_get_linktarget -$(call gb_Library__get_workdir_linktargetname,$(1))<>$(call gb_Library__get_linktarget_target,$(1)) +$(call gb_Library__get_workdir_linktargetname,$(1))<>$(call gb_Library_get_target,$(1)) endef define gb_StaticLibrary__get_workdir_linktargetname |