diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-04-03 14:43:33 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-04-03 14:43:33 +0200 |
| commit | 694a1581e872f6c2ea990e3d6f15b8b4719e9d3f (patch) | |
| tree | 6329748afcf2bd950da2e462cb923dd8594d79ed | |
| parent | 6c7bfb4902420c4ca77c9a6b46de7295a1cfc0af (diff) | |
| download | gnutls-694a1581e872f6c2ea990e3d6f15b8b4719e9d3f.tar.gz | |
Use DLL_VERSION variable name.
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 4 | ||||
| -rw-r--r-- | libextra/Makefile.am | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index b03a83e469..597844fb72 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -127,9 +127,9 @@ libgnutls_la_LDFLAGS += $(LTLIBTASN1) endif if HAVE_LD_OUTPUT_DEF -libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(SOVERSION).def +libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(DLL_VERSION).def defexecdir = $(bindir) -defexec_DATA = libgnutls-$(SOVERSION).def +defexec_DATA = libgnutls-$(DLL_VERSION).def DISTCLEANFILES += $(defexec_DATA) endif diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index fa8e5cd6eb..a52e8a4c62 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -31,8 +31,8 @@ AC_DEFUN([LIBGNUTLS_HOOKS], AC_SUBST(LT_AGE, 13) # Used when creating the Windows libgnutls-XX.def files. - SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}` - AC_SUBST(SOVERSION) + DLL_VERSION=`expr ${LT_CURRENT} - ${LT_AGE}` + AC_SUBST(DLL_VERSION) AC_LIB_HAVE_LINKFLAGS(gcrypt,, [#include <gcrypt.h>], [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128]) diff --git a/libextra/Makefile.am b/libextra/Makefile.am index 669dd84805..1faa5e55fe 100644 --- a/libextra/Makefile.am +++ b/libextra/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation # # Author: Nikos Mavrogiannopoulos # @@ -74,8 +74,8 @@ endif if HAVE_LD_OUTPUT_DEF libgnutls_openssl_la_LDFLAGS += \ - -Wl,--output-def,libgnutls-openssl-$(SOVERSION).def -defexec_DATA += libgnutls-openssl-$(SOVERSION).def + -Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def +defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def endif endif @@ -93,8 +93,8 @@ libgnutls_extra_la_SOURCES += \ if HAVE_LD_OUTPUT_DEF libgnutls_extra_la_LDFLAGS += \ - -Wl,--output-def,libgnutls-extra-$(SOVERSION).def -defexec_DATA += libgnutls-extra-$(SOVERSION).def + -Wl,--output-def,libgnutls-extra-$(DLL_VERSION).def +defexec_DATA += libgnutls-extra-$(DLL_VERSION).def endif DISTCLEANFILES += $(defexec_DATA) |