From 440ea331db03909e5b041c2b43f699fe148aa981 Mon Sep 17 00:00:00 2001 From: alonbl Date: Sun, 9 Mar 2008 12:01:22 +0000 Subject: [PATCH] Windows DLL suffix is actually delta git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3410 c6295689-39f2-0310-b995-f0e70906c6a9 --- configure.ac | 2 ++ src/libopensc/Makefile.am | 8 ++++---- src/pkcs15init/Makefile.am | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 193e52ae..8015b55a 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ OPENSC_VERSION_FIX="PACKAGE_VERSION_FIX" OPENSC_LT_CURRENT="2" OPENSC_LT_REVISION="0" OPENSC_LT_AGE="0" +OPENSC_LT_MAJOR="$((${OPENSC_LT_CURRENT}-${OPENSC_LT_AGE}))" AC_CONFIG_SRCDIR([src/libopensc/sc.c]) @@ -530,6 +531,7 @@ AC_SUBST([OPENSC_VERSION_FIX]) AC_SUBST([OPENSC_LT_CURRENT]) AC_SUBST([OPENSC_LT_REVISION]) AC_SUBST([OPENSC_LT_AGE]) +AC_SUBST([OPENSC_LT_MAJOR]) AC_SUBST([OPTIONAL_ZLIB_CFLAGS]) AC_SUBST([OPTIONAL_ZLIB_LIBS]) AC_SUBST([OPTIONAL_READLINE_CFLAGS]) diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index a28295af..ebef7dbc 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -70,10 +70,10 @@ if WIN32 # def file required for MS users to build library mylibdir=$(libdir) if CYGWIN -mylib_DATA=.libs/cygopensc-@OPENSC_LT_CURRENT@.dll.def -.libs/cygopensc-@OPENSC_LT_CURRENT@.dll.def: libopensc.la +mylib_DATA=.libs/cygopensc-@OPENSC_LT_MAJOR@.dll.def +.libs/cygopensc-@OPENSC_LT_MAJOR@.dll.def: libopensc.la else -mylib_DATA=.libs/libopensc-@OPENSC_LT_CURRENT@.dll.def -.libs/libopensc-@OPENSC_LT_CURRENT@.dll.def: libopensc.la +mylib_DATA=.libs/libopensc-@OPENSC_LT_MAJOR@.dll.def +.libs/libopensc-@OPENSC_LT_MAJOR@.dll.def: libopensc.la endif endif diff --git a/src/pkcs15init/Makefile.am b/src/pkcs15init/Makefile.am index cdaf15af..ec0ae862 100644 --- a/src/pkcs15init/Makefile.am +++ b/src/pkcs15init/Makefile.am @@ -56,10 +56,10 @@ if WIN32 # def file required for MS users to build library mylibdir=$(libdir) if CYGWIN -mylib_DATA=.libs/cygpkcs15init-@OPENSC_LT_CURRENT@.dll.def -.libs/cygpkcs15init-@OPENSC_LT_CURRENT@.dll.def: libpkcs15init.la +mylib_DATA=.libs/cygpkcs15init-@OPENSC_LT_MAJOR@.dll.def +.libs/cygpkcs15init-@OPENSC_LT_MAJOR@.dll.def: libpkcs15init.la else -mylib_DATA=.libs/libpkcs15init-@OPENSC_LT_CURRENT@.dll.def -.libs/libpkcs15init-@OPENSC_LT_CURRENT@.dll.def: libpkcs15init.la +mylib_DATA=.libs/libpkcs15init-@OPENSC_LT_MAJOR@.dll.def +.libs/libpkcs15init-@OPENSC_LT_MAJOR@.dll.def: libpkcs15init.la endif endif