From 6c740b907e4424e393249f958671d72f6ddb9df0 Mon Sep 17 00:00:00 2001 From: alonbl Date: Tue, 29 Apr 2008 06:09:00 +0000 Subject: [PATCH] More MSVC fixups by Douglas E. Engert git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3503 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/Makefile.mak | 2 +- src/pkcs11/Makefile.mak | 6 +++--- src/pkcs15init/Makefile.mak | 5 +++-- src/tests/Makefile.am | 20 +++++++++++++++++++- src/tests/Makefile.mak | 3 +++ src/tools/Makefile.mak | 13 ++++--------- win32/Make.rules.mak | 4 ++-- win32/versioninfo.rc.in.in | 2 ++ 8 files changed, 37 insertions(+), 18 deletions(-) diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak index 91b8bfe9..a617c9e6 100644 --- a/src/libopensc/Makefile.mak +++ b/src/libopensc/Makefile.mak @@ -36,7 +36,7 @@ OBJECTS = \ compression.obj p15card-helper.obj \ versioninfo.res -all: install-headers $(TARGET) +all: versioninfo.res install-headers $(TARGET) !INCLUDE $(TOPDIR)\win32\Make.rules.mak diff --git a/src/pkcs11/Makefile.mak b/src/pkcs11/Makefile.mak index 0bf53950..31a51076 100644 --- a/src/pkcs11/Makefile.mak +++ b/src/pkcs11/Makefile.mak @@ -13,8 +13,8 @@ OBJECTS = pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot mechanism.obj openssl.obj secretkey.obj framework-pkcs15.obj \ 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) @@ -24,7 +24,7 @@ $(TARGET0): $(OBJECTS) hack-enabled.obj ..\libopensc\opensc.lib ..\scconf\scconf echo LIBRARY $* > $*.def 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 $(TARGET): $(OBJECTS) hack-disabled.obj ..\libopensc\opensc.lib ..\scconf\scconf.lib ..\pkcs15init\pkcs15init.lib ..\common\common.lib diff --git a/src/pkcs15init/Makefile.mak b/src/pkcs15init/Makefile.mak index 1a11cba9..acbb131d 100644 --- a/src/pkcs15init/Makefile.mak +++ b/src/pkcs15init/Makefile.mak @@ -9,9 +9,10 @@ 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 \ 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 diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 2cea0ef6..c0d3f403 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,4 +1,8 @@ -MAINTAINERCLEANFILES = $(srcdir)/Makefile.in +include $(top_srcdir)/win32/ltrc.inc + +MAINTAINERCLEANFILES = \ + $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc +CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak SUBDIRS = regression @@ -16,3 +20,17 @@ lottery_SOURCES = lottery.c $(COMMON_SRC) $(COMMON_INC) p15dump_SOURCES = p15dump.c print.c $(COMMON_SRC) $(COMMON_INC) 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 diff --git a/src/tests/Makefile.mak b/src/tests/Makefile.mak index b4a94784..68f9bc5d 100644 --- a/src/tests/Makefile.mak +++ b/src/tests/Makefile.mak @@ -6,6 +6,9 @@ TARGETS = base64.exe p15dump.exe \ 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 .c.obj: diff --git a/src/tools/Makefile.mak b/src/tools/Makefile.mak index d38a798d..ef2c8c66 100644 --- a/src/tools/Makefile.mak +++ b/src/tools/Makefile.mak @@ -5,9 +5,12 @@ TOPDIR = ..\.. 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: cl $(COPTS) /c $< @@ -19,11 +22,3 @@ all: util.obj $(TARGETS) ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \ 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 diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak index 7dfe68a8..a5a08487 100644 --- a/win32/Make.rules.mak +++ b/win32/Make.rules.mak @@ -37,7 +37,7 @@ OPENSC_FEATURES = $(OPENSC_FEATURES) zlib !ENDIF -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 @@ -53,7 +53,7 @@ install-headers-dir: cl $(COPTS) /c $< .rc.res:: - rc /l 0x809 /r /fo"$*.res" $< + rc /l 0x0409 /r $< clean:: del /Q *.obj *.dll *.exe *.pdb *.lib *.exp *.def diff --git a/win32/versioninfo.rc.in.in b/win32/versioninfo.rc.in.in index d8242865..9df89638 100644 --- a/win32/versioninfo.rc.in.in +++ b/win32/versioninfo.rc.in.in @@ -1,6 +1,8 @@ /* This file is processed by configure to create versioninfo.rc */ /* Every component changes @@FILE_DESCRIPTION@@ to local string */ +#include + VS_VERSION_INFO VERSIONINFO FILEVERSION @OPENSC_LT_CURRENT@,@OPENSC_LT_AGE@,@OPENSC_LT_REVISION@,0 PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,0