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/TargetLocations.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/TargetLocations.mk')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index d8d851e5ee31..d029d33910b8 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -427,7 +427,8 @@ endef # static members declared here because they are used globally gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable -gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib +# FIXME move platform +gb_Library_OUTDIRLOCATION = $(if $(filter WNT,$(OS)),$(OUTDIR)/bin,$(OUTDIR)/lib) gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib |