[pkg-opensc-commit] [pkcs11-helper] 21/44: Cleanup win32 resources

[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 752ca75038c2032b68db83cee89603b71056e728
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Sun Feb 3 12:06:49 2008 +0000

    Cleanup win32 resources
---
 lib/Makefile.am       |  9 ++++++---
 lib/versioninfo.rc.in | 52 +++++++++++++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index eda57ae..37b62ae 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -132,10 +132,13 @@ 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)
+RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS)
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
 
 .rc.lo:
 	$(LTRCCOMPILE) -i $< -o $@
 
+.rc.o:
+	$(RCCOMPILE) -i $< -o $@
+
diff --git a/lib/versioninfo.rc.in b/lib/versioninfo.rc.in
index 1f3a59d..87722a4 100644
--- a/lib/versioninfo.rc.in
+++ b/lib/versioninfo.rc.in
@@ -3,35 +3,35 @@
 #include <afxres.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @LIBPKCS11_HELPER_LT_CURRENT@, at LIBPKCS11_HELPER_LT_AGE@, at LIBPKCS11_HELPER_LT_REVISION@,0
- PRODUCTVERSION @PKCS11H_VERSION_MAJOR@, at PKCS11H_VERSION_MINOR@, at PKCS11H_VERSION_FIX@,0
- FILEFLAGSMASK 0x3fL
+	FILEVERSION @LIBPKCS11_HELPER_LT_CURRENT@, at LIBPKCS11_HELPER_LT_AGE@, at LIBPKCS11_HELPER_LT_REVISION@,0
+	PRODUCTVERSION @PKCS11H_VERSION_MAJOR@, at PKCS11H_VERSION_MINOR@, at PKCS11H_VERSION_FIX@,0
+	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
- FILEFLAGS 0x21L
+	FILEFLAGS 0x21L
 #else
- FILEFLAGS 0x20L
+	FILEFLAGS 0x20L
 #endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+	FILEOS 0x40004L
+	FILETYPE 0x1L
+	FILESUBTYPE 0x0L
 BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Provided under the terms of the GNU General Public License (GPLv2.1+), or BSD.\0"
-            VALUE "CompanyName", "OpenSC Project\0"
-            VALUE "FileDescription", "@PACKAGE_NAME@ - An easy way to access PKCS#11 modules\0"
-            VALUE "FileVersion", "@LIBPKCS11_HELPER_LT_CURRENT at .@LIBPKCS11_HELPER_LT_AGE at .@LIBPKCS11_HELPER_LT_REVISION at .0\0"
-            VALUE "InternalName", "@PACKAGE_NAME@\0"
-            VALUE "LegalCopyright", "Copyright � 2006-2008 Alon Bar-Lev <alon.barlev at gmail.com>\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "@PACKAGE_NAME at -@LIBPKCS11_HELPER_LT_CURRENT at .dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "@PACKAGE_NAME@\0"
-            VALUE "ProductVersion", "@PKCS11H_VERSION_MAJOR@, at PKCS11H_VERSION_MINOR@, at PKCS11H_VERSION_FIX@,0\0"
-            VALUE "SpecialBuild", "@PKCS11H_FEATURES@\0"
-        END
-    END
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "Comments", "Provided under the terms of the GNU General Public License (GPLv2.1+), or BSD.\0"
+			VALUE "CompanyName", "OpenSC Project\0"
+			VALUE "FileDescription", "@PACKAGE_NAME@ - An easy way to access PKCS#11 modules\0"
+			VALUE "FileVersion", "@LIBPKCS11_HELPER_LT_CURRENT at .@LIBPKCS11_HELPER_LT_AGE at .@LIBPKCS11_HELPER_LT_REVISION at .0\0"
+			VALUE "InternalName", "@PACKAGE_NAME@\0"
+			VALUE "LegalCopyright", "Copyright � 2006-2008 Alon Bar-Lev <alon.barlev at gmail.com>\0"
+			VALUE "LegalTrademarks", "\0"
+			VALUE "OriginalFilename", "@PACKAGE_NAME at -@LIBPKCS11_HELPER_LT_CURRENT at .dll\0"
+			VALUE "PrivateBuild", "\0"
+			VALUE "ProductName", "@PACKAGE_NAME@\0"
+			VALUE "ProductVersion", "@PKCS11H_VERSION_MAJOR@, at PKCS11H_VERSION_MINOR@, at PKCS11H_VERSION_FIX@,0\0"
+			VALUE "SpecialBuild", "@PKCS11H_FEATURES@\0"
+		END
+	END
 END
 

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