diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-30 11:24:21 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-09-30 11:24:21 +0200 |
| commit | 2b9e302f0aee867412fa45275d42cb68929fb4b5 (patch) | |
| tree | d9cb14602c977a76a01a8ae4d19644b3467903c8 | |
| parent | f8682923858c39a5e980324388b2ca482d0d45fa (diff) | |
keep platform stuff in the platform subdir
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/ios.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e2010d526969..a463b769f50f 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -72,7 +72,7 @@ $(if $(strip $(UNO_SERVICES)),\ $(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \ $(if $(URE),\ $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\ - -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib))) + -env:$(dir)=file://$(gb_CppunitTest_LIBDIR))) endef .PHONY : $(call gb_CppunitTest_get_clean_target,%) diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index e9653eda5d1f..e5a398ffca7b 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -381,6 +381,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := : gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib +gb_CppunitTest_EXT := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 01ff9d0613a2..6e72767a5035 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -469,6 +469,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib +gb_CppunitTest_LIBDIR := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 313dae8153c2..ad7c5cc908a9 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -344,6 +344,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .so +gb_CppunitTest_LIBDIR := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index f1c19897b978..2317fc074acf 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -455,6 +455,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .so +gb_CppunitTest_LIBDIR := $(OUTDIR)/lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename) diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index e91d5b0ecb43..873c6fb71bf3 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -601,6 +601,7 @@ gb_CppunitTest_CPPTESTPRECOMMAND := PATH="`cygpath -u $(OUTDIR)`/bin:$${PATH}" gb_CppunitTest_SYSPRE := itest_ gb_CppunitTest_EXT := .lib +gb_CppunitTest_LIBDIR := $(OUTDIR)/bin gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = test_$(1).dll |