Changeset 3464 for trunk/src/libopensc/Makefile.mak

Timestamp:

04/07/08 21:42:43 (8 months ago)

Author:

alonbl

Message:

Attached are the latest mode to OpenSC svn 3462 to use the Makefile.mak
files to build on Windows.

I got rutoken to compile, and took out the #ifdef's I had in last week.
The rutoken programmer declared some variables in the middle of a block
rather then having all the declare statements at the beginning of a block
as is normally done in C. The Microsoft compile treats this as an error.
(Actual many errors.)

The makedef.pl is no longer needed, as the exports files can be used.
Note that in the original Makefile.mak files only opensc.def and
pkcs15init.def were created.

winconfig.h has a number of changes. As discussed last week this could
be created by autoconf. I also noted that the Active State Perl that
was required for the makedef.pl has a psed command that could be used
like sed to update winconfig.h. I did not attempt to do this.

win32/Make.rules.mak - Use ENABLE_OPENSSL and ENABLE_ZLIB

src/tools/Makefile.mak - add the rutoken.tool.exe

src/tools/eidenv.c - use PACKAGE_VERSION

src/pkcs11/Makefile.mak - reorder the objest to match the list in the

Makefile.am. Makes it easier to read.

src/include/winconfig.h - The windows version of the config.h

Changes based on discussions on the list last week.

src/common/Makefile.mak - renamed modules.

src/pkcs15init/Makefile.mak - reordered, and added back the rutoken modules

replaced the use of makdef.pl to sue the exports file.

src/scconf/Makefile.mak - reordered objects.

src/libopensc/card-rutoken.c -

error. Moved the declares to the beginning of blocks.

src/libopensc/Makefile.mak - reorder names, and add rutoken.

Use the libopensc.exports file.

src/libopensc/pkcs15-prkey-rutoken.c - more moving of declare statements.

By Douglas E. Engert

http://www.opensc-project.org/pipermail/opensc-devel/2008-April/011011.html

Files:

• trunk/src/libopensc/Makefile.mak (modified) (3 diffs)

trunk/src/libopensc/Makefile.mak

@@ -5 +5 @@
 
 HEADERS                 = \
-        opensc.h pkcs15.h emv.h \
-        cardctl.h cards.h asn1.h \
-        log.h ui.h errors.h types.h
+        asn1.h cardctl.h cards.h emv.h errors.h \
+        log.h opensc.h pkcs15.h rutoken.h types.h ui.h
 
 HEADERSDIR              = $(TOPDIR)\src\include\opensc
@@ -13 +12 @@
 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 \
+        asn1.obj base64.obj sec.obj card.obj iso7816.obj dir.obj padding.obj apdu.obj \
         \
         pkcs15.obj pkcs15-cert.obj pkcs15-data.obj pkcs15-pin.obj \
         pkcs15-prkey.obj pkcs15-pubkey.obj pkcs15-sec.obj \
         pkcs15-wrap.obj pkcs15-algo.obj pkcs15-cache.obj pkcs15-syn.obj \
+        pkcs15-gemsafeV1.obj \
         \
-        emv.obj \
+        emv.obj muscle.obj muscle-filesystem.obj \
         \
-        ctbcs.obj reader-ctapi.obj reader-pcsc.obj \
+        ctbcs.obj reader-ctapi.obj reader-pcsc.obj reader-openct.obj \
         \
         card-setcos.obj card-miocos.obj card-flex.obj card-gpk.obj \
         card-cardos.obj card-tcos.obj card-emv.obj card-default.obj \
         card-mcrd.obj card-starcos.obj card-openpgp.obj card-jcop.obj \
-        card-oberthur.obj card-belpic.obj card-atrust-acos.obj card-akis.obj \
-        card-incrypto34.obj card-piv.obj card-acos5.obj card-asepcos.obj \
-        muscle.obj card-muscle.obj muscle-filesystem.obj \
-        compression.obj p15card-helper.obj \
+        card-oberthur.obj card-belpic.obj card-atrust-acos.obj \
+        card-incrypto34.obj card-piv.obj card-muscle.obj card-acos5.obj \
+        card-asepcos.obj card-akis.obj card-gemsafeV1.obj card-rutoken.obj \
         \
         pkcs15-openpgp.obj pkcs15-infocamere.obj pkcs15-starcert.obj \
-        pkcs15-tcos.obj pkcs15-esteid.obj pkcs15-postecert.obj \
-        pkcs15-gemsafe.obj pkcs15-actalis.obj pkcs15-atrust-acos.obj \
-        pkcs15-tccardos.obj pkcs15-piv.obj\
-        \
+        pkcs15-tcos.obj pkcs15-esteid.obj pkcs15-postecert.obj pkcs15-gemsafeGPK.obj \
+        pkcs15-actalis.obj pkcs15-atrust-acos.obj pkcs15-tccardos.obj pkcs15-piv.obj \
+        pkcs15-rutoken.obj pkcs15-prkey-rutoken.obj \
+        compression.obj p15card-helper.obj \
         $(TOPDIR)\win32\version.res
 
@@ -44 +42 @@
 
 opensc.dll: $(OBJECTS) ..\scconf\scconf.lib ..\common\common.lib
-        perl $(TOPDIR)\win32\makedef.pl $*.def $* $(OBJECTS)
+        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) gdi32.lib $(LIBLTDL_LIB) advapi32.lib ws2_32.lib
         if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2