summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in19
1 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index e10f3742a..5870e9e6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -236,6 +236,8 @@ clean: regressclean
236 rm -f regress/unittests/sshkey/test_sshkey 236 rm -f regress/unittests/sshkey/test_sshkey
237 rm -f regress/unittests/bitmap/*.o 237 rm -f regress/unittests/bitmap/*.o
238 rm -f regress/unittests/bitmap/test_bitmap 238 rm -f regress/unittests/bitmap/test_bitmap
239 rm -f regress/unittests/conversion/*.o
240 rm -f regress/unittests/conversion/test_conversion
239 rm -f regress/unittests/hostkeys/*.o 241 rm -f regress/unittests/hostkeys/*.o
240 rm -f regress/unittests/hostkeys/test_hostkeys 242 rm -f regress/unittests/hostkeys/test_hostkeys
241 rm -f regress/unittests/kex/*.o 243 rm -f regress/unittests/kex/*.o
@@ -262,6 +264,8 @@ distclean: regressclean
262 rm -f regress/unittests/sshkey/test_sshkey 264 rm -f regress/unittests/sshkey/test_sshkey
263 rm -f regress/unittests/bitmap/*.o 265 rm -f regress/unittests/bitmap/*.o
264 rm -f regress/unittests/bitmap/test_bitmap 266 rm -f regress/unittests/bitmap/test_bitmap
267 rm -f regress/unittests/conversion/*.o
268 rm -f regress/unittests/conversion/test_conversion
265 rm -f regress/unittests/hostkeys/*.o 269 rm -f regress/unittests/hostkeys/*.o
266 rm -f regress/unittests/hostkeys/test_hostkeys 270 rm -f regress/unittests/hostkeys/test_hostkeys
267 rm -f regress/unittests/kex/*.o 271 rm -f regress/unittests/kex/*.o
@@ -426,6 +430,8 @@ regress-prep:
426 mkdir -p `pwd`/regress/unittests/sshkey 430 mkdir -p `pwd`/regress/unittests/sshkey
427 [ -d `pwd`/regress/unittests/bitmap ] || \ 431 [ -d `pwd`/regress/unittests/bitmap ] || \
428 mkdir -p `pwd`/regress/unittests/bitmap 432 mkdir -p `pwd`/regress/unittests/bitmap
433 [ -d `pwd`/regress/unittests/conversion ] || \
434 mkdir -p `pwd`/regress/unittests/conversion
429 [ -d `pwd`/regress/unittests/hostkeys ] || \ 435 [ -d `pwd`/regress/unittests/hostkeys ] || \
430 mkdir -p `pwd`/regress/unittests/hostkeys 436 mkdir -p `pwd`/regress/unittests/hostkeys
431 [ -d `pwd`/regress/unittests/kex ] || \ 437 [ -d `pwd`/regress/unittests/kex ] || \
@@ -503,6 +509,16 @@ regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
503 regress/unittests/test_helper/libtest_helper.a \ 509 regress/unittests/test_helper/libtest_helper.a \
504 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 510 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
505 511
512UNITTESTS_TEST_CONVERSION_OBJS=\
513 regress/unittests/conversion/tests.o
514
515regress/unittests/conversion/test_conversion$(EXEEXT): \
516 ${UNITTESTS_TEST_CONVERSION_OBJS} \
517 regress/unittests/test_helper/libtest_helper.a libssh.a
518 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_CONVERSION_OBJS) \
519 regress/unittests/test_helper/libtest_helper.a \
520 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
521
506UNITTESTS_TEST_KEX_OBJS=\ 522UNITTESTS_TEST_KEX_OBJS=\
507 regress/unittests/kex/tests.o \ 523 regress/unittests/kex/tests.o \
508 regress/unittests/kex/test_kex.o 524 regress/unittests/kex/test_kex.o
@@ -558,13 +574,14 @@ regress-binaries: regress/modpipe$(EXEEXT) \
558 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ 574 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
559 regress/unittests/sshkey/test_sshkey$(EXEEXT) \ 575 regress/unittests/sshkey/test_sshkey$(EXEEXT) \
560 regress/unittests/bitmap/test_bitmap$(EXEEXT) \ 576 regress/unittests/bitmap/test_bitmap$(EXEEXT) \
577 regress/unittests/conversion/test_conversion$(EXEEXT) \
561 regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ 578 regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \
562 regress/unittests/kex/test_kex$(EXEEXT) \ 579 regress/unittests/kex/test_kex$(EXEEXT) \
563 regress/unittests/match/test_match$(EXEEXT) \ 580 regress/unittests/match/test_match$(EXEEXT) \
564 regress/unittests/utf8/test_utf8$(EXEEXT) \ 581 regress/unittests/utf8/test_utf8$(EXEEXT) \
565 regress/misc/kexfuzz/kexfuzz$(EXEEXT) 582 regress/misc/kexfuzz/kexfuzz$(EXEEXT)
566 583
567tests interop-tests t-exec: regress-prep regress-binaries $(TARGETS) 584tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
568 BUILDDIR=`pwd`; \ 585 BUILDDIR=`pwd`; \
569 TEST_SSH_SCP="$${BUILDDIR}/scp"; \ 586 TEST_SSH_SCP="$${BUILDDIR}/scp"; \
570 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 587 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \