Alon Bar-Lev wrote:
> On 4/8/08, Douglas E. Engert <[EMAIL PROTECTED]> wrote:
>> Yes. Neither package used it in the past. You said you where
>> going to have autoconf generate it os it would be in the distribution
>> or created running ./bootstrap on unix. When you change autoconf,
>> I can then change the Makefile.mak files to use it.
>
> OK.
> Done.
> Please checkout a fresh copy.
> Then:
> autoconf -i -v -f
> ./configure && make dist
>
> And use the tar to build win32.
>
> You will find I generate the winconfig.h out of winconfig.h.in and
> there will be versioninfo.rc at each subdir to use by the makefile.
>
> I tried to modify the rules files in order to use this file, but I
> guess it is not working now. Please make it be in good shape again.
I can get libp11 to build the dll and add the .res file. But I needed
to use #include <mfc/afxres.h>
rather then #include <afxres.h> in the versioninfo.rc
Would this effect the ming build?
The header is part of the Microsoft PlatformSDK, but under the mfc.
The mfc is not normally added to the include paths. If we have to
it would complicate the build process.
The ./Makefile.mak appear to be 3 times bigger then it should be some
how during the svn update it was pasted 3 times.
(The following is from Thunderbird, my normal mail client...)
Index: Makefile.mak
===================================================================
--- Makefile.mak (revision 145)
+++ Makefile.mak (working copy)
@@ -11,29 +11,3 @@
all depend install clean::
@for %i in ( $(SUBDIRS) ) do \
@cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
-
-SUBDIRS = src
-
-all::
-
-all:: config.h
-
-config.h: winconfig.h
- @copy /y winconfig.h config.h
-
-all depend install clean::
- @for %i in ( $(SUBDIRS) ) do \
- @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
-
-SUBDIRS = src
-
-all::
-
-all:: config.h
-
-config.h: winconfig.h
- @copy /y winconfig.h config.h
-
-all depend install clean::
- @for %i in ( $(SUBDIRS) ) do \
- @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
Index: src/Makefile.mak
===================================================================
--- src/Makefile.mak (revision 145)
+++ src/Makefile.mak (working copy)
@@ -12,16 +12,20 @@
OBJECTS = libpkcs11.obj p11_attr.obj p11_cert.obj p11_err.obj
\
p11_key.obj p11_load.obj p11_misc.obj p11_rsa.obj p11_slot.obj
p11_ops.obj
-all: $(TARGET)
+all: $(TARGET) versioninfo.res
+RSC_PROJ=/l 0x809 /r /fo"versioninfo.res"
+
+versioninfo.res: versioninfo.rc
+ rc $(RSC_PROJ) versioninfo.rc
+
.c.obj::
cl $(COPTS) /c $<
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS) versioninfo.res
echo LIBRARY $* > $*.def
echo EXPORTS >> $*.def
type $*.exports >> $*.def
link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) \
- $(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB)
+ $(OBJECTS) $(OPENSSL_LIB) $(LIBLTDL_LIB) versioninfo.res
if EXIST $*.dll.manifest mt -manifest $*.dll.manifest
-outputresource:$*.dll;2
-
Index: src/versioninfo.rc.in
===================================================================
--- src/versioninfo.rc.in (revision 145)
+++ src/versioninfo.rc.in (working copy)
@@ -1,4 +1,4 @@
-#include <afxres.h>
+#include <mfc/afxres.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @LIBP11_LT_CURRENT@,@LIBP11_LT_AGE@,@LIBP11_LT_REVISION@,0
>
> Thanks!
> Alon.
>
>
P.S. I will look at engine_pkcs11 tomorrow.
--
Douglas E. Engert <[EMAIL PROTECTED]>
Argonne National Laboratory
9700 South Cass Avenue
Argonne, Illinois 60439
(630) 252-5444
_______________________________________________
opensc-devel mailing list
[email protected]
http://www.opensc-project.org/mailman/listinfo/opensc-devel
