[pkg-opensc-commit] [engine-pkcs11] 56/152: engine_pkcs11 MSVC fixups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository engine-pkcs11.

commit f0b7e47cf5eef151fd0757b6afc0c05a127d332e
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Tue Apr 8 17:48:19 2008 +0000

    engine_pkcs11 MSVC fixups
    
       added a Makefile.mak at top to handle the winconfig.h to config.h
    
       update src/Makefile.mak  to include /I..\ to get config.h and
                        use engine_pkcs11.exports for def file
                        take care of manifest.
    
       removed src/makedef.pl
    
       removed src/engine_pkcs11.def (old version) is created from .exports
    
       added a winconfig.h - so far does not need anything in it.
    
    By Douglas E. Engert
---
 Makefile.mak          | 13 +++++++++++++
 src/Makefile.mak      |  6 +++++-
 src/engine_pkcs11.def |  4 ----
 winconfig.h           |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Makefile.mak b/Makefile.mak
new file mode 100644
index 0000000..bfb1a31
--- /dev/null
+++ b/Makefile.mak
@@ -0,0 +1,13 @@
+
+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 $@"
diff --git a/src/Makefile.mak b/src/Makefile.mak
index 48eb7bf..cb9151e 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -7,7 +7,7 @@ OPENSSL_LIB = C:\openssl\lib\libeay32.lib
 LIBP11_INC = /IC:\libp11\include
 LIBP11_LIB = C:\libp11\lib\libp11.lib
 
-COPTS = /Zi /MD /nologo /DHAVE_CONFIG_H $(OPENSSL_INC) $(LIBP11_INC) /D_WIN32_WINNT=0x0400 /DHAVE_OPENSSL
+COPTS = /Zi /MD /nologo /I..\ /DHAVE_CONFIG_H $(OPENSSL_INC) $(LIBP11_INC) /D_WIN32_WINNT=0x0400 /DWIN32_LEAN_AND_MEAN /DHAVE_OPENSSL
 LINKFLAGS = /DEBUG /NOLOGO /INCREMENTAL:NO /MACHINE:IX86
 
 
@@ -21,4 +21,8 @@ all: $(TARGET)
 	cl $(COPTS) /c $<
 
 $(TARGET): $(OBJECTS) .
+	echo LIBRARY $* > $*.def
+	echo EXPORTS >> $*.def
+	type $*.exports >> $*.def
 	link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:$(TARGET) $(OBJECTS) $(OPENSSL_LIB) $(LIBP11_LIB) gdi32.lib
+	if EXIST $*.dll.manifest mt -manifest $*.dll.manifest -outputresource:$*.dll;2
diff --git a/src/engine_pkcs11.def b/src/engine_pkcs11.def
deleted file mode 100644
index 2a38483..0000000
--- a/src/engine_pkcs11.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY engine_pkcs11
-EXPORTS
-    v_check
-    bind_engine
diff --git a/winconfig.h b/winconfig.h
new file mode 100644
index 0000000..013255c
--- /dev/null
+++ b/winconfig.h
@@ -0,0 +1 @@
+/* nothing for now */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git