diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-06-13 13:04:56 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-06-19 20:00:39 +0200 |
| commit | e56a8300d36a7998e492e87bc514d14d931cf01d (patch) | |
| tree | 2c2b24a29854166103f5d6300b1a75d0e019973f /solenv/gbuild/TargetLocations.mk | |
| parent | d8ddd3f1c9faa3338703217967bae5c363df0e45 (diff) | |
use gb_StaticLibrary_WORKDIR and gb_Library_DLLDIR more consistently
same for gb_Executable_BINDIR[_FOR_BUILD] and fold
gb_Library_WORKDIR_FOR_BUILD into gb_Library_DLLDIR_FOR_BUILD (the
latter also has a workdir variant)
Change-Id: If7e4cf9aab46728182c89344546065bc33b452b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169201
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index d0727531c591..ad0e26a75969 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -483,16 +483,12 @@ endef # static members declared here because they are used globally -gb_StaticLibrary_WORKDIR = $(WORKDIR)/LinkTarget/StaticLibrary -gb_Library_WORKDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library -gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable -gb_Executable_BINDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Executable -gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library -gb_Library_DLLDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library -gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest - -# static variables declared here because they are used globally - +gb_StaticLibrary_WORKDIR := $(WORKDIR)/LinkTarget/StaticLibrary +gb_Executable_BINDIR := $(WORKDIR)/LinkTarget/Executable +gb_Executable_BINDIR_FOR_BUILD := $(WORKDIR_FOR_BUILD)/LinkTarget/Executable +gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library +gb_Library_DLLDIR_FOR_BUILD := $(WORKDIR_FOR_BUILD)/LinkTarget/Library +gb_CppunitTest_DLLDIR := $(WORKDIR)/LinkTarget/CppunitTest gb_POLOCATION := $(SRCDIR)/translations/source # vim: set noet sw=4: |