diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 11:30:37 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 11:30:37 +0200 |
commit | 27eec46ef7f4dfbd0d3573ab3bc3984510677b12 (patch) | |
tree | 9af364737431db3690457fe2ef8a2605317e8641 /solenv | |
parent | ff04ef4ed7c370a4da4e9467937e5a66450c72cc (diff) |
introduce gb_Helper_OUTDIRLIBDIR
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/Helper.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/Pyuno.mk | 6 | ||||
-rw-r--r-- | solenv/gbuild/platform/ios.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/windows.mk | 5 |
7 files changed, 19 insertions, 10 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 675ef20e4ee9..22aec26e9e01 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -184,4 +184,7 @@ endef export gb_Helper_set_ld_path export gb_Helper_execute +# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use +# for libraries from the OUTDIR + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index 2ec682179a74..b8eb04ec39ba 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -23,11 +23,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS),WNT) -gb_Pyuno__get_outdir_path = bin/pyuno/$(1) -else -gb_Pyuno__get_outdir_path = lib/pyuno/$(1) -endif +gb_Pyuno__get_outdir_path = $(patsubst $(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1) $(call gb_Pyuno_get_target,%) : $(call gb_Output_announce,$*,$(true),PYU,3) diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index 661f25de5aee..8e260d1a7b91 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -135,6 +135,8 @@ define gb_Helper_convert_native $(1) endef +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib + # YaccObject class define gb_YaccObject__command @@ -381,7 +383,7 @@ endef gb_CppunitTest_CPPTESTPRECOMMAND := : gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib -gb_CppunitTest_LIBDIR := $(OUTDIR)/lib +gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) 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 ba1438a80fad..9cf0c8777016 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -165,6 +165,8 @@ define gb_Helper_convert_native $(1) endef +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib + # YaccObject class ifeq ($(CPUNAME),POWERPC) @@ -473,7 +475,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_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) 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 ad7c5cc908a9..8bcd70ea2f0d 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -142,6 +142,7 @@ define gb_Helper_convert_native $(1) endef +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib # CObject class @@ -344,7 +345,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_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) 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 e64079c69573..180ff5e75aa4 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -213,6 +213,8 @@ define gb_Helper_convert_native $(1) endef +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib + # YaccObject class define gb_YaccObject__command @@ -455,7 +457,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_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) 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 8546a6905acf..989669f56cb2 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -234,6 +234,7 @@ endef endif # Helper class + gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') @@ -257,6 +258,8 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \ $(1))))) endef +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin + # YaccObject class define gb_YaccObject__command @@ -602,7 +605,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_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) gb_CppunitTest_get_libfilename = test_$(1).dll |