From ca0457cfffe612e84a9a16b02696b76921619755 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 20 May 2016 12:07:57 +0200 Subject: tests: do not use pkglib to generate libpkcs11mock1.so 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. --- tests/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 391ae2e93e..7b52b78e4f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -63,8 +63,6 @@ endif noinst_LTLIBRARIES = libutils.la libutils_la_SOURCES = utils.h utils.c -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 \ @@ -99,9 +97,9 @@ mini_dtls_pthread_LDADD = $(LDADD) -lpthread if ENABLE_PKCS11 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 pkcs11_cert_import_url_exts_SOURCES = pkcs11/pkcs11-cert-import-url-exts.c pkcs11_cert_import_url_exts_DEPENDENCIES = libpkcs11mock1.la libutils.la -- cgit v1.2.1