summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2014-08-20 01:06:20 +0000
committerdjm <djm>2014-08-20 01:06:20 +0000
commit49d4c101b7659d6a7df135ef551692447b20ccfe (patch)
tree7c6df7096aadf796dea0446c4fcd81da14a9fece
parent5fcbcc50cf4bec609f1c9e82c3ecfd6760a54d49 (diff)
downloadopenssh-49d4c101b7659d6a7df135ef551692447b20ccfe.tar.gz
- (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than
-L/-l; fixes linking problems on some platforms
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 94c4beeb..2ab238d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2014020
- (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
+ -L/-l; fixes linking problems on some platforms
20140819
- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
diff --git a/Makefile.in b/Makefile.in
index 78a4cba9..0302b6c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.362 2014/07/18 20:33:12 dtucker Exp $
+# $Id: Makefile.in,v 1.363 2014/08/20 01:06:21 djm Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -456,7 +456,7 @@ UNITTESTS_TEST_SSHBUF_OBJS=\
regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \
regress/unittests/test_helper/libtest_helper.a libssh.a
$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \
- -L regress/unittests/test_helper -ltest_helper \
+ regress/unittests/test_helper/libtest_helper.a \
-lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
UNITTESTS_TEST_SSHKEY_OBJS=\