diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-22 15:35:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-22 15:35:11 +0300 |
| commit | 8a915ad95fcc1e21f57c7a397fb12a96abc799e6 (patch) | |
| tree | b2e37f9117632aebd7347ed1ba2425dc910a9cd2 /desktop/util | |
| parent | 69bd187a848e98784fd620f07844abc36071c90d (diff) | |
Simplify the manifest dance
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/Makefile | 47 | ||||
| -rwxr-xr-x | desktop/util/template.manifest | 10 |
2 files changed, 0 insertions, 57 deletions
diff --git a/desktop/util/Makefile b/desktop/util/Makefile deleted file mode 100644 index 7c5e9f63f0e1..000000000000 --- a/desktop/util/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -DESTDIR := $(WORKDIR)/CustomTarget/desktop/util - -ifeq ($(COM),MSC) - -$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice_bin.exe - mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -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 : $(OUTDIR)/bin/soffice.bin.manifest - -# vim: set ts=4 sw=4 noet: diff --git a/desktop/util/template.manifest b/desktop/util/template.manifest deleted file mode 100755 index d3bd0c101f2f..000000000000 --- a/desktop/util/template.manifest +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="LibreOffice" type="win32" /> -<description>http://www.documentfoundation.org</description> -<dependency> -<dependentAssembly> -<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="x86"/> -</dependentAssembly> -</dependency> -</assembly> |