aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/Makefile.am13
-rw-r--r--agent/gpg-agent-w32info.rc2
-rw-r--r--agent/gpg-agent.w32-manifest.in18
3 files changed, 29 insertions, 4 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 11d542770..f0ba964ec 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -25,7 +25,9 @@ libexec_PROGRAMS += gpg-preset-passphrase
endif
noinst_PROGRAMS = $(TESTS)
-EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
+EXTRA_DIST = ChangeLog-2011 \
+ gpg-agent-w32info.rc gpg-agent.w32-manifest.in \
+ all-tests.scm
AM_CPPFLAGS =
@@ -33,7 +35,10 @@ AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
-resource_objs += gpg-agent-w32info.o
+gpg_agent_robjs = $(resource_objs) gpg-agent-w32info.o
+gpg-agent-w32info.o : gpg-agent.w32-manifest
+else
+gpg_agent_robjs =
endif
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
@@ -69,9 +74,9 @@ gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \
gpg_agent_LDADD = $(commonpth_libs) \
$(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
- $(resource_objs)
+ $(gpg_agent_robjs)
gpg_agent_LDFLAGS = $(extra_bin_ldflags)
-gpg_agent_DEPENDENCIES = $(resource_objs)
+gpg_agent_DEPENDENCIES = $(gpg_agent_robjs)
gpg_protect_tool_SOURCES = \
protect-tool.c \
diff --git a/agent/gpg-agent-w32info.rc b/agent/gpg-agent-w32info.rc
index d586cad0c..a0311b2cd 100644
--- a/agent/gpg-agent-w32info.rc
+++ b/agent/gpg-agent-w32info.rc
@@ -48,3 +48,5 @@
VALUE "Translation", 0x409, 0x4b0
END
END
+
+1 RT_MANIFEST "gpg-agent.w32-manifest"
diff --git a/agent/gpg-agent.w32-manifest.in b/agent/gpg-agent.w32-manifest.in
new file mode 100644
index 000000000..d865aef1a
--- /dev/null
+++ b/agent/gpg-agent.w32-manifest.in
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<description>GNU Privacy Guard (Private key daemon)</description>
+<assemblyIdentity
+ type="win32"
+ name="GnuPG.gpg-agent"
+ version="@BUILD_VERSION@"
+ />
+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
+ </application>
+</compatibility>
+</assembly>