build: include manifests in .rc files

configure.ac

@@ -1173,6 +1173,7 @@ AC_CONFIG_FILES([
  src/common/Makefile
  src/ui/Makefile
  src/libopensc/Makefile
+ src/libopensc/libopensc.rc
  src/sm/Makefile
  src/pkcs11/Makefile
  src/pkcs11/versioninfo-pkcs11.rc
@@ -1181,6 +1182,7 @@ AC_CONFIG_FILES([
  src/pkcs15init/Makefile
  src/scconf/Makefile
  src/tests/Makefile
+ src/tests/tests.rc
  src/tests/regression/Makefile
  src/tests/p11test/Makefile
  src/tests/fuzzing/Makefile
@@ -1189,11 +1191,11 @@ AC_CONFIG_FILES([
  src/tools/versioninfo-tools.rc
  src/tools/versioninfo-opensc-notify.rc
  src/smm/Makefile
+ src/smm/smm-local.rc
  src/minidriver/Makefile
  src/minidriver/versioninfo-minidriver.rc
  src/minidriver/opensc-minidriver.inf
  win32/Makefile
- win32/versioninfo.rc
  win32/versioninfo-customactions.rc
  win32/winconfig.h
  win32/OpenSC.iss

src/libopensc/Makefile.am

@@ -74,7 +74,7 @@ libopensc_la_SOURCES = $(libopensc_la_SOURCES_BASE) \
 libopensc_static_la_SOURCES = $(libopensc_la_SOURCES_BASE)
 
 if WIN32
-libopensc_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
+libopensc_la_SOURCES += libopensc.rc
 endif
 libopensc_la_LIBADD = $(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) \
  $(OPTIONAL_OPENCT_LIBS) $(OPTIONAL_ZLIB_LIBS) \

src/libopensc/Makefile.mak

@@ -57,7 +57,6 @@ opensc.dll: $(OBJECTS) $(LIBS)
  echo EXPORTS >> $*.def
  type lib$*.exports >> $*.def
  link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib shlwapi.lib
- if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2
 
 opensc_a.lib: $(OBJECTS)
  lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS)

win32/versioninfo.rc.in → src/libopensc/libopensc.rc.in

@@ -36,3 +36,8 @@ BEGIN
  END
 END
 
+#ifndef __MINGW32__
+2 RT_MANIFEST "@abs_top_srcdir@\\src\\libopensc\\opensc.dll.manifest"
+#else
+2 RT_MANIFEST "@abs_top_srcdir@/src/libopensc/opensc.dll.manifest"
+#endif

src/minidriver/Makefile.mak

@@ -21,4 +21,3 @@ $(TARGET): $(OBJECTS) $(LIBS)
  echo EXPORTS >> $*.def
  type minidriver.exports >> $*.def
  link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib Comctl32.lib advapi32.lib Crypt32.lib User32.lib bcrypt.lib DelayImp.lib Rpcrt4.lib Shell32.lib Comctl32.lib Winmm.lib shlwapi.lib /DELAYLOAD:bcrypt.dll
- if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2

src/minidriver/versioninfo-minidriver.rc.in

@@ -5,9 +5,9 @@
 #define IDI_SMARTCARD 102
 
 #ifndef __MINGW32__
-IDI_SMARTCARD ICON "..\\..\\win32\\DDORes.dll_14_2302.ico"
+IDI_SMARTCARD ICON "@abs_top_srcdir@\\win32\\DDORes.dll_14_2302.ico"
 #else
-IDI_SMARTCARD ICON "../../win32/DDORes.dll_14_2302.ico"
+IDI_SMARTCARD ICON "@abs_top_srcdir@/win32/DDORes.dll_14_2302.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
@@ -45,3 +45,9 @@ BEGIN
  VALUE "Translation", 0x409, 1200
  END
 END
+
+#ifndef __MINGW32__
+2 RT_MANIFEST "@abs_top_srcdir@\\src\\minidriver\\opensc-minidriver.dll.manifest"
+#else
+2 RT_MANIFEST "@abs_top_srcdir@/src/minidriver/opensc-minidriver.dll.manifest"
+#endif

src/pkcs11/Makefile.mak

@@ -26,8 +26,6 @@ all: $(TARGET1) $(TARGET3)
 
 $(TARGET1): $(OBJECTS) $(LIBS)
  link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET1) $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib Shell32.lib Comctl32.lib shlwapi.lib
- if EXIST $(TARGET1).manifest mt -manifest $(TARGET1).manifest -outputresource:$(TARGET1);2
 
 $(TARGET3): $(OBJECTS3) $(LIBS3)
  link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET3) $(OBJECTS3) $(LIBS3) $(OPENSSL_LIB) gdi32.lib advapi32.lib shlwapi.lib
- if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2

src/pkcs11/versioninfo-pkcs11.rc.in

@@ -36,3 +36,8 @@ BEGIN
  END
 END
 
+#ifndef __MINGW32__
+2 RT_MANIFEST "@abs_top_srcdir@\\src\\pkcs11\\opensc-pkcs11.dll.manifest"
+#else
+2 RT_MANIFEST "@abs_top_srcdir@/src/pkcs11/opensc-pkcs11.dll.manifest"
+#endif

src/smm/Makefile.am

@@ -2,7 +2,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = Makefile.mak smm-local.dll.manifest
+EXTRA_DIST = Makefile.mak smm-local.rc.in smm-local.dll.manifest
 
 AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
@@ -20,6 +20,9 @@ libsmm_local_la_SOURCES = smm-local.c sm-module.h \
  sm-global-platform.c sm-cwa14890.c \
  sm-card-authentic.c sm-card-iasecc.c \
  smm-local.exports
+if WIN32
+libsmm_local_la_SOURCES += smm-local.rc
+endif
 libsmm_local_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS)
 libsmm_local_la_LDFLAGS = -module -shared -no-undefined -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
 

src/smm/Makefile.mak

@@ -25,7 +25,6 @@ $(TARGET): $(OBJECTS) $(LIBS)
  echo EXPORTS >> $*.def
  type $*.exports >> $*.def
  link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib advapi32.lib Crypt32.lib User32.lib Shell32.lib Comctl32.lib shlwapi.lib
- if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
 
 !ELSE
 $(TARGET):

src/smm/smm-local.rc.in

@@ -0,0 +1,43 @@
+#include <winresrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x21L
+#else
+ FILEFLAGS 0x20L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "@OPENSC_VS_FF_COMMENTS@"
+ VALUE "CompanyName", "@OPENSC_VS_FF_COMPANY_NAME@"
+ VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
+ VALUE "InternalName", "@PACKAGE_NAME@"
+ VALUE "LegalCopyright", "@OPENSC_VS_FF_LEGAL_COPYRIGHT@"
+ VALUE "LegalTrademarks", ""
+ VALUE "PrivateBuild", ""
+ VALUE "ProductName", "@OPENSC_VS_FF_PRODUCT_NAME@"
+ VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
+ VALUE "SpecialBuild", ""
+ VALUE "FileDescription", "OpenSC secure messaging module"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#ifndef __MINGW32__
+2 RT_MANIFEST "@abs_top_srcdir@\\src\\smm\\smm-local.dll.manifest"
+#else
+2 RT_MANIFEST "@abs_top_srcdir@/src/smm/smm-local.dll.manifest"
+#endif

src/tests/Makefile.am

@@ -1,7 +1,7 @@
 include $(top_srcdir)/win32/ltrc.inc
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-EXTRA_DIST = Makefile.mak
+EXTRA_DIST = Makefile.mak tests.rc.in tests.manifest
 
 SUBDIRS = regression p11test fuzzing unittests
 noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
@@ -23,9 +23,9 @@ pintest_SOURCES = pintest.c print.c $(COMMON_SRC) $(COMMON_INC)
 prngtest_SOURCES = prngtest.c $(COMMON_SRC) $(COMMON_INC)
 
 if WIN32
-base64_SOURCES += $(top_builddir)/win32/versioninfo.rc
-lottery_SOURCES += $(top_builddir)/win32/versioninfo.rc
-p15dump_SOURCES += $(top_builddir)/win32/versioninfo.rc
-pintest_SOURCES += $(top_builddir)/win32/versioninfo.rc
-prngtest_SOURCES += $(top_builddir)/win32/versioninfo.rc
+base64_SOURCES += tests.rc
+lottery_SOURCES += tests.rc
+p15dump_SOURCES += tests.rc
+pintest_SOURCES += tests.rc
+prngtest_SOURCES += tests.rc
 endif

src/tests/Makefile.mak

@@ -15,9 +15,7 @@ $(TARGETS): $(OBJECTS) $(LIBS)
 opensc-minidriver-test.exe:
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj bcrypt.lib ncrypt.lib crypt32.lib winscard.lib
- if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1
 
 .c.exe:
  cl $(COPTS) /c $<
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj $(OBJECTS) $(LIBS)
- if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1

src/tests/fuzzing/Makefile.am

@@ -55,3 +55,18 @@ fuzz_pkcs11_LDADD = \
  $(top_builddir)/src/common/libpkcs11.la \
  $(OPTIONAL_OPENSSL_LIBS) \
  $(top_builddir)/src/pkcs11/libopensc-pkcs11.la
+
+if WIN32
+fuzz_asn1_print_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_asn1_sig_value_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs15_decode_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs15_reader_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_scconf_parse_string_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs15init_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs15_encode_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_card_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_piv_tool_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs15_tool_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs15_crypt_SOURCES += $(top_builddir)/src/tests/tests.rc
+fuzz_pkcs11_SOURCES += $(top_builddir)/src/tests/tests.rc
+endif

src/tests/p11test/Makefile.am

@@ -38,5 +38,5 @@ p11test_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(CMOCKA_CFLAGS)
 p11test_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(CMOCKA_LIBS) $(LDL_LIBS)
 
 if WIN32
-p11test_SOURCES += $(top_builddir)/win32/versioninfo.rc
+p11test_SOURCES += $(top_builddir)/src/tests/tests.rc
 endif

src/tests/p11test/Makefile.mak

@@ -23,4 +23,3 @@ $(TARGETS): $(OBJECTS) $(LIBS)
 .c.exe:
  cl $(COPTS) /c $<
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj $(OBJECTS) $(LIBS)
- if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1

src/tests/tests.manifest

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+ </dependency>
+</assembly>

src/tests/tests.rc.in

@@ -0,0 +1,43 @@
+#include <winresrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x21L
+#else
+ FILEFLAGS 0x20L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "@OPENSC_VS_FF_COMMENTS@"
+ VALUE "CompanyName", "@OPENSC_VS_FF_COMPANY_NAME@"
+ VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
+ VALUE "InternalName", "@PACKAGE_NAME@"
+ VALUE "LegalCopyright", "@OPENSC_VS_FF_LEGAL_COPYRIGHT@"
+ VALUE "LegalTrademarks", ""
+ VALUE "PrivateBuild", ""
+ VALUE "ProductName", "@OPENSC_VS_FF_PRODUCT_NAME@"
+ VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
+ VALUE "SpecialBuild", ""
+ VALUE "FileDescription", "OpenSC test"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#ifndef __MINGW32__
+1 RT_MANIFEST "@abs_top_srcdir@\\src\\tests\\tests.manifest"
+#else
+1 RT_MANIFEST "@abs_top_srcdir@/src/tests/tests.manifest"
+#endif

src/tests/unittests/Makefile.am

@@ -38,14 +38,29 @@ pkcs15filter_SOURCES = pkcs15-emulator-filter.c
 openpgp_tool_SOURCES = openpgp-tool.c $(top_builddir)/src/tools/openpgp-tool-helpers.c
 hextobin_SOURCES = hextobin.c
 decode_ecdsa_signature_SOURCES = decode_ecdsa_signature.c
-check_macro_reference_loop = check_macro_reference_loop.c
-strip_pkcs1_2_padding = strip_pkcs1_2_padding.c
+check_macro_reference_loop_SOURCES = check_macro_reference_loop.c
+strip_pkcs1_2_padding_SOURCES = strip_pkcs1_2_padding.c
+
+if WIN32
+asn1_SOURCES += $(top_builddir)/src/tests/tests.rc
+simpletlv_SOURCES += $(top_builddir)/src/tests/tests.rc
+cachedir_SOURCES += $(top_builddir)/src/tests/tests.rc
+pkcs15filter_SOURCES += $(top_builddir)/src/tests/tests.rc
+openpgp_tool_SOURCES += $(top_builddir)/src/tests/tests.rc
+hextobin_SOURCES += $(top_builddir)/src/tests/tests.rc
+decode_ecdsa_signature_SOURCES += $(top_builddir)/src/tests/tests.rc
+check_macro_reference_loop_SOURCES += $(top_builddir)/src/tests/tests.rc
+strip_pkcs1_2_padding_SOURCES += $(top_builddir)/src/tests/tests.rc
+endif
 
 if ENABLE_ZLIB
 noinst_PROGRAMS += compression
 TESTS += compression
 
 compression_SOURCES = compression.c
+if WIN32
+compression_SOURCES += $(top_builddir)/src/tests/tests.rc
+endif
 compression_LDADD = $(LDADD) $(OPTIONAL_ZLIB_LIBS)
 endif
 
@@ -54,6 +69,9 @@ noinst_PROGRAMS += sm
 TESTS += sm
 
 sm_SOURCES = sm.c
+if WIN32
+sm_SOURCES += $(top_builddir)/src/tests/tests.rc
+endif
 sm_LDADD = $(top_builddir)/src/sm/libsm.la $(LDADD)
 endif
 

src/tests/unittests/Makefile.mak

@@ -18,4 +18,3 @@ $(TARGETS): $(OBJECTS) $(LIBS)
 .c.exe:
  cl $(COPTS) /c $<
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj $(OBJECTS) $(LIBS)
- if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1

src/tools/Makefile.mak

@@ -25,49 +25,39 @@ $(TARGETS): $(OBJECTS) $(LIBS)
 opensc-notify.exe: opensc-notify-cmdline.obj versioninfo-opensc-notify.res $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj opensc-notify-cmdline.obj versioninfo-opensc-notify.res $(LIBS) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 npa-tool.exe: npa-tool-cmdline.obj fread_to_eof.obj $(OBJECTS) $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj npa-tool-cmdline.obj fread_to_eof.obj $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 egk-tool.exe: egk-tool-cmdline.obj $(OBJECTS) $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj egk-tool-cmdline.obj $(OBJECTS) $(LIBS) $(ZLIB_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 goid-tool.exe: goid-tool-cmdline.obj fread_to_eof.obj $(OBJECTS) $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj goid-tool-cmdline.obj fread_to_eof.obj $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 opensc-asn1.exe: opensc-asn1-cmdline.obj fread_to_eof.obj versioninfo-tools.res $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj opensc-asn1-cmdline.obj fread_to_eof.obj versioninfo-tools.res $(LIBS) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 pkcs11-register.exe: pkcs11-register-cmdline.obj fread_to_eof.obj $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj pkcs11-register-cmdline.obj fread_to_eof.obj versioninfo-tools.res $(LIBS) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 pkcs15-tool.exe: pkcs15-tool.obj $(TOPDIR)\src\pkcs11\pkcs11-display.obj
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj $(TOPDIR)\src\pkcs11\pkcs11-display.obj $(OBJECTS) $(LIBS) $(OPENSSL_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 openpgp-tool.exe: openpgp-tool-helpers.obj $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj openpgp-tool-helpers.obj $(OBJECTS) $(LIBS) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 sc-hsm-tool.exe: sc-hsm-tool.obj fread_to_eof.obj $(OBJECTS) $(LIBS)
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj sc-hsm-tool.obj fread_to_eof.obj $(OBJECTS) $(LIBS) $(OPENSSL_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib
- mt -manifest exe.manifest -outputresource:$@;1
 
 .c.exe:
  cl $(COPTS) /c $<
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj $(OBJECTS) $(LIBS) $(OPENSSL_LIB) gdi32.lib shell32.lib User32.lib ws2_32.lib shlwapi.lib
- mt -manifest exe.manifest -outputresource:$@;1