james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #133 from Yubico/distclean

Browse Source 
Use library dependencies for openssl compat layer
This commit is contained in:
Trevor Bentley
2017-11-29 10:56:55 +01:00
committed by GitHub
parent 5bc03bfc29 d46db8e181
commit ab6f3d668a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-and-test.sh
+1 -1
View File
@@ -69,7 +69,7 @@ elif [ "x$BUILD_OPENSSL_VERSION" = "x1.1" ]; then
make -f linux.mk VERSION=$version make -f linux.mk VERSION=$version
else else
./configure $COVERAGE ./configure $COVERAGE
make check make all check
if [ "x$COVERAGE" != "x" ]; then if [ "x$COVERAGE" != "x" ]; then
gem install coveralls-lcov gem install coveralls-lcov
coveralls-lcov coverage/app2.info coveralls-lcov coverage/app2.info
configure.ac
+1 -1
View File
@@ -37,7 +37,7 @@ AC_SUBST([LT_CURRENT], 5)
AC_SUBST([LT_REVISION], 0) AC_SUBST([LT_REVISION], 0)
AC_SUBST([LT_AGE], 4) AC_SUBST([LT_AGE], 4)
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_PROG_CC AC_PROG_CC
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
lib/tests/Makefile.am
+2 -1
View File
@@ -38,7 +38,8 @@ endif
LDADD = ../libykpiv.la $(OPENSSL_LIBS) LDADD = ../libykpiv.la $(OPENSSL_LIBS)
api_SOURCES = api.c ../../tool/openssl-compat.c ../../tool/openssl-compat.h api_LDADD = ../../tool/libpiv_util.la
api_SOURCES = api.c
check_PROGRAMS = basic parse_key api check_PROGRAMS = basic parse_key api
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
ykcs11/tests/Makefile.am
+2 -3
View File
@@ -42,9 +42,8 @@ else
AM_LDFLAGS += -no-install AM_LDFLAGS += -no-install
endif endif
ykcs11_tests_LDADD = ../libykcs11.la $(OPENSSL_LIBS) ykcs11_tests_LDADD = ../libykcs11.la $(OPENSSL_LIBS) ../../tool/libpiv_util.la
ykcs11_tests_SOURCES = ykcs11_tests.c
ykcs11_tests_SOURCES = ykcs11_tests.c ../../tool/openssl-compat.c ../../tool/openssl-compat.h
check_PROGRAMS = ykcs11_tests check_PROGRAMS = ykcs11_tests
TESTS = reset.sh $(check_PROGRAMS) TESTS = reset.sh $(check_PROGRAMS)