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

[David Tardon]

 desktop/Package_soffice_bin.mk          |    2 ++
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b1419d37db297a4228bb0df463a1ab06c0c6183d
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 2 17:36:03 2012 +0200

    do not announce exec build twice
    
    Change-Id: If9c68f2bf423d23a53b2e0fa570c9ba55924b289

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 155d97b..b1b4fb6 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -127,7 +127,6 @@ gb_LinkTarget_INCLUDE +=\
 	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
 
 define gb_LinkTarget__command_dynamiclinkexecutable
-$(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CXX) $(strip \
commit 86485d4c3785827fe2e3ceb4d3ac3eb82e3bd3b9
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 2 17:35:38 2012 +0200

    add explicit ordering dependency
    
    Change-Id: Idc7b869a0a3755df7fb10105ce07dca3d076dd43

diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk
index ad8de3a..725902c 100644
--- a/desktop/Package_soffice_bin.mk
+++ b/desktop/Package_soffice_bin.mk
@@ -33,4 +33,6 @@ ifeq ($(COM),MSC)
 $(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin.manifest,soffice_bin$(gb_Executable_EXT).manifest))
 endif
 
+$(call gb_Package_get_target,desktop_soffice_bin) :| $(call gb_Executable_get_target,soffice_bin)
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab: