[Libreoffice-commits] .: desktop/Package_manifest.mk desktop/util

Jan Holesovsky kendy at kemper.freedesktop.org
Tue Sep 20 05:44:07 PDT 2011


 desktop/Package_manifest.mk |    4 ++--
 desktop/util/Makefile       |   19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 0a5fe3833e03582896ff2db81018ef1dff3a30b8
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Sep 20 14:43:36 2011 +0200

    Fix manifest creation.

diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk
index a6a3a72..4c36f02 100644
--- a/desktop/Package_manifest.mk
+++ b/desktop/Package_manifest.mk
@@ -28,9 +28,9 @@ $(eval $(call gb_Package_Package,desktop_manifest,$(WORKDIR)/CustomTarget/deskto
 $(eval $(call gb_Package_add_customtarget,desktop_manifest,desktop/util,SRCDIR))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\
-    $(OUTDIR)/bin/soffice.exe \
+    $(OUTDIR)/bin/soffice.bin \
 ))
 
-$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.exe.manifest,soffice.exe.manifest))
+$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.bin.manifest,soffice.bin.manifest))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/util/Makefile b/desktop/util/Makefile
index 4dc649e..5e72a41 100644
--- a/desktop/util/Makefile
+++ b/desktop/util/Makefile
@@ -23,18 +23,25 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-include $(GBUILDDIR)/gbuild_simple.mk
-
 DESTDIR := $(WORKDIR)/CustomTarget/desktop/util
 
-$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.exe
+ifeq ($(COM),MSC)
+
+$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.bin
 	mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@
 
-$(DESTDIR)/soffice.exe.manifest : $(DESTDIR)/linker.manifest template.manifest
-	mkdir -p $(DESTDIR) && mt.exe -manifest $^ -out:$@
+$(OUTDIR)/bin/soffice.bin.manifest : $(DESTDIR)/linker.manifest $(SRCDIR)/desktop/util/template.manifest
+	mkdir -p $(OUTDIR)/bin && mt.exe -manifest $^ -out:$@
+
+else
+
+$(OUTDIR)/bin/soffice.bin.manifest : $(SRCDIR)/desktop/util/template.manifest
+	mkdir -p $(OUTDIR)/bin && cp $^ $@
+
+endif
 
 .DEFAULT_TARGET := all
 .PHONY : all
-all : $(DESTDIR)/soffice.exe.manifest
+all : $(OUTDIR)/bin/soffice.bin.manifest
 
 # vim: set ts=4 sw=4 noet:


More information about the Libreoffice-commits mailing list