giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix libtool versioning issues 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3421 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
alonbl 2008-03-15 11:05:26 +00:00
parent 1635782e62
commit f49f765ac6
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -17,13 +17,13 @@ OPENSC_VERSION_FIX="PACKAGE_VERSION_FIX"
# LT Version numbers, remember to change them just *before* a release.
# (Code changed: REVISION++)
# (Interfaces added/removed/changed: CURRENT++, REVISION=0)
# (Interfaces added: AGE++)
# (Interfaces removed: AGE=0)
# (Oldest interface removed: OLDEST++)
# (Interfaces added: CURRENT++, REVISION=0)
OPENSC_LT_CURRENT="2"
OPENSC_LT_OLDEST="2"
OPENSC_LT_REVISION="0"
OPENSC_LT_AGE="0"
OPENSC_LT_MAJOR="$((${OPENSC_LT_CURRENT}-${OPENSC_LT_AGE}))"
OPENSC_LT_AGE="$((${OPENSC_LT_CURRENT}-${OPENSC_LT_OLDEST}))"
AC_CONFIG_SRCDIR([src/libopensc/sc.c])
@ -81,6 +81,7 @@ case "${host}" in
*-mingw32*|*-winnt*)
WIN32="yes"
CPPFLAGS="${CPPFLAGS} -DWIN32_LEAN_AND_MEAN"
WIN_LIBPREFIX="lib"
;;
*-cygwin*)
AC_MSG_CHECKING([cygwin mode to use])
@ -93,6 +94,7 @@ case "${host}" in
else
AC_MSG_RESULT([Using cygwin])
CPPFLAGS="${CPPFLAGS} -DCRYPTOKI_FORCE_WIN32"
WIN_LIBPREFIX="cyg"
AC_DEFINE([USE_CYGWIN], [1], [Define if you are on Cygwin])
fi
;;
@ -526,7 +528,8 @@ 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([LIBP11_LT_OLDEST])
AC_SUBST([WIN_LIBPREFIX])
AC_SUBST([OPTIONAL_ZLIB_CFLAGS])
AC_SUBST([OPTIONAL_ZLIB_LIBS])
AC_SUBST([OPTIONAL_READLINE_CFLAGS])

9
src/libopensc/Makefile.am
View File

@ -67,11 +67,6 @@ versioninfo.rc:
if WIN32
# def file required for MS users to build library
mylibdir=$(libdir)
if CYGWIN
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_MAJOR@.dll.def
.libs/libopensc-@OPENSC_LT_MAJOR@.dll.def: libopensc.la
endif
mylib_DATA=.libs/@WIN_LIBPREFIX@opensc-@OPENSC_LT_OLDEST@.dll.def
.libs/@WIN_LIBPREFIX@opensc-@OPENSC_LT_OLDEST@.dll.def: libopensc.la
endif

9
src/pkcs15init/Makefile.am
View File

@ -53,11 +53,6 @@ versioninfo.rc:
if WIN32
# def file required for MS users to build library
mylibdir=$(libdir)
if CYGWIN
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_MAJOR@.dll.def
.libs/libpkcs15init-@OPENSC_LT_MAJOR@.dll.def: libpkcs15init.la
endif
mylib_DATA=.libs/@WIN_LIBPREFIX@pkcs15init-@OPENSC_LT_OLDEST@.dll.def
.libs/@WIN_LIBPREFIX@pkcs15init-@OPENSC_LT_OLDEST@.dll.def: libpkcs15init.la
endif