diff --git a/agent/Makefile.am b/agent/Makefile.am
index 4da1ea9d8..b2a32b1fd 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -1,3 +1,4 @@
+# Makefile.am - agent
# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
@@ -23,8 +24,8 @@ libexec_PROGRAMS = gpg-protect-tool
libexec_PROGRAMS += gpg-preset-passphrase
noinst_PROGRAMS = $(TESTS)
-EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
-
+EXTRA_DIST = ChangeLog-2011 all-tests.scm \
+ gpg-agent-w32info.rc gpg-agent.w32-manifest.in
AM_CPPFLAGS =
@@ -32,6 +33,8 @@ include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
resource_objs += gpg-agent-w32info.o
+
+gpg-agent-w32info.o : gpg-agent.w32-manifest ../common/w32info-rc.h
endif
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
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..87f09aa49
--- /dev/null
+++ b/agent/gpg-agent.w32-manifest.in
@@ -0,0 +1,24 @@
+
+
+GNU Privacy Guard (Private Key Daemon)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/configure.ac b/configure.ac
index 39cf5cbe0..fe7e82108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2102,6 +2102,14 @@ tests/tpm2dtests/Makefile
tests/gpgme/Makefile
tests/pkits/Makefile
g10/gpg.w32-manifest
+g10/gpgv.w32-manifest
+sm/gpgsm.w32-manifest
+kbx/keyboxd.w32-manifest
+agent/gpg-agent.w32-manifest
+scd/scdaemon.w32-manifest
+dirmngr/dirmngr.w32-manifest
+dirmngr/dirmngr_ldap.w32-manifest
+dirmngr/dirmngr-client.w32-manifest
tools/gpg-connect-agent.w32-manifest
tools/gpgconf.w32-manifest
tools/gpgtar.w32-manifest
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index feee2f5c8..3846fdf35 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -21,7 +21,14 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem
+EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem \
+ dirmngr-w32info.rc dirmngr.w32-manifest.in \
+ dirmngr_ldap-w32info.rc dirmngr_ldap.w32-manifest.in \
+ dirmngr-client-w32info.rc dirmngr-client.w32-manifest.in
+
+
+
+
dist_pkgdata_DATA = sks-keyservers.netCA.pem
bin_PROGRAMS = dirmngr dirmngr-client
@@ -43,6 +50,16 @@ AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
+if HAVE_W32_SYSTEM
+dirmngr_rc_objs = dirmngr-w32info.o
+dirmngr_ldap_rc_objs = dirmngr_ldap-w32info.o
+dirmngr_client_rc_objs = dirmngr-client-w32info.o
+
+dirmngr-w32info.o : dirmngr.w32-manifest ../common/w32info-rc.h
+dirmngr_ldap-w32info.o : dirmngr_ldap.w32-manifest ../common/w32info-rc.h
+dirmngr-client-w32info.o : dirmngr-client.w32-manifest ../common/w32info-rc.h
+endif
+
AM_CFLAGS = $(USE_C99_CFLAGS) \
$(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) \
$(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS) \
@@ -89,12 +106,13 @@ dirmngr_LDADD = $(libcommonpth) \
$(DNSLIBS) $(LIBASSUAN_LIBS) \
$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
- $(NETLIBS)
+ $(NETLIBS) $(dirmngr_rc_objs)
if USE_LDAP
dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
endif
dirmngr_LDFLAGS =
+dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)
if USE_LDAP
dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
@@ -102,14 +120,18 @@ dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
dirmngr_ldap_LDFLAGS =
dirmngr_ldap_LDADD = $(libcommon) \
$(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
- $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+ $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
+ $(dirmngr_ldap_rc_objs)
+dirmngr_ldap_DEPENDENCIES = $(dirmngr_ldap_rc_objs)
endif
dirmngr_client_SOURCES = dirmngr-client.c
dirmngr_client_LDADD = $(libcommon) \
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
- $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
+ $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) \
+ $(dirmngr_client_rc_objs)
dirmngr_client_LDFLAGS =
+dirmngr_client_DEPENDENCIES = $(dirmngr_client_rc_objs)
t_common_src = t-support.h t-support.c
diff --git a/dirmngr/dirmngr-client-w32info.rc b/dirmngr/dirmngr-client-w32info.rc
new file mode 100644
index 000000000..020447bca
--- /dev/null
+++ b/dirmngr/dirmngr-client-w32info.rc
@@ -0,0 +1,52 @@
+/* dirmngr-client-w32info.rc -*- c -*-
+ * Copyright (C) 2023 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+ FILEVERSION W32INFO_VI_FILEVERSION
+ PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
+#else
+ FILEFLAGS 0x00L
+#endif
+ FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
+ FILETYPE 0x1L /* VFT_APP (0x1) */
+ FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
+ BEGIN
+ VALUE "FileDescription", L"GnuPG\x2019s dirmngr client\0"
+ VALUE "InternalName", "dirmngr-client\0"
+ VALUE "OriginalFilename", "dirmngr-client.exe\0"
+ VALUE "ProductName", W32INFO_PRODUCTNAME
+ VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+ VALUE "CompanyName", W32INFO_COMPANYNAME
+ VALUE "FileVersion", W32INFO_FILEVERSION
+ VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+ VALUE "Comments", W32INFO_COMMENTS
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 0x4b0
+ END
+ END
+
+1 RT_MANIFEST "dirmngr-client.w32-manifest"
diff --git a/dirmngr/dirmngr-client.w32-manifest.in b/dirmngr/dirmngr-client.w32-manifest.in
new file mode 100644
index 000000000..1d46d19ff
--- /dev/null
+++ b/dirmngr/dirmngr-client.w32-manifest.in
@@ -0,0 +1,25 @@
+
+
+GNU Privacy Guard (Dirmngr Client)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dirmngr/dirmngr-w32info.rc b/dirmngr/dirmngr-w32info.rc
new file mode 100644
index 000000000..cc1475b8e
--- /dev/null
+++ b/dirmngr/dirmngr-w32info.rc
@@ -0,0 +1,52 @@
+/* dirmngr-w32info.rc -*- c -*-
+ * Copyright (C) 2023 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+ FILEVERSION W32INFO_VI_FILEVERSION
+ PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
+#else
+ FILEFLAGS 0x00L
+#endif
+ FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
+ FILETYPE 0x1L /* VFT_APP (0x1) */
+ FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
+ BEGIN
+ VALUE "FileDescription", L"GnuPG\x2019s network access daemon\0"
+ VALUE "InternalName", "dirmngr\0"
+ VALUE "OriginalFilename", "dirmngr.exe\0"
+ VALUE "ProductName", W32INFO_PRODUCTNAME
+ VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+ VALUE "CompanyName", W32INFO_COMPANYNAME
+ VALUE "FileVersion", W32INFO_FILEVERSION
+ VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+ VALUE "Comments", W32INFO_COMMENTS
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 0x4b0
+ END
+ END
+
+1 RT_MANIFEST "dirmngr.w32-manifest"
diff --git a/dirmngr/dirmngr.w32-manifest.in b/dirmngr/dirmngr.w32-manifest.in
new file mode 100644
index 000000000..115548b5c
--- /dev/null
+++ b/dirmngr/dirmngr.w32-manifest.in
@@ -0,0 +1,25 @@
+
+
+GNU Privacy Guard (Archive tool)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dirmngr/dirmngr_ldap-w32info.rc b/dirmngr/dirmngr_ldap-w32info.rc
new file mode 100644
index 000000000..779d85837
--- /dev/null
+++ b/dirmngr/dirmngr_ldap-w32info.rc
@@ -0,0 +1,52 @@
+/* dirmngr_ldap-w32info.rc -*- c -*-
+ * Copyright (C) 2023 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+ FILEVERSION W32INFO_VI_FILEVERSION
+ PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
+#else
+ FILEFLAGS 0x00L
+#endif
+ FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
+ FILETYPE 0x1L /* VFT_APP (0x1) */
+ FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
+ BEGIN
+ VALUE "FileDescription", L"GnuPG\x2019s LDAP helper\0"
+ VALUE "InternalName", "dirmngr_ldap\0"
+ VALUE "OriginalFilename", "dirmngr_ldap.exe\0"
+ VALUE "ProductName", W32INFO_PRODUCTNAME
+ VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+ VALUE "CompanyName", W32INFO_COMPANYNAME
+ VALUE "FileVersion", W32INFO_FILEVERSION
+ VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+ VALUE "Comments", W32INFO_COMMENTS
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 0x4b0
+ END
+ END
+
+1 RT_MANIFEST "dirmngr_ldap.w32-manifest"
diff --git a/dirmngr/dirmngr_ldap.w32-manifest.in b/dirmngr/dirmngr_ldap.w32-manifest.in
new file mode 100644
index 000000000..67db0841c
--- /dev/null
+++ b/dirmngr/dirmngr_ldap.w32-manifest.in
@@ -0,0 +1,25 @@
+
+
+GNU Privacy Guard (LDAP Helper)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 80b5b8919..c5691f551 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -1,3 +1,4 @@
+# Makefile.am - g10
# Copyright (C) 1998, 1999, 2000, 2001, 2002,
# 2003, 2006, 2010 Free Software Foundation, Inc.
#
@@ -19,8 +20,9 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = distsigkey.gpg \
- ChangeLog-2011 gpg-w32info.rc \
- gpg.w32-manifest.in test.c t-keydb-keyring.kbx \
+ gpg-w32info.rc gpg.w32-manifest.in \
+ gpgv-w32info.rc gpgv.w32-manifest.in \
+ ChangeLog-2011 test.c t-keydb-keyring.kbx \
t-keydb-get-keyblock.gpg t-stutter-data.asc \
all-tests.scm
@@ -83,10 +85,11 @@ endif
if HAVE_W32_SYSTEM
-resource_objs += gpg-w32info.o
-
-gpg-w32info.o : gpg.w32-manifest
+gpg_rc_objs = gpg-w32info.o
+gpgv_rc_objs = gpgv-w32info.o
+gpg-w32info.o : gpg.w32-manifest ../common/w32info-rc.h
+gpgv-w32info.o : gpgv.w32-manifest ../common/w32info-rc.h
endif
common_source = \
@@ -171,11 +174,11 @@ LDADD = $(needed_libs) ../common/libgpgrl.a \
$(ZLIBS) $(LIBINTL) $(CAPLIBS)
gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
$(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
- $(LIBICONV) $(resource_objs)
+ $(LIBICONV) $(gpg_rc_objs)
gpg_LDFLAGS =
gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
$(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
- $(LIBICONV) $(resource_objs)
+ $(LIBICONV) $(gpgv_rc_objs)
gpgv_LDFLAGS =
diff --git a/g10/gpg.w32-manifest.in b/g10/gpg.w32-manifest.in
index 8c98dc5a7..bf7723925 100644
--- a/g10/gpg.w32-manifest.in
+++ b/g10/gpg.w32-manifest.in
@@ -14,4 +14,11 @@
+
+
+
+
+
+
+
diff --git a/g10/gpgv-w32info.rc b/g10/gpgv-w32info.rc
new file mode 100644
index 000000000..a6c1b6cd3
--- /dev/null
+++ b/g10/gpgv-w32info.rc
@@ -0,0 +1,52 @@
+/* gpgv-w32info.rc -*- c -*-
+ * Copyright (C) 2013 g10 Code GmbH
+ *
+ * This file is free software; as a special exception the author gives
+ * unlimited permission to copy and/or distribute it, with or without
+ * modifications, as long as this notice is preserved.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#include "afxres.h"
+#include "../common/w32info-rc.h"
+
+1 ICON "../common/gnupg.ico"
+
+1 VERSIONINFO
+ FILEVERSION W32INFO_VI_FILEVERSION
+ PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
+#else
+ FILEFLAGS 0x00L
+#endif
+ FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
+ FILETYPE 0x1L /* VFT_APP (0x1) */
+ FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
+ BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
+ BEGIN
+ VALUE "FileDescription", L"GnuPG\x2019s OpenPGP verify tool\0"
+ VALUE "InternalName", "gpgv\0"
+ VALUE "OriginalFilename", "gpgv.exe\0"
+ VALUE "ProductName", W32INFO_PRODUCTNAME
+ VALUE "ProductVersion", W32INFO_PRODUCTVERSION
+ VALUE "CompanyName", W32INFO_COMPANYNAME
+ VALUE "FileVersion", W32INFO_FILEVERSION
+ VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
+ VALUE "Comments", W32INFO_COMMENTS
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 0x4b0
+ END
+ END
+
+1 RT_MANIFEST "gpgv.w32-manifest"
diff --git a/g10/gpgv.w32-manifest.in b/g10/gpgv.w32-manifest.in
new file mode 100644
index 000000000..794ab15c3
--- /dev/null
+++ b/g10/gpgv.w32-manifest.in
@@ -0,0 +1,24 @@
+
+
+GNU Privacy Guard (OpenPGP verify tool)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 66214fa5c..19bdb1061 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -18,13 +18,16 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = mkerrors keyboxd-w32info.rc
+EXTRA_DIST = mkerrors keyboxd-w32info.rc keyboxd.w32-manifest.in
AM_CPPFLAGS =
include $(top_srcdir)/am/cmacros.am
+
if HAVE_W32_SYSTEM
resource_objs += keyboxd-w32info.o
+
+keyboxd-w32info.o : keyboxd.w32-manifest ../common/w32info-rc.h
endif
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
diff --git a/kbx/keyboxd-w32info.rc b/kbx/keyboxd-w32info.rc
index 421747499..c38d9f366 100644
--- a/kbx/keyboxd-w32info.rc
+++ b/kbx/keyboxd-w32info.rc
@@ -48,3 +48,5 @@
VALUE "Translation", 0x409, 0x4b0
END
END
+
+1 RT_MANIFEST "keyboxd.w32-manifest"
diff --git a/kbx/keyboxd.w32-manifest.in b/kbx/keyboxd.w32-manifest.in
new file mode 100644
index 000000000..f2e50fb4b
--- /dev/null
+++ b/kbx/keyboxd.w32-manifest.in
@@ -0,0 +1,24 @@
+
+
+GNU Privacy Guard (Public Key Daemon)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 0cc50dca8..8cbcd6e05 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -1,3 +1,4 @@
+# Makefile.am - scd
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
@@ -17,7 +18,8 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc
+EXTRA_DIST = ChangeLog-2011 \
+ scdaemon-w32info.rc scdaemon.w32-manifest.in
libexec_PROGRAMS = scdaemon
@@ -27,6 +29,7 @@ include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
resource_objs += scdaemon-w32info.o
+scdaemon-w32info.o : scdaemon.w32-manifest ../common/w32info-rc.h
endif
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
@@ -50,3 +53,5 @@ scdaemon_LDADD = $(libcommonpth) \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
$(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs)
+
+scdaemon_DEPENDENCIES = $(resource_objs)
diff --git a/scd/scdaemon-w32info.rc b/scd/scdaemon-w32info.rc
index aa0eba4e5..c1dae5421 100644
--- a/scd/scdaemon-w32info.rc
+++ b/scd/scdaemon-w32info.rc
@@ -48,3 +48,5 @@
VALUE "Translation", 0x409, 0x4b0
END
END
+
+1 RT_MANIFEST "scdaemon.w32-manifest"
diff --git a/scd/scdaemon.w32-manifest.in b/scd/scdaemon.w32-manifest.in
new file mode 100644
index 000000000..aa0ccb206
--- /dev/null
+++ b/scd/scdaemon.w32-manifest.in
@@ -0,0 +1,24 @@
+
+
+GNU Privacy Guard (Smartcard Daemon)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sm/Makefile.am b/sm/Makefile.am
index cfcc36c63..03de7026a 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -17,7 +17,8 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc
+EXTRA_DIST = ChangeLog-2011 \
+ gpgsm-w32info.rc gpgsm.w32-manifest.in
bin_PROGRAMS = gpgsm
noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
@@ -36,6 +37,7 @@ include $(top_srcdir)/am/cmacros.am
if HAVE_W32_SYSTEM
resource_objs += gpgsm-w32info.o
+gpgsm-w32info.o : gpgsm.w32-manifest ../common/w32info-rc.h
endif
gpgsm_SOURCES = \
@@ -72,6 +74,7 @@ gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
$(NPTH_LIBS) $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
$(LIBICONV) $(resource_objs) $(NETLIBS)
gpgsm_LDFLAGS =
+gpgsm_DEPENDENCIES = $(resource_objs)
module_tests =
diff --git a/sm/gpgsm-w32info.rc b/sm/gpgsm-w32info.rc
index d813b0dc8..537afdbc7 100644
--- a/sm/gpgsm-w32info.rc
+++ b/sm/gpgsm-w32info.rc
@@ -48,3 +48,5 @@
VALUE "Translation", 0x409, 0x4b0
END
END
+
+1 RT_MANIFEST "gpgsm.w32-manifest"
diff --git a/sm/gpgsm.w32-manifest.in b/sm/gpgsm.w32-manifest.in
new file mode 100644
index 000000000..7764be394
--- /dev/null
+++ b/sm/gpgsm.w32-manifest.in
@@ -0,0 +1,24 @@
+
+
+GNU Privacy Guard (X.509/CMS Tool)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 39374e42a..769a81a00 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -38,12 +38,17 @@ gpg_card_rc_objs = gpg-card-w32info.o
gpgtar_rc_objs = gpgtar-w32info.o
gpg_check_pattern_rc_objs = gpg-check-pattern-w32info.o
gpg_wks_client_rc_objs = gpg-wks-client-w32info.o
-resource_objs += $(gpg_connect_agent_rc_objs)
-resource_objs += $(gpgconf_rc_objs)
-resource_objs += $(gpg_card_tool_rc_objs)
-resource_objs += $(gpgtar_rc_objs)
-resource_objs += $(gpg_check_pattern_rc_objs)
-resource_objs += $(gpg_wks_client_rc_objs)
+
+gpg-connect-agent-w32info.o : gpg-connect-agent.w32-manifest \
+ ../common/w32info-rc.h
+gpgconf-w32info.o : gpgconf.w32-manifest ../common/w32info-rc.h
+gpg-card-w32info.o : gpg-card.w32-manifest ../common/w32info-rc.h
+gpgtar-w32info.o : gpgtar.w32-manifest ../common/w32info-rc.h
+gpg-check-pattern-w32info.o : gpg-check-pattern.w32-manifest \
+ ../common/w32info-rc.h
+gpg-wks-client-w32info.o : gpg-wks-client.w32-manifest \
+ ../common/w32info-rc.h
+
endif
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
diff --git a/tools/gpg-card.w32-manifest.in b/tools/gpg-card.w32-manifest.in
index ab853f810..4630fce3e 100644
--- a/tools/gpg-card.w32-manifest.in
+++ b/tools/gpg-card.w32-manifest.in
@@ -15,4 +15,11 @@
+
+
+
+
+
+
+
diff --git a/tools/gpg-check-pattern.w32-manifest.in b/tools/gpg-check-pattern.w32-manifest.in
index 2a5f8ec72..acb7c914a 100644
--- a/tools/gpg-check-pattern.w32-manifest.in
+++ b/tools/gpg-check-pattern.w32-manifest.in
@@ -15,4 +15,11 @@
+
+
+
+
+
+
+
diff --git a/tools/gpg-connect-agent.w32-manifest.in b/tools/gpg-connect-agent.w32-manifest.in
index aba542052..c222a6794 100644
--- a/tools/gpg-connect-agent.w32-manifest.in
+++ b/tools/gpg-connect-agent.w32-manifest.in
@@ -15,4 +15,11 @@
+
+
+
+
+
+
+
diff --git a/tools/gpg-wks-client.w32-manifest.in b/tools/gpg-wks-client.w32-manifest.in
index ba2508e5f..c44620f0e 100644
--- a/tools/gpg-wks-client.w32-manifest.in
+++ b/tools/gpg-wks-client.w32-manifest.in
@@ -15,4 +15,11 @@
+
+
+
+
+
+
+
diff --git a/tools/gpgconf.w32-manifest.in b/tools/gpgconf.w32-manifest.in
index d7a1b01ec..ab5f17d04 100644
--- a/tools/gpgconf.w32-manifest.in
+++ b/tools/gpgconf.w32-manifest.in
@@ -15,4 +15,11 @@
+
+
+
+
+
+
+
diff --git a/tools/gpgtar.w32-manifest.in b/tools/gpgtar.w32-manifest.in
index 62d5937fa..b949a6baa 100644
--- a/tools/gpgtar.w32-manifest.in
+++ b/tools/gpgtar.w32-manifest.in
@@ -15,4 +15,11 @@
+
+
+
+
+
+
+