summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2014-08-21 00:47:54 +0000
committerdjm <djm>2014-08-21 00:47:54 +0000
commit5d63a530169a0892b29866aed6b1ab6bbfee3631 (patch)
tree2b5bf8cc92cf34a5359d5f0a71cdf745a1ab9353
parent411bfb4e5a4c37581245d4e3bf924f6acf0cad95 (diff)
downloadopenssh-5d63a530169a0892b29866aed6b1ab6bbfee3631.tar.gz
- (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 9f28cff7..3b81314a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2014020
+20140821
+ - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
+
+20140820
- (djm) [configure.ac] Check OpenSSL version is supported at configure time;
suggested by Kevin Brott
- (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than
diff --git a/Makefile.in b/Makefile.in
index 0302b6c4..35887a8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.363 2014/08/20 01:06:21 djm Exp $
+# $Id: Makefile.in,v 1.364 2014/08/21 00:47:55 djm Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -469,7 +469,7 @@ UNITTESTS_TEST_SSHKEY_OBJS=\
regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
regress/unittests/test_helper/libtest_helper.a libssh.a
$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHKEY_OBJS) \
- -L regress/unittests/test_helper -ltest_helper \
+ regress/unittests/test_helper/libtest_helper.a \
-lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
REGRESS_BINARIES=\