From e14e02845394711d94e3ceb846ace3b1bbca897b Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Wed, 23 Sep 2015 08:23:28 +0200 Subject: [PATCH] Properly describe OpenSSL dependencies in .mak files --- src/tools/Makefile.mak | 3 +-- win32/Make.rules.mak | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak index 7746fb15..948a2217 100644 --- a/src/tools/Makefile.mak +++ b/src/tools/Makefile.mak @@ -3,8 +3,7 @@ TOPDIR = ..\.. !INCLUDE $(TOPDIR)\win32\Make.rules.mak TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \ - pkcs11-tool.exe cardos-tool.exe eidenv.exe sc-hsm-tool.exe openpgp-tool.exe dnie-tool.exe \ - iasecc-tool.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe westcos-tool.exe \ + pkcs11-tool.exe cardos-tool.exe eidenv.exe openpgp-tool.exe iasecc-tool.exe \ $(PROGRAMS_OPENSSL) $(TARGETS): versioninfo-tools.res util.obj diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 4c637d03..6562b918 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -45,7 +45,8 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MTd.lib user32 OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(OPENSSL_STATIC_DIR)\libeay32MT.lib user32.lib advapi32.lib crypt32.lib !ENDIF -PROGRAMS_OPENSSL = pkcs15-init.exe cryptoflex-tool.exe netkey-tool.exe piv-tool.exe westcos-tool.exe +PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \ + westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe OPENSC_FEATURES = $(OPENSC_FEATURES) openssl !ENDIF