[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/gbuild

David Tardon dtardon at kemper.freedesktop.org
Wed Aug 1 23:41:38 PDT 2012


 solenv/gbuild/WinResTarget.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 996e1931e0a57e3c37b75308a7e1c391f83d16b0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 27 21:39:39 2012 +0200

    gbuild: WinResTarget: fix dep-target dependencies:
    
    Windows specific fallout of 8b5a984d45005d3df1c89eae897d6e04612625d8,
    similar to 236055746ffe92ce3b2a7a9316b1083da046deb9; can be observed by
    building with "make check" from scratch, on the "subsequentcheck" target
    one res file depends on some lngconvex executable by way of a custom
    target in shell, which causes udkapi to rebuild itself before the make
    restart.
    
    Change-Id: I14f370a66f4ac5088da4af7eceede09f5a6bae84
    (cherry picked from commit 8a05f1265e6307c34b2ffdb5fc5279870c8397b7)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index c8d5393..1731db6 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -27,7 +27,7 @@ endif
 endef
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_WinResTarget_get_dep_target,%) : $(call gb_WinResTarget_get_target,%)
+$(call gb_WinResTarget_get_dep_target,%) :
 	$(call gb_WinResTarget__command_dep,$@,$*,$<)
 endif
 


More information about the Libreoffice-commits mailing list