summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-31 11:54:13 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-31 11:56:47 +0100
commit26bddf3e80865d847f52e649ab60f97269177a3e (patch)
treedfd5e2a98813352ec65d290135e563aa6329b24f /desktop
parentcad751d28c356ef302f8eeb0d112a8a0e16dedbc (diff)
desktop: stop packaging soffice.bin.manifest
It was introduced to get newer File Picker dialogs (i#70927) but the special manifest file for that was not actually used for years; LO 3.5 already includes a generic manifest file that is like any other and probably has zero benefit over the manfiest that is embedded in the soffice.bin binary anyway. Change-Id: I0f41f10ecf26201043a8c9964cdfef95bc348eb8
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Executable_soffice.bin.mk15
1 files changed, 0 insertions, 15 deletions
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 90b56fdfa3ed..cc66af5ba471 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -51,21 +51,6 @@ $(eval $(call gb_Executable_add_ldflags,soffice_bin,\
/STACK:10000000 \
))
-# HACK: Copy manifest to $(OUTDIR)/bin under the right name. The
-# executable is copied in Package_soffice_bin, but that does not work
-# for the manifest, for some reason...
-$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
-
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,soffice_bin)
-$(call gb_Executable_get_clean_target,soffice_bin) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktarget,soffice_bin))
- $(call gb_Deliver_deliver,$(call gb_LinkTarget_get_manifestfile,$(call gb_LinkTarget__get_workdir_linktargetname,$(call gb_Executable_get_linktarget,soffice_bin))),$@)
-
-.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
- rm -f $(OUTDIR)/bin/soffice.bin.manifest
-
endif
endif