summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-10-07 12:13:50 +0100
committerColin Watson <cjwatson@debian.org>2014-10-07 12:13:50 +0100
commit487bdb3a5ef6075887b830ccb8a0b14f6da78e93 (patch)
treea2cff6fec1e6c4b4153a170a3e172cfe6bfdec46 /Makefile.in
parent796ba4fd011b5d0d9d78d592ba2f30fc9d5ed2e7 (diff)
parent28453d58058a4d60c3ebe7d7f0c31a510cbf6158 (diff)
Import openssh_6.7p1.orig.tar.gz
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in90
1 files changed, 80 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 28a8ec41b..06be3d5d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.356 2014/02/04 00:12:56 djm Exp $ 1# $Id: Makefile.in,v 1.365 2014/08/30 06:23:07 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@
@@ -29,6 +29,7 @@ SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
29PRIVSEP_PATH=@PRIVSEP_PATH@ 29PRIVSEP_PATH=@PRIVSEP_PATH@
30SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ 30SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
31STRIP_OPT=@STRIP_OPT@ 31STRIP_OPT=@STRIP_OPT@
32TEST_SHELL=@TEST_SHELL@
32 33
33PATHS= -DSSHDIR=\"$(sysconfdir)\" \ 34PATHS= -DSSHDIR=\"$(sysconfdir)\" \
34 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ 35 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -63,7 +64,16 @@ MANFMT=@MANFMT@
63 64
64TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) 65TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT)
65 66
66LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ 67LIBOPENSSH_OBJS=\
68 ssherr.o \
69 sshbuf.o \
70 sshkey.o \
71 sshbuf-getput-basic.o \
72 sshbuf-misc.o \
73 sshbuf-getput-crypto.o
74
75LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
76 authfd.o authfile.o bufaux.o bufbn.o buffer.o \
67 canohost.o channels.o cipher.o cipher-aes.o \ 77 canohost.o channels.o cipher.o cipher-aes.o \
68 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ 78 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
69 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ 79 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
@@ -135,7 +145,7 @@ $(SSHOBJS): Makefile.in config.h
135$(SSHDOBJS): Makefile.in config.h 145$(SSHDOBJS): Makefile.in config.h
136 146
137.c.o: 147.c.o:
138 $(CC) $(CFLAGS) $(CPPFLAGS) -c $< 148 $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
139 149
140LIBCOMPAT=openbsd-compat/libopenbsd-compat.a 150LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
141$(LIBCOMPAT): always 151$(LIBCOMPAT): always
@@ -214,6 +224,12 @@ umac128.o: umac.c
214clean: regressclean 224clean: regressclean
215 rm -f *.o *.a $(TARGETS) logintest config.cache config.log 225 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
216 rm -f *.out core survey 226 rm -f *.out core survey
227 rm -f regress/unittests/test_helper/*.a
228 rm -f regress/unittests/test_helper/*.o
229 rm -f regress/unittests/sshbuf/*.o
230 rm -f regress/unittests/sshbuf/test_sshbuf
231 rm -f regress/unittests/sshkey/*.o
232 rm -f regress/unittests/sshkey/test_sshkey
217 (cd openbsd-compat && $(MAKE) clean) 233 (cd openbsd-compat && $(MAKE) clean)
218 234
219distclean: regressclean 235distclean: regressclean
@@ -222,6 +238,12 @@ distclean: regressclean
222 rm -f Makefile buildpkg.sh config.h config.status 238 rm -f Makefile buildpkg.sh config.h config.status
223 rm -f survey.sh openbsd-compat/regress/Makefile *~ 239 rm -f survey.sh openbsd-compat/regress/Makefile *~
224 rm -rf autom4te.cache 240 rm -rf autom4te.cache
241 rm -f regress/unittests/test_helper/*.a
242 rm -f regress/unittests/test_helper/*.o
243 rm -f regress/unittests/sshbuf/*.o
244 rm -f regress/unittests/sshbuf/test_sshbuf
245 rm -f regress/unittests/sshkey/*.o
246 rm -f regress/unittests/sshkey/test_sshkey
225 (cd openbsd-compat && $(MAKE) distclean) 247 (cd openbsd-compat && $(MAKE) distclean)
226 if test -d pkg ; then \ 248 if test -d pkg ; then \
227 rm -fr pkg ; \ 249 rm -fr pkg ; \
@@ -394,23 +416,71 @@ uninstall:
394 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 416 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
395 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 417 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
396 418
397regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c 419regress-prep:
398 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress 420 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress
421 [ -d `pwd`/regress/unittests ] || mkdir -p `pwd`/regress/unittests
422 [ -d `pwd`/regress/unittests/test_helper ] || \
423 mkdir -p `pwd`/regress/unittests/test_helper
424 [ -d `pwd`/regress/unittests/sshbuf ] || \
425 mkdir -p `pwd`/regress/unittests/sshbuf
426 [ -d `pwd`/regress/unittests/sshkey ] || \
427 mkdir -p `pwd`/regress/unittests/sshkey
399 [ -f `pwd`/regress/Makefile ] || \ 428 [ -f `pwd`/regress/Makefile ] || \
400 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile 429 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
430
431regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
401 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ 432 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
402 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 433 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
403 434
404regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c 435regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
405 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress
406 [ -f `pwd`/regress/Makefile ] || \
407 ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
408 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ 436 $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
409 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) 437 $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
410 438
411tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) regress/setuid-allowed$(EXEEXT) 439UNITTESTS_TEST_HELPER_OBJS=\
440 regress/unittests/test_helper/test_helper.o \
441 regress/unittests/test_helper/fuzz.o
442
443regress/unittests/test_helper/libtest_helper.a: ${UNITTESTS_TEST_HELPER_OBJS}
444 $(AR) rv $@ $(UNITTESTS_TEST_HELPER_OBJS)
445 $(RANLIB) $@
446
447UNITTESTS_TEST_SSHBUF_OBJS=\
448 regress/unittests/sshbuf/tests.o \
449 regress/unittests/sshbuf/test_sshbuf.o \
450 regress/unittests/sshbuf/test_sshbuf_getput_basic.o \
451 regress/unittests/sshbuf/test_sshbuf_getput_crypto.o \
452 regress/unittests/sshbuf/test_sshbuf_misc.o \
453 regress/unittests/sshbuf/test_sshbuf_fuzz.o \
454 regress/unittests/sshbuf/test_sshbuf_getput_fuzz.o \
455 regress/unittests/sshbuf/test_sshbuf_fixed.o
456
457regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \
458 regress/unittests/test_helper/libtest_helper.a libssh.a
459 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \
460 regress/unittests/test_helper/libtest_helper.a \
461 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
462
463UNITTESTS_TEST_SSHKEY_OBJS=\
464 regress/unittests/sshkey/test_fuzz.o \
465 regress/unittests/sshkey/tests.o \
466 regress/unittests/sshkey/common.o \
467 regress/unittests/sshkey/test_file.o \
468 regress/unittests/sshkey/test_sshkey.o
469
470regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
471 regress/unittests/test_helper/libtest_helper.a libssh.a
472 $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHKEY_OBJS) \
473 regress/unittests/test_helper/libtest_helper.a \
474 -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
475
476REGRESS_BINARIES=\
477 regress/modpipe$(EXEEXT) \
478 regress/setuid-allowed$(EXEEXT) \
479 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
480 regress/unittests/sshkey/test_sshkey$(EXEEXT)
481
482tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
412 BUILDDIR=`pwd`; \ 483 BUILDDIR=`pwd`; \
413 TEST_SHELL="@TEST_SHELL@"; \
414 TEST_SSH_SCP="$${BUILDDIR}/scp"; \ 484 TEST_SSH_SCP="$${BUILDDIR}/scp"; \
415 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 485 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
416 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ 486 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
@@ -434,7 +504,6 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) regress/setuid-allowed$
434 OBJ="$${BUILDDIR}/regress/" \ 504 OBJ="$${BUILDDIR}/regress/" \
435 PATH="$${BUILDDIR}:$${PATH}" \ 505 PATH="$${BUILDDIR}:$${PATH}" \
436 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ 506 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
437 TEST_SHELL="$${TEST_SHELL}" \
438 TEST_SSH_SCP="$${TEST_SSH_SCP}" \ 507 TEST_SSH_SCP="$${TEST_SSH_SCP}" \
439 TEST_SSH_SSH="$${TEST_SSH_SSH}" \ 508 TEST_SSH_SSH="$${TEST_SSH_SSH}" \
440 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ 509 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
@@ -450,6 +519,7 @@ tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) regress/setuid-allowed$
450 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ 519 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
451 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ 520 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
452 TEST_SSH_ECC="$${TEST_SSH_ECC}" \ 521 TEST_SSH_ECC="$${TEST_SSH_ECC}" \
522 TEST_SHELL="${TEST_SHELL}" \
453 EXEEXT="$(EXEEXT)" \ 523 EXEEXT="$(EXEEXT)" \
454 $@ && echo all tests passed 524 $@ && echo all tests passed
455 525