From ac9f672189e0c0b9daad4094bd0b09d7148ff9f0 Mon Sep 17 00:00:00 2001
From: aj <aj@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Mon, 1 Feb 2010 15:22:28 +0000
Subject: [PATCH] update windows makefiles: only create one dll.

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3973 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/Makefile.mak  | 13 +++++--------
 src/pkcs15init/Makefile.mak | 13 ++++---------
 src/tools/Makefile.mak      |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak
index 0645b768..8014a388 100644
--- a/src/libopensc/Makefile.mak
+++ b/src/libopensc/Makefile.mak
@@ -1,14 +1,11 @@
 TOPDIR = ..\..
 
-
-TARGET                  = opensc.dll opensc_a.lib
-
 HEADERS			= \
 	asn1.h cardctl.h cards.h errors.h \
 	log.h opensc.h pkcs15.h types.h ui.h
 
 HEADERSDIR		= $(TOPDIR)\src\include\opensc
-
+TARGET                  = opensc.dll opensc_a.lib
 OBJECTS			= \
 	sc.obj ctx.obj ui.obj log.obj errors.obj \
 	asn1.obj base64.obj sec.obj card.obj iso7816.obj dir.obj padding.obj apdu.obj \
@@ -42,12 +39,12 @@ all: versioninfo.res install-headers $(TARGET)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-opensc.dll: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib
+opensc.dll: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib
 	echo LIBRARY $* > $*.def
 	echo EXPORTS >> $*.def
 	type lib$*.exports >> $*.def
-	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(ZLIB_LIB) $(ICONV_LIB) gdi32.lib $(LIBLTDL_LIB) advapi32.lib ws2_32.lib
+	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib winscard.lib $(OPENSSL_LIB) $(ZLIB_LIB) $(ICONV_LIB) gdi32.lib $(LIBLTDL_LIB) advapi32.lib ws2_32.lib
 	if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2
 
-opensc_a.lib: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib
-	lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib winscard.lib user32.lib
+opensc_a.lib: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib
+	lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\pkcs15init\pkcs15init.lib winscard.lib user32.lib
diff --git a/src/pkcs15init/Makefile.mak b/src/pkcs15init/Makefile.mak
index 60f45d47..e10313e0 100644
--- a/src/pkcs15init/Makefile.mak
+++ b/src/pkcs15init/Makefile.mak
@@ -1,10 +1,8 @@
 TOPDIR = ..\..
 
-TARGET = pkcs15init.dll
-
 HEADERS = pkcs15-init.h profile.h keycache.h
 HEADERSDIR = $(TOPDIR)\src\include\opensc
-
+TARGET = pkcs15init.lib
 OBJECTS = pkcs15-lib.obj profile.obj keycache.obj \
           pkcs15-gpk.obj pkcs15-miocos.obj pkcs15-cflex.obj \
           pkcs15-cardos.obj pkcs15-jcop.obj pkcs15-starcos.obj \
@@ -16,11 +14,8 @@ OBJECTS = pkcs15-lib.obj profile.obj keycache.obj \
 
 all: install-headers $(TARGET) 
 
+$(TARGET): $(OBJECTS)
+	lib /nologo /machine:ix86 /out:$(TARGET) $(OBJECTS)
+
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-$(TARGET): $(OBJECTS)
-	echo LIBRARY $* > $*.def
-	echo EXPORTS >> $*.def
-	type $*.exports >> $*.def
-	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib ..\libopensc\opensc.lib winscard.lib $(OPENSSL_LIB) gdi32.lib $(LIBLTDL_LIB)
-	if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak
index e4325874..fd0ad913 100644
--- a/src/tools/Makefile.mak
+++ b/src/tools/Makefile.mak
@@ -17,7 +17,7 @@ $(TARGETS):  versioninfo.res util.obj
 
 .c.exe:
 	cl $(COPTS) /c $<
-        link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj \
+	link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj util.obj \
         ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
         ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
         versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib