diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-04 11:54:21 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-04 11:56:12 +0000 |
| commit | e4bc48f37f086ce5658cecfabb9af082f19c5b01 (patch) | |
| tree | 2ab50abe63054114b0a907d8f90d6c1f752d3651 /desktop | |
| parent | e335eb1438ed99260a5ca050548b2693b5b22b1c (diff) | |
fix Win32 manifest linking: get dependencies the right way around
the .bin depends on the _bin.exe and not vv.
also -f is required for rm in phony clean rules
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice.bin.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 3953b26508b6..aafbcacd7359 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -69,24 +69,24 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\ desktop/win32/source/extendloaderenvironment \ )) -$(call gb_Executable_get_target,$(sofficebin)) : $(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,$<,$@) .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin $(WORKDIR)/Clean/OutDir/bin/soffice.bin : - rm $(OUTDIR)/bin/soffice.bin + rm -f $(OUTDIR)/bin/soffice.bin ifeq ($(COM),MSC) -$(call gb_Executable_get_target,$(sofficebin)) : $(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))) $(call gb_Deliver_deliver,$<,$@) - + .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest : - rm $(OUTDIR)/bin/soffice.bin.manifest + rm -f $(OUTDIR)/bin/soffice.bin.manifest endif |