summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-08-20 11:06:20 +1000
committerDamien Miller <djm@mindrot.org>2014-08-20 11:06:20 +1000
commitc5089ecaec3b2c02f014f4e67518390702a4ba14 (patch)
treef0976079f608ef309c6536f76a7bac33f1d5a776
parent2195847e503a382f83ee969b0a8bd3dfe0e55c18 (diff)
- (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 94c4beeb3..2ab238d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
12014020 12014020
2 - (djm) [configure.ac] Check OpenSSL version is supported at configure time; 2 - (djm) [configure.ac] Check OpenSSL version is supported at configure time;
3 suggested by Kevin Brott 3 suggested by Kevin Brott
4 - (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than
5 -L/-l; fixes linking problems on some platforms
4 6
520140819 720140819
6 - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen 8 - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
diff --git a/Makefile.in b/Makefile.in
index 78a4cba98..0302b6c41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.362 2014/07/18 20:33:12 dtucker Exp $ 1# $Id: Makefile.in,v 1.363 2014/08/20 01:06:21 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@
@@ -456,7 +456,7 @@ UNITTESTS_TEST_SSHBUF_OBJS=\
456regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \ 456regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \
457 regress/unittests/test_helper/libtest_helper.a libssh.a 457 regress/unittests/test_helper/libtest_helper.a libssh.a
458 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \ 458 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \
459 -L regress/unittests/test_helper -ltest_helper \ 459 regress/unittests/test_helper/libtest_helper.a \
460 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 460 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
461 461
462UNITTESTS_TEST_SSHKEY_OBJS=\ 462UNITTESTS_TEST_SSHKEY_OBJS=\