2008-08-21 Marcus Brinkmann <marcus@g10code.com>

	* src/scute.def: Start at @1 instead of @0.

src/Makefile.am

@@ -1,5 +1,5 @@
 # Makefile.am - Makefile src/ for scute.
-# Copyright (C) 2006 g10 Code GmbH
+# Copyright (C) 2006, 2008 g10 Code GmbH
 # 
 # This file is part of Scute.
 #
@@ -31,59 +31,7 @@
 
 EXTRA_DIST = libscute.vers scute.def versioninfo.rc.in
 
-lib_LTLIBRARIES = libscute.la
-
-if HAVE_LD_VERSION_SCRIPT
-scute_version_script_cmd = -Wl,--version-script=$(srcdir)/libscute.vers
-else
-scute_version_script_cmd =
-endif
-
-if HAVE_W32_SYSTEM
-
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
-     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
-     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
-
-SUFFIXES: .rc .lo
-
-.rc.lo:
-	$(LTRCCOMPILE) -i $< -o $@
-
-scute_res = versioninfo.lo
-scute_res_ldflag = -Wl,.libs/versioninfo.o
-
-no_undefined = -no-undefined
-export_symbols = -export-symbols $(srcdir)/scute.def
-
-install-def-file:
-	$(INSTALL) $(srcdir)/scute.def $(DESTDIR)$(libdir)/scute.def
-
-uninstall-def-file:
-	-rm $(DESTDIR)$(libdir)/scute.def
-
-scute_deps = $(scute_res) scute.def
-
-else
-scute_res =
-scute_res_ldflag =
-no_undefined =
-export_symbols =
-install-def-file:
-uninstall-def-file:
-
-scute_deps =
-endif
-
-libscute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) $(export_symbols) \
-	$(scute_version_script_cmd) -version-info \
-	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
-libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
-libscute_la_LIBADD = @LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
-
-libscute_la_CPPFLAGS = -I$(srcdir)/../include \
-	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
-libscute_la_SOURCES = cryptoki.h pkcs11.h debug.h settings.h support.h	\
+sources = cryptoki.h pkcs11.h debug.h settings.h support.h		\
 	locking.h locking.c error-mapping.h error-mapping.c		\
 	get-path.c agent.h agent.c					\
 	slots.h slots.c table.h table.c					\
@@ -111,3 +59,53 @@ libscute_la_SOURCES = cryptoki.h pkcs11.h debug.h settings.h support.h	\
 	p11-unwrapkey.c p11-verify.c p11-verifyfinal.c p11-verifyinit.c	\
 	p11-verifyrecover.c p11-verifyrecoverinit.c p11-verifyupdate.c	\
 	p11-waitforslotevent.c p11-wrapkey.c
+
+
+if HAVE_LD_VERSION_SCRIPT
+scute_version_script_cmd = -Wl,--version-script=$(srcdir)/libscute.vers
+else
+scute_version_script_cmd =
+endif
+
+
+EXEEXT = .dll
+
+if HAVE_W32_SYSTEM
+
+bin_PROGRAMS = scute
+
+AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@ -shared
+
+scute_SOURCES = $(sources) versioninfo.rc
+
+scute_DEPENDENCIES = @LTLIBOBJS@ versioninfo.o libgpg-error.a libassuan.a
+
+libgpg-error.a:
+	ln -s $$($(GPG_ERROR_CONFIG) --prefix)/lib/libgpg-error.a .
+
+libassuan.a:
+	ln -s $$($(LIBASSUAN_CONFIG) --prefix)/lib/libassuan.a .
+
+clean-local:
+	rm -f libgpg-error.a libassuan.a
+
+
+scute_LDADD = @LTLIBOBJS@ $(srcdir)/scute.def -L. -lassuan -lgpg-error 
+
+.rc.o:
+	$(RC) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
+
+else
+
+lib_LTLIBRARIES = libscute.la
+
+libscute_la_LDFLAGS = $(scute_version_script_cmd) -version-info \
+	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
+libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
+libscute_la_LIBADD = @LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
+
+libscute_la_CPPFLAGS = -I$(srcdir)/../include \
+	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
+libscute_la_SOURCES = $(sources)
+
+endif

src/scute.def

@@ -28,72 +28,72 @@
 ; exception statement from your version.
 
 EXPORTS
-    C_CancelFunction			@0
-    C_CloseAllSessions			@1
-    C_CloseSession			@2
-    C_CopyObject			@3
-    C_CreateObject			@4
-    C_Decrypt				@5
-    C_DecryptDigestUpdate		@6
-    C_DecryptFinal			@7
-    C_DecryptInit			@8
-    C_DecryptUpdate			@9
-    C_DecryptVerifyUpdate		@10
-    C_DeriveKey				@11
-    C_DestroyObject			@12
-    C_Digest				@13
-    C_DigestEncryptUpdate		@14
-    C_DigestFinal			@15
-    C_DigestInit			@16
-    C_DigestKey				@17
-    C_DigestUpdate			@18
-    C_Encrypt				@19
-    C_EncryptFinal			@20
-    C_EncryptInit			@21
-    C_EncryptUpdate			@22
-    C_Finalize				@23
-    C_FindObjects			@24
-    C_FindObjectsFinal			@25
-    C_FindObjectsInit			@26
-    C_GenerateKey			@27
-    C_GenerateKeyPair			@28
-    C_GenerateRandom			@29
-    C_GetAttributeValue			@30
-    C_GetFunctionList			@31
-    C_GetFunctionStatus			@32
-    C_GetInfo				@33
-    C_GetMechanismInfo			@34
-    C_GetMechanismList			@35
-    C_GetObjectSize			@36
-    C_GetOperationState			@37
-    C_GetSessionInfo			@38
-    C_GetSlotInfo			@39
-    C_GetSlotList			@40
-    C_GetTokenInfo			@41
-    C_InitPIN				@42
-    C_InitToken				@43
-    C_Initialize			@44
-    C_Login				@45
-    C_Logout				@46
-    C_OpenSession			@47
-    C_SeedRandom			@48
-    C_SetAttributeValue			@49
-    C_SetOperationState			@50
-    C_SetPIN				@51
-    C_Sign				@52
-    C_SignEncryptUpdate			@53
-    C_SignFinal				@54
-    C_SignInit				@55
-    C_SignRecover			@56
-    C_SignRecoverInit			@57
-    C_SignUpdate			@58
-    C_UnwrapKey				@59
-    C_Verify				@60
-    C_VerifyFinal			@61
-    C_VerifyInit			@62
-    C_VerifyRecover			@63
-    C_VerifyRecoverInit			@64
-    C_VerifyUpdate			@65
-    C_WaitForSlotEvent			@66
-    C_WrapKey				@67
+    C_CancelFunction			@1
+    C_CloseAllSessions			@2
+    C_CloseSession			@3
+    C_CopyObject			@4
+    C_CreateObject			@5
+    C_Decrypt				@6
+    C_DecryptDigestUpdate		@7
+    C_DecryptFinal			@8
+    C_DecryptInit			@9
+    C_DecryptUpdate			@10
+    C_DecryptVerifyUpdate		@11
+    C_DeriveKey				@12
+    C_DestroyObject			@13
+    C_Digest				@14
+    C_DigestEncryptUpdate		@15
+    C_DigestFinal			@16
+    C_DigestInit			@17
+    C_DigestKey				@18
+    C_DigestUpdate			@19
+    C_Encrypt				@20
+    C_EncryptFinal			@21
+    C_EncryptInit			@22
+    C_EncryptUpdate			@23
+    C_Finalize				@24
+    C_FindObjects			@25
+    C_FindObjectsFinal			@26
+    C_FindObjectsInit			@27
+    C_GenerateKey			@28
+    C_GenerateKeyPair			@29
+    C_GenerateRandom			@30
+    C_GetAttributeValue			@31
+    C_GetFunctionList			@32
+    C_GetFunctionStatus			@33
+    C_GetInfo				@34
+    C_GetMechanismInfo			@35
+    C_GetMechanismList			@36
+    C_GetObjectSize			@37
+    C_GetOperationState			@38
+    C_GetSessionInfo			@39
+    C_GetSlotInfo			@40
+    C_GetSlotList			@41
+    C_GetTokenInfo			@42
+    C_InitPIN				@43
+    C_InitToken				@44
+    C_Initialize			@45
+    C_Login				@46
+    C_Logout				@47
+    C_OpenSession			@48
+    C_SeedRandom			@49
+    C_SetAttributeValue			@50
+    C_SetOperationState			@51
+    C_SetPIN				@52
+    C_Sign				@53
+    C_SignEncryptUpdate			@54
+    C_SignFinal				@55
+    C_SignInit				@56
+    C_SignRecover			@57
+    C_SignRecoverInit			@58
+    C_SignUpdate			@59
+    C_UnwrapKey				@60
+    C_Verify				@61
+    C_VerifyFinal			@62
+    C_VerifyInit			@63
+    C_VerifyRecover			@64
+    C_VerifyRecoverInit			@65
+    C_VerifyUpdate			@66
+    C_WaitForSlotEvent			@67
+    C_WrapKey				@68
 ; END