desktop/Executable_soffice.bin.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit cfa5d651db4de43dd395256264bc9121897398ba
Author: Michael Meeks <michael.me...@suse.com>
Date: Mon Nov 7 11:37:25 2011 +0000
add soffice.bin generation to the desktop/ module rule to fix win32
diff --git a/desktop/Executable_soffice.bin.mk
b/desktop/Executable_soffice.bin.mk
index aafbcac..b32a444 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -69,7 +69,9 @@ $(eval $(call
gb_Executable_add_noexception_objects,$(sofficebin),\
desktop/win32/source/extendloaderenvironment \
))
-$(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin))
+$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin
+
+$(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin))
$(call gb_Executable_get_clean_target,$(sofficebin)) :
$(WORKDIR)/Clean/OutDir/bin/soffice.bin
$(OUTDIR)/bin/soffice.bin : $(call gb_LinkTarget_get_target,$(call
gb_Executable_get_linktargetname,$(sofficebin)))
$(call gb_Deliver_deliver,$<,$@)
@@ -79,6 +81,8 @@ $(WORKDIR)/Clean/OutDir/bin/soffice.bin :
rm -f $(OUTDIR)/bin/soffice.bin
ifeq ($(COM),MSC)
+$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
+
$(OUTDIR)/bin/soffice.bin.manifest : $(call
gb_Executable_get_target,$(sofficebin))
$(call gb_Executable_get_clean_target,$(sofficebin)) :
$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call
gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call
gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
