diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-17 19:50:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:29 +0200 |
| commit | d263c22a0924ece4663c023618bba93fcb7300c3 (patch) | |
| tree | 255dd07382ed6681fb2739405cd08a5dac930baf /solenv/gbuild/Library.mk | |
| parent | a8ade9621d71dac5fa174254f4a5ac765a400905 (diff) | |
gbuild: make the DLL the LinkTarget of Library and CppunitTest
... instead of the import lib. If the DLL is an auxtarget, it cannot
be deleted without annoying errors, and we want to be able to rm -r
$(INSTIDR) and build incrementally from there.
- replace DLLTARGET -> ILIBTARGET
- replace gb_Library_DLLFILENAMES -> gb_Library_FILENAMES
- replace gb_Library_FILENAMES -> gb_Library_ILIBFILENAMES
- replace gb_Library_get_dllname -> gb_Library_get_filename
- replace gb_Library_get_filename -> gb_Library_get_ilibfilename
- replace gb_CppunitTest_get_libfilename -> gb_CppunitTest_get_ilibfilename
- replace gb_LinkTarget_set_dlltarget -> gb_LinkTarget_set_ilibtarget
Change-Id: I92a2f061a653b9b5941f3232d729987b1317b6f8
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index f5b4a9f53e2b..1fd48a88ea2a 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -25,7 +25,7 @@ # gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library # defined by platform # gb_Library_DEFS -# gb_Library_DLLFILENAMES +# gb_Library_ILIBFILENAMES # gb_Library_FILENAMES # gb_Library_Library_platform @@ -85,7 +85,7 @@ $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Library_get_target,$(1))).dir $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := -$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1))) +$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) $(if $(and $(call gb_Library_get_instdir,$(1)),$(filter-out $(gb_MERGEDLIBS),$(1))),\ $(call gb_Library__install,$(call gb_Library__get_final_target,$(1)), \ @@ -189,8 +189,7 @@ gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_Library_get_linktarget,$ endef -gb_Library_get_runtime_filename = \ - $(or $(call gb_Library_get_dllname,$(1)),$(call gb_Library_get_filename,$(1))) +gb_Library_get_runtime_filename = $(call gb_Library_get_filename,$(1)) $(eval $(foreach method,\ add_cobject \ |