[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/Executable.mk    |    2 +-
 solenv/gbuild/Library.mk       |    2 +-
 solenv/gbuild/StaticLibrary.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 624bcdc302df8cdee7172bc455aa5c4aa9a6710a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 1 23:12:08 2012 +0200

    Revert "StaticLibrary too"
    
    This reverts commit 23e5bb66436991d809d8d807f27d25f922fb062f.
    
    Does not work, see previous commit

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index c84e822..2d4a9d5 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -66,7 +66,7 @@ $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
 $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_StaticLibrary_DEFS) \
 )
-$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(gb_LinkTarget_get_dep_target,$(2)) \
+$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
 	| $(dir $(call gb_StaticLibrary_get_target,$(1))).dir
 $(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
commit 12981fd72b6128eae5850fcfeee9d3bb1630b521
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 1 23:10:38 2012 +0200

    Revert "force depfile concat on deliver"
    
    This reverts commit b8f7cc3c26a95b7dfb41415b24f0e2a3a9f1e33c.
    
    This does not work, because there is no dependency between the
    *Object .d files and the *Objects, and so the concat-deps races with
    the compiler writing the dep files.
    Introducing such a dependency would of course be reverting
    8b5a984d45005d3df1c89eae897d6e04612625d8

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index f1d392a..9f56296 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -55,7 +55,7 @@ define gb_Executable__Executable_impl
 $(call gb_Executable_set_targettype_gui,$(2))
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Executable)
-$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \
+$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
 	| $(dir $(call gb_Executable_get_target,$(1))).dir
 $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Executable_Executable_platform,$(1),$(2))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5866b9b..157be8c 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_Library_DEFS) \
 )
 $(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_dep_target,$(2)) \
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
 	| $(dir $(call gb_Library_get_target,$(1))).dir
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))