[Libreoffice-commits] .: 2 commits - desktop/Executable_officeloader.mk solenv/gbuild

[Michael Stahl]

 desktop/Executable_officeloader.mk |    9 +++++++--
 solenv/gbuild/platform/macosx.mk   |    6 ++----
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ef95e4c8cc133928242621b033aeb95661851bcf
Author: Michael Stahl <mst at openoffice.org>
Date:   Thu Sep 15 23:22:39 2011 +0200

    Executable_officeloader.mk: fix obvious issues

diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index e6b0a0d..553c9f1 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -33,15 +33,20 @@ $(eval $(call gb_Executable_set_include,officeloader,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,officeloader,\
-    advapi32 \
     sal \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,officeloader,\
+    advapi32 \
     shell32 \
     shlwapi \
 ))
+endif
 
 ifeq ($(OS),MACOSX)
 
-$(eval $(call gb_Executable_set_ldflags,\
+$(eval $(call gb_Executable_set_ldflags,officeloader,\
     $(filter -bind_at_load,$$(LDFLAGS)) \
 ))
 
commit 76a1c60186e5e9115a2203f6c98fdab2b18f3ebc
Author: Michael Stahl <mst at openoffice.org>
Date:   Thu Sep 15 23:21:39 2011 +0200

    macosx.mk: no RPATH-equivalent for executables

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f32ddee..51e4256 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -451,12 +451,10 @@ gb_Executable_LAYER := \
 	$(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
 
 
-define gb_Executable_get_rpath
-$(call gb_LinkTarget__get_installname,$(1),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1))))
-endef
+gb_Executable_get_rpath :=
 
 define gb_Executable_Executable_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Executable_get_rpath,$(1))
+$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Executable_get_layer,$(1))
 
 endef