diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-17 18:41:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:29 +0200 |
| commit | a8ade9621d71dac5fa174254f4a5ac765a400905 (patch) | |
| tree | b86d1c65cc80b44561d884181293d0715ae484a2 | |
| parent | 5905dfeafff2c8071e6f2e212a077b8450d1a0d6 (diff) | |
gbuild: deduplicate gb_Library_get_exports_target
and remove comment obsoleted by 170668d83911c12475eccf69eba5e191863d4a56
Change-Id: Iba8db6214e04480eaf45bcd069ccd8b41fd25874
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index e75626d5bee2..d8d851e5ee31 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -228,6 +228,10 @@ gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1) gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1) gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip +define gb_Library_get_exports_target +$(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).exports +endef + gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) define gb_Library_get_headers_target diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 35a3d7e91577..af402b995543 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -199,10 +199,6 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef -define gb_Library_get_exports_target -$(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).exports -endef - # YaccTarget class define gb_YaccTarget__command diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 6f6ebe905554..f85b29af6b3d 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -341,12 +341,6 @@ define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef -# in effect this just causes the .export target to be touched -# cannot be the .lib itself because that causes attempts to get it linked :( -define gb_Library_get_exports_target -$(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).exports -endef - # StaticLibrary class |