summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-08-21 10:47:54 +1000
committerDamien Miller <djm@mindrot.org>2014-08-21 10:47:54 +1000
commitaa6598ebb3343c7380e918388e10e8ca5852b613 (patch)
treeb94cd14858b9f47203dcf69538bdc7ebdb8bf4eb
parent54703e3cf63f0c80d4157e5ad7dbc2b363ee2c56 (diff)
- (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f28cff74..3b81314ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
12014020 120140821
2 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
3
420140820
2 - (djm) [configure.ac] Check OpenSSL version is supported at configure time; 5 - (djm) [configure.ac] Check OpenSSL version is supported at configure time;
3 suggested by Kevin Brott 6 suggested by Kevin Brott
4 - (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than 7 - (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than
diff --git a/Makefile.in b/Makefile.in
index 0302b6c41..35887a8ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.363 2014/08/20 01:06:21 djm Exp $ 1# $Id: Makefile.in,v 1.364 2014/08/21 00:47:55 djm Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -469,7 +469,7 @@ UNITTESTS_TEST_SSHKEY_OBJS=\
469regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ 469regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
470 regress/unittests/test_helper/libtest_helper.a libssh.a 470 regress/unittests/test_helper/libtest_helper.a libssh.a
471 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHKEY_OBJS) \ 471 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHKEY_OBJS) \
472 -L regress/unittests/test_helper -ltest_helper \ 472 regress/unittests/test_helper/libtest_helper.a \
473 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 473 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
474 474
475REGRESS_BINARIES=\ 475REGRESS_BINARIES=\