[pkg-opensc-commit] [pkcs11-helper] 15/44: Add version resource for Windows

[Eric Dorland]

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

eric pushed a commit to tag pkcs11-helper-1.06
in repository pkcs11-helper.

commit e90bac2cdee87caea07418c5663585160af8aad5
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Sat Feb 2 13:15:40 2008 +0000

    Add version resource for Windows
---
 ChangeLog           |  2 ++
 configure.ac        |  2 ++
 lib/Makefile.am     | 10 ++++++++++
 lib/Makefile.w32-vc | 23 +++++++++++++++++------
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2189cea..832e5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Id$
 
  * Fix some VC6 issues thanks to Justin Karneges.
 
+ * Add version resource for Windows.
+
 2007-10-12 - Version 1.05
 
  * Export pkcs11h_logout().
diff --git a/configure.ac b/configure.ac
index a5930d4..0194ac1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,7 @@ AC_ARG_WITH(
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 AC_CHECK_PROGS([M4], [m4])
@@ -442,6 +443,7 @@ AC_CONFIG_FILES([
 	doc/api/Makefile
 	lib/Makefile
 	lib/libpkcs11-helper-1.pc
+	lib/versioninfo.rc
 	m4dir/Makefile
 	distro/Makefile
 	distro/rpm/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3e47fd1..7e304e8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -86,6 +86,9 @@ libpkcs11_helper_la_LDFLAGS= \
 	-version-info @LIBPKCS11_HELPER_LT_CURRENT@:@LIBPKCS11_HELPER_LT_REVISION@:@LIBPKCS11_HELPER_LT_AGE@ \
 	-export-symbols pkcs11-helper.exports \
 	-no-undefined
+if WIN32
+libpkcs11_helper_la_SOURCES+=versioninfo.rc
+endif
 
 pkcs11-helper.exports: \
 		../config.h \
@@ -126,3 +129,10 @@ endif
 clean-generic:
 	-rm -fr pkcs11-helper.exports
 
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
+	$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+.rc.lo:
+	$(LTRCCOMPILE) -i $< -o $@
+
diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc
index c576bfb..3ed26bc 100644
--- a/lib/Makefile.w32-vc
+++ b/lib/Makefile.w32-vc
@@ -72,8 +72,11 @@ OPENSSL_LIBS=-LIBPATH:$(OPENSSL_HOME)\out32 user32.lib advapi32.lib $(OPENSSL_ST
 
 CFLAGS = -I../include $(OPENSSL_CFLAGS) -DWIN32 -DWIN32_LEAN_AND_MEAN -D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_WIN32_WINNT=0x0400
 CC=cl.exe
-CFLAGS=$(CFLAGS) /nologo /W3 /O2 $(CFLAGS) /FD /c
-CFLAGS=$(CFLAGS) /MD -DNDEBUG
+RC=rc.exe
+CCPARAMS=/nologo /W3 /O2 /FD /c
+
+CCPARAMS=$(CCPARAMS) /MD
+CFLAGS=$(CFLAGS) -DNDEBUG
 
 LINK32=link.exe
 LIB32=lib.exe
@@ -118,6 +121,9 @@ OBJS =  \
 	pkcs11h-token.obj \
 	pkcs11h-util.obj
 
+RES = \
+	versioninfo.res
+
 all:	libpkcs11-helper-1.dll pkcs11-helper.lib
 
 pkcs11-helper-1.dll.def:
@@ -132,12 +138,13 @@ pkcs11-helper-1.dll.def:
 	type openssl.exports >> pkcs11-helper-1.dll.def
 !endif
 
-libpkcs11-helper-1.dll: pkcs11-helper-1.dll.def $(OBJS)
+libpkcs11-helper-1.dll: pkcs11-helper-1.dll.def $(OBJS) $(RES)
 	$(LINK32) @<<
 	$(LINK32_FLAGS)
 	/out:"libpkcs11-helper-1.dll" /def:pkcs11-helper-1.dll.def
 	kernel32.lib gdi32.lib $(OPENSSL_LIBS)
 	$(OBJS)
+	$(RES)
 <<
 	move libpkcs11-helper-1.lib pkcs11-helper.dll.lib
 
@@ -149,9 +156,13 @@ pkcs11-helper.lib: $(OBJS)
 <<
 
 clean:
-	-del /Q $(OBJS) libpkcs11-helper-1.dll *.lib *.exp *.manifest *.idb *.pdb pkcs11-helper-1.dll.def
+	-del /Q $(OBJS) $(RES) libpkcs11-helper-1.dll *.lib *.exp *.manifest *.idb *.pdb pkcs11-helper-1.dll.def
+
+.rc.res::
+	$(RC) $(CFLAGS) $<
 
 .c.obj::
-   $(CC) @<<
-   $(CFLAGS) $<
+	$(CC) @<<
+$(CCPARAMS) $(CFLAGS)
+$<
 <<

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