From 8152af37020df5de43fc599e29592d619ac2f724 Mon Sep 17 00:00:00 2001 From: Vladimir Stoiakin Date: Thu, 6 Jun 2024 12:08:31 +0300 Subject: [PATCH] build: include manifests in .rc files --- configure.ac | 4 +- src/libopensc/Makefile.am | 2 +- src/libopensc/Makefile.mak | 1 - .../libopensc/libopensc.rc.in | 5 +++ src/minidriver/Makefile.mak | 1 - src/minidriver/versioninfo-minidriver.rc.in | 10 ++++- src/pkcs11/Makefile.mak | 2 - src/pkcs11/versioninfo-pkcs11.rc.in | 5 +++ src/smm/Makefile.am | 5 ++- src/smm/Makefile.mak | 1 - src/smm/smm-local.rc.in | 43 +++++++++++++++++++ src/tests/Makefile.am | 12 +++--- src/tests/Makefile.mak | 2 - src/tests/fuzzing/Makefile.am | 15 +++++++ src/tests/p11test/Makefile.am | 2 +- src/tests/p11test/Makefile.mak | 1 - src/tests/tests.manifest | 15 +++++++ src/tests/tests.rc.in | 43 +++++++++++++++++++ src/tests/unittests/Makefile.am | 22 +++++++++- src/tests/unittests/Makefile.mak | 1 - src/tools/Makefile.mak | 10 ----- src/tools/versioninfo-opensc-notify.rc.in | 10 ++++- src/tools/versioninfo-tools.rc.in | 6 +++ win32/Makefile.am | 2 +- 24 files changed, 184 insertions(+), 36 deletions(-) rename win32/versioninfo.rc.in => src/libopensc/libopensc.rc.in (87%) create mode 100644 src/smm/smm-local.rc.in create mode 100644 src/tests/tests.manifest create mode 100644 src/tests/tests.rc.in diff --git a/configure.ac b/configure.ac index b8224b5de7..078b24883f 100644 --- a/configure.ac +++ b/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 diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index ffce861b2c..5bf0fa8f62 100644 --- a/src/libopensc/Makefile.am +++ b/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) \ diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak index 588c013287..74fd266a59 100644 --- a/src/libopensc/Makefile.mak +++ b/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) diff --git a/win32/versioninfo.rc.in b/src/libopensc/libopensc.rc.in similarity index 87% rename from win32/versioninfo.rc.in rename to src/libopensc/libopensc.rc.in index 23cf3ed49f..8c4d677ebb 100644 --- a/win32/versioninfo.rc.in +++ b/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 diff --git a/src/minidriver/Makefile.mak b/src/minidriver/Makefile.mak index abde6e20ea..7be2078b4d 100644 --- a/src/minidriver/Makefile.mak +++ b/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 diff --git a/src/minidriver/versioninfo-minidriver.rc.in b/src/minidriver/versioninfo-minidriver.rc.in index 4844a14b00..2795da8e6d 100644 --- a/src/minidriver/versioninfo-minidriver.rc.in +++ b/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 diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak index bbcd856c01..f1b39690e3 100644 --- a/src/pkcs11/Makefile.mak +++ b/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 diff --git a/src/pkcs11/versioninfo-pkcs11.rc.in b/src/pkcs11/versioninfo-pkcs11.rc.in index e8bc91d3be..7acaf8be9b 100644 --- a/src/pkcs11/versioninfo-pkcs11.rc.in +++ b/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 diff --git a/src/smm/Makefile.am b/src/smm/Makefile.am index 097f045f28..0590a8516b 100644 --- a/src/smm/Makefile.am +++ b/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@ diff --git a/src/smm/Makefile.mak b/src/smm/Makefile.mak index b8cc25319c..c9ba98752e 100644 --- a/src/smm/Makefile.mak +++ b/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): diff --git a/src/smm/smm-local.rc.in b/src/smm/smm-local.rc.in new file mode 100644 index 0000000000..94f367c49d --- /dev/null +++ b/src/smm/smm-local.rc.in @@ -0,0 +1,43 @@ +#include + +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 diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index cd5573068a..42c5f49382 100644 --- a/src/tests/Makefile.am +++ b/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 diff --git a/src/tests/Makefile.mak b/src/tests/Makefile.mak index 49ac651f74..cb78d3ffef 100644 --- a/src/tests/Makefile.mak +++ b/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 diff --git a/src/tests/fuzzing/Makefile.am b/src/tests/fuzzing/Makefile.am index 6b53b6343e..12e07574ec 100644 --- a/src/tests/fuzzing/Makefile.am +++ b/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 diff --git a/src/tests/p11test/Makefile.am b/src/tests/p11test/Makefile.am index f5300b22df..454e70e5a8 100644 --- a/src/tests/p11test/Makefile.am +++ b/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 diff --git a/src/tests/p11test/Makefile.mak b/src/tests/p11test/Makefile.mak index 197830137a..64c0999c09 100644 --- a/src/tests/p11test/Makefile.mak +++ b/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 diff --git a/src/tests/tests.manifest b/src/tests/tests.manifest new file mode 100644 index 0000000000..029b353778 --- /dev/null +++ b/src/tests/tests.manifest @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/src/tests/tests.rc.in b/src/tests/tests.rc.in new file mode 100644 index 0000000000..c71a5617d2 --- /dev/null +++ b/src/tests/tests.rc.in @@ -0,0 +1,43 @@ +#include + +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 diff --git a/src/tests/unittests/Makefile.am b/src/tests/unittests/Makefile.am index 4c73911e48..fdfd872b6c 100644 --- a/src/tests/unittests/Makefile.am +++ b/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 diff --git a/src/tests/unittests/Makefile.mak b/src/tests/unittests/Makefile.mak index 6284b51af9..1a4964c38a 100644 --- a/src/tests/unittests/Makefile.mak +++ b/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 diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak index b2682727d2..7837e5a8d7 100644 --- a/src/tools/Makefile.mak +++ b/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 diff --git a/src/tools/versioninfo-opensc-notify.rc.in b/src/tools/versioninfo-opensc-notify.rc.in index 3b01d660b9..c37131affa 100644 --- a/src/tools/versioninfo-opensc-notify.rc.in +++ b/src/tools/versioninfo-opensc-notify.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__ +1 RT_MANIFEST "@abs_top_srcdir@\\src\\tools\\exe.manifest" +#else +1 RT_MANIFEST "@abs_top_srcdir@/src/tools/exe.manifest" +#endif diff --git a/src/tools/versioninfo-tools.rc.in b/src/tools/versioninfo-tools.rc.in index 444b1a2522..6bc1b1d644 100644 --- a/src/tools/versioninfo-tools.rc.in +++ b/src/tools/versioninfo-tools.rc.in @@ -35,3 +35,9 @@ BEGIN VALUE "Translation", 0x409, 1200 END END + +#ifndef __MINGW32__ +1 RT_MANIFEST "@abs_top_srcdir@\\src\\tools\\exe.manifest" +#else +1 RT_MANIFEST "@abs_top_srcdir@/src/tools/exe.manifest" +#endif diff --git a/win32/Makefile.am b/win32/Makefile.am index 751f7ae498..d95139b64d 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/win32/ltrc.inc MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \ $(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/versioninfo-customactions.rc -EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak versioninfo.rc.in winconfig.h.in \ +EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak winconfig.h.in \ OpenSC.iss.in OpenSC.wxs.in versioninfo-customactions.rc.in \ OpenSC.ico dlgbmp.bmp bannrbmp.bmp DDORes.dll_14_2302.ico dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs