Changeset 3503 for trunk/src

Show
Ignore:
Timestamp:
04/29/08 06:09:00 (9 months ago)
Author:
alonbl
Message:

More MSVC fixups by Douglas E. Engert

Location:
trunk/src
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/libopensc/Makefile.mak

    r3478 r3503  
    3737        versioninfo.res 
    3838 
    39 all: install-headers $(TARGET) 
     39all: versioninfo.res install-headers $(TARGET) 
    4040 
    4141!INCLUDE $(TOPDIR)\win32\Make.rules.mak 

  • trunk/src/pkcs11/Makefile.mak

    r3468 r3503  
    1414                          framework-pkcs15init.obj debug.obj \ 
    1515                          versioninfo.res 
    16 OBJECTS2                = libpkcs11.obj 
    17 OBJECTS3                = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj 
     16OBJECTS2                = libpkcs11.obj versioninfo.res 
     17OBJECTS3                = pkcs11-spy.obj pkcs11-display.obj libpkcs11.obj versioninfo.res 
    1818 
    1919all: install-headers $(TARGET0) $(TARGET) $(TARGET2) $(TARGET3)  
    … …  
    2525        echo EXPORTS >> $*.def 
    2626        type opensc-pkcs11.exports >> $*.def 
    27         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 
     27        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  
    2828        if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2 
    2929 

  • trunk/src/pkcs15init/Makefile.mak

    r3464 r3503  
    1010          pkcs15-cardos.obj pkcs15-jcop.obj pkcs15-starcos.obj \ 
    1111          pkcs15-oberthur.obj pkcs15-setcos.obj pkcs15-incrypto34.obj \ 
    12           pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj 
     12          pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj \ 
     13                  versioninfo.res 
    1314 
    14 all: install-headers $(TARGET) 
     15all: install-headers $(TARGET)  
    1516 
    1617!INCLUDE $(TOPDIR)\win32\Make.rules.mak 

  • trunk/src/tests/Makefile.am

    r3450 r3503  
    1 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in 
     1include $(top_srcdir)/win32/ltrc.inc 
     2 
     3MAINTAINERCLEANFILES = \ 
     4        $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc 
     5CLEANFILES = versioninfo.rc 
    26EXTRA_DIST = Makefile.mak 
    37 
    … …  
    1721pintest_SOURCES = pintest.c print.c $(COMMON_SRC) $(COMMON_INC) 
    1822prngtest_SOURCES = prngtest.c $(COMMON_SRC) $(COMMON_INC) 
     23 
     24if WIN32 
     25base64_SOURCES += versioninfo.rc 
     26lottery_SOURCES += versioninfo.rc 
     27p15dump_SOURCES += versioninfo.rc 
     28pintest_SOURCES += versioninfo.rc 
     29prngtest_SOURCES += versioninfo.rc 
     30else 
     31dist_noinst_DATA = versioninfo.rc 
     32endif 
     33 
     34versioninfo.rc: 
     35        sed 's/@@FILE_DESCRIPTION@@/OpenSC Test Program/g' \ 
     36                "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc 

  • trunk/src/tests/Makefile.mak

    r3468 r3503  
    66 
    77all: print.obj sc-test.obj $(TARGETS) 
     8 
     9$(TARGETS): versioninfo.res print.obj sc-test.obj \ 
     10        ..\common\common.lib ..\libopensc\opensc.lib 
    811 
    912!INCLUDE $(TOPDIR)\win32\Make.rules.mak 

  • trunk/src/tools/Makefile.mak

    r3468 r3503  
    66TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \ 
    77                pkcs11-tool.exe cardos-info.exe eidenv.exe rutoken-tool.exe \ 
     8                netkey-tool.exe \ 
    89                $(PROGRAMS_OPENSSL) 
    910 
    10 all: util.obj $(TARGETS) 
     11all: $(TARGETS) 
     12 
     13$(TARGETS):  versioninfo.res util.obj  
    1114 
    1215.c.obj: 
    … …  
    2023        versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
    2124                if EXIST $@.manifest mt -manifest $@.manifest -outputresource:$@;1 
    22  
    23 netkey-tool.exe: netkey-tool.c 
    24         cl $(COPTS) /c netkey-tool.c 
    25         link $(LINKFLAGS) /pdb:netkey-tool.pdb /out:netkey-tool.exe netkey-tool.obj \ 
    26         ..\common\common.lib ..\scconf\scconf.lib ..\libopensc\opensc.lib \ 
    27         ..\pkcs15init\pkcs15init.lib ..\pkcs11\libpkcs11.lib \ 
    28         versioninfo.res $(OPENSSL_LIB) $(LIBLTDL) gdi32.lib 
    29                 if EXIST netkey-tool.exe.manifest mt -manifest netkey-tool.exe.manifest -outputresource:netkey-tool.exe;1