diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 11:37:25 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 11:38:28 +0000 |
| commit | cfa5d651db4de43dd395256264bc9121897398ba (patch) | |
| tree | 266045a52b54ee45eecddb1b9b9f9636ec849a5d /desktop | |
| parent | 41ae924469c9ec1ad76da8077014ca6598f4bd98 (diff) | |
add soffice.bin generation to the desktop/ module rule to fix win32
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice.bin.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index aafbcacd7359..b32a4441250d 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))) |