Changeset 3503

Timestamp:

04/29/08 06:09:00 (9 months ago)

Author:

alonbl

Message:

More MSVC fixups by Douglas E. Engert

Location:

trunk

Files:

• src/libopensc/Makefile.mak (modified) (1 diff)
• src/pkcs11/Makefile.mak (modified) (2 diffs)
• src/pkcs15init/Makefile.mak (modified) (1 diff)
• src/tests/Makefile.am (modified) (2 diffs)
• src/tests/Makefile.mak (modified) (1 diff)
• src/tools/Makefile.mak (modified) (2 diffs)
• win32/Make.rules.mak (modified) (2 diffs)
• win32/versioninfo.rc.in.in (modified) (1 diff)

trunk/src/libopensc/Makefile.mak

@@ -37 +37 @@
         versioninfo.res
 
-all: install-headers $(TARGET)
+all: versioninfo.res install-headers $(TARGET)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak

trunk/src/pkcs11/Makefile.mak

@@ -14 +14 @@
                           framework-pkcs15init.obj debug.obj \
                           versioninfo.res
-OBJECTS2                = libpkcs11.obj
-OBJECTS3                = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj
+OBJECTS2                = libpkcs11.obj versioninfo.res
+OBJECTS3                = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj versioninfo.res
 
 all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3) 
@@ -25 +25 @@
         echo EXPORTS >> $*.def
         type opensc-pkcs11.exports >> $*.def
-        link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
+        link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET0) $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib winscard.lib $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
         if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
 

trunk/src/pkcs15init/Makefile.mak

@@ -10 +10 @@
           pkcs15-cardos.obj pkcs15-jcop.obj pkcs15-starcos.obj \
           pkcs15-oberthur.obj pkcs15-setcos.obj pkcs15-incrypto34.obj \
-          pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj
+          pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj \
+                  versioninfo.res
 
-all: install-headers $(TARGET)
+all: install-headers $(TARGET) 
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak

trunk/src/tests/Makefile.am

@@ -1 @@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/win32/ltrc.inc
+
+MAINTAINERCLEANFILES = \
+        $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
+CLEANFILES = versioninfo.rc
 EXTRA_DIST = Makefile.mak
 
@@ -17 +21 @@
 pintest_SOURCES = pintest.c print.c $(COMMON_SRC) $(COMMON_INC)
 prngtest_SOURCES = prngtest.c $(COMMON_SRC) $(COMMON_INC)
+
+if WIN32
+base64_SOURCES += versioninfo.rc
+lottery_SOURCES += versioninfo.rc
+p15dump_SOURCES += versioninfo.rc
+pintest_SOURCES += versioninfo.rc
+prngtest_SOURCES += versioninfo.rc
+else
+dist_noinst_DATA = versioninfo.rc
+endif
+
+versioninfo.rc:
+        sed 's/@@FILE_DESCRIPTION@@/OpenSC Test Program/g' \
+                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc

trunk/src/tests/Makefile.mak

@@ -6 +6 @@
 
 all: print.obj sc-test.obj $(TARGETS)
+
+$(TARGETS): versioninfo.res print.obj sc-test.obj \
+        ..\common\common.lib ..\libopensc\opensc.lib
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak

trunk/src/tools/Makefile.mak

@@ -6 +6 @@
 TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
                 pkcs11-tool.exe cardos-info.exe eidenv.exe rutoken-tool.exe \
+                netkey-tool.exe \
                 $(PROGRAMS_OPENSSL)
 
-all: util.obj $(TARGETS)
+all: $(TARGETS)
+
+$(TARGETS):  versioninfo.res util.obj 
 
 .c.obj:
@@ -20 +23 @@
         versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
                 if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1
-
-netkey-tool.exe: netkey-tool.c
-        cl $(COPTS) /c netkey-tool.c
-        link $(LINKFLAGS) /pdb:netkey-tool.pdb /out:netkey-tool.exe netkey-tool.obj \
-        ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \
-        ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \
-        versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib
-                if EXIST netkey-tool.exe.manifest mt -manifest netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1

trunk/win32/Make.rules.mak

@@ -38 +38 @@
 
 
-COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc /I$(TOPDIR)\src\common $(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) "/DOPENSC_FEATURES=$(OPENSC_FEATURES)"
+COPTS = /D_CRT_SECURE_NO_DEPRECATE /Zi /MD /nologo /DHAVE_CONFIG_H /I$(TOPDIR)\src\include /I$(TOPDIR)\src\include\opensc /I$(TOPDIR)\src\common $(OPENSSL_INCL_DIR) $(ZLIB_INCL_DIR) $(LIBLTDL_INCL) /D_WIN32_WINNT=0x0400 /DWIN32_LEAN_AND_MEAN $(OPENSSL_DEF) $(ZLIB_DEF) /DOPENSC_FEATURES="\"$(OPENSC_FEATURES)\""
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
@@ -54 +54 @@
 
 .rc.res::
-        rc /l 0x809 /r /fo"$*.res" $<
+        rc /l 0x0409 /r $<
 
 clean::

trunk/win32/versioninfo.rc.in.in

@@ -1 +1 @@
 /* This file is processed by configure to create versioninfo.rc */
 /* Every component changes @@FILE_DESCRIPTION@@ to local string */
+
+#include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO