[pkg-opensc-commit] [libp11] 118/239: Fixup MSVC resource build. By Douglas E. Engert

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libp11.

commit 02914aa482beb820fad9af6036193a0a2a1a09d9
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Thu Apr 10 16:28:55 2008 +0000

    Fixup MSVC resource build.
    By Douglas E. Engert
---
 Makefile.mak     | 26 --------------------------
 src/Makefile.mak | 12 +++++++++---
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/Makefile.mak b/Makefile.mak
index 3fe0279..bfb1a31 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -11,29 +11,3 @@ config.h: winconfig.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 $@"
-
-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 05430f4..73b5428 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -12,16 +12,22 @@ TARGET                  = libp11.dll
 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
 

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