revert delivery of soffice.bin.manifest

Okay, I give up. This obviously still does not work on Windows, but it
does on MinGW when I try to simulate it.

Change-Id: I9f2d7114df0498d5cc3a71431aacc7e49a5a78fd

desktop/Executable_soffice_bin.mk

@@ -55,6 +55,21 @@ $(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_linktargetname,soffice_bin))
+	$(call gb_Deliver_deliver,$<.manifest,$@)
+
+.PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
+$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
+	rm -f $(OUTDIR)/bin/soffice.bin.manifest
+
 endif
 
 $(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/src))

desktop/Package_soffice_bin.mk

@@ -29,10 +29,4 @@ $(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR)))
 
 $(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin,soffice_bin$(gb_Executable_EXT)))
 
-ifeq ($(COM),MSC)
-$(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin.manifest,soffice_bin$(gb_Executable_EXT).manifest))
-endif
-
-$(call gb_Package_get_preparation_target,desktop_soffice_bin) :| $(call gb_Executable_get_target,soffice_bin)
-
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

solenv/gbuild/LinkTarget.mk

@@ -1042,7 +1042,6 @@ $$(call gb_Output_error,\
 endef
 
 define gb_LinkTarget_add_auxtargets
-$(2) :| $(call gb_LinkTarget_get_target,$(1))
 $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2)
 
 endef