Untested, I don't have the environment, Martin, please test.
Signed-off-by: Alon Bar-Lev <[email protected]>
---
src/common/Makefile.mak | 2 +-
src/pkcs11/Makefile.mak | 2 +-
src/tools/Makefile.mak | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/common/Makefile.mak b/src/common/Makefile.mak
index 5584117..e80bede 100644
--- a/src/common/Makefile.mak
+++ b/src/common/Makefile.mak
@@ -8,7 +8,7 @@ common.lib: $(COMMON_OBJECTS)
lib $(LIBFLAGS) /out:common.lib $(COMMON_OBJECTS)
libpkcs11.lib: libpkcs11.obj libscdl.obj
- lib $(LIBFLAGS) /out:libpkcs11.lib libpkcs11.obj libscdl.obj
+ lib $(LIBFLAGS) /out:libpkcs11.lib libpkcs11.obj
libscdl.lib: libscdl.obj
lib $(LIBFLAGS) /out:libscdl.lib libscdl.obj
diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak
index afdc725..bea1e83 100644
--- a/src/pkcs11/Makefile.mak
+++ b/src/pkcs11/Makefile.mak
@@ -33,5 +33,5 @@ $(TARGET3): $(OBJECTS3) ..\libopensc\opensc.lib
echo LIBRARY $* > $*.def
echo EXPORTS >> $*.def
type $*.exports >> $*.def
- link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET3)
$(OBJECTS3) ..\libopensc\opensc.lib ..\common\libpkcs11.lib $(OPENSSL_LIB)
gdi32.lib advapi32.lib
+ link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET3)
$(OBJECTS3) ..\libopensc\opensc.lib ..\common\libpkcs11.lib
..\common\libscdl.lib $(OPENSSL_LIB) gdi32.lib advapi32.lib
if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest
-outputresource:$(TARGET3);2
diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak
index 366f392..153bff7 100644
--- a/src/tools/Makefile.mak
+++ b/src/tools/Makefile.mak
@@ -17,6 +17,6 @@ all: $(TARGETS)
cl $(COPTS) /c $<
link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj \
..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
- ..\pkcs15init\pkcs15init.lib ..\common\libpkcs11.lib \
+ ..\pkcs15init\pkcs15init.lib ..\common\libpkcs11.lib
..\common\libscdl.lib \
$(TOPDIR)\win32\versioninfo.res $(OPENSSL_LIB) gdi32.lib
if EXIST [email protected] mt -manifest [email protected]
-outputresource:$@;1
--
1.7.3.4
_______________________________________________
opensc-devel mailing list
[email protected]
http://www.opensc-project.org/mailman/listinfo/opensc-devel
