summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-20 12:07:57 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-20 13:22:12 +0200
commit509c01fa14521544df352072b341bca55ccd0f64 (patch)
tree52833574877cac59759e504d6b3c59360ab02551
parentc64cf1bd357b397763ce289f3c590bed0e6fffcf (diff)
downloadgnutls-509c01fa14521544df352072b341bca55ccd0f64.tar.gz
tests: do not use pkglib to generate libpkcs11mock1.sognutls_3_3_23_win32
This resulted in the test library being installed. Install we use noinst for the library, but pass -rpath to LDFLAGS as a hack to for libtool to generate the shared version.
-rw-r--r--tests/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 05a754cd2c..4bd03bfc76 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -69,8 +69,6 @@ noinst_LTLIBRARIES = libutils.la
libutils_la_SOURCES = utils.h utils.c
libutils_la_LIBADD = ../gl/libgnu.la
-pkglib_LTLIBRARIES =
-
ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \
mpi certificate_set_x509_crl dn parse_ca moredn record-sizes \
hostname-check cve-2008-4989 pkcs12_s2k chainverify record-sizes-range \
@@ -94,9 +92,9 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \
if ENABLE_PKCS11
if !HAVE_BUGGY_P11_KIT
if !WINDOWS
-pkglib_LTLIBRARIES += libpkcs11mock1.la
+noinst_LTLIBRARIES += libpkcs11mock1.la
libpkcs11mock1_la_SOURCES = pkcs11/pkcs11-mock.c pkcs11/pkcs11-mock.h
-libpkcs11mock1_la_LDFLAGS = -module -no-undefined -avoid-version
+libpkcs11mock1_la_LDFLAGS = -shared -rpath $(pkglibdir) -module -no-undefined -avoid-version
libpkcs11mock1_la_LIBADD = ../gl/libgnu.la
pkcs11_cert_import_url_exts_SOURCES = pkcs11/pkcs11-cert-import-url-exts.c