1c1
< # $Id: Makefile.in,v 1.326 2012/04/04 01:27:57 djm Exp $
---
> # $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim Exp $
40c40
< -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \
---
> -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\"
46a47,48
> K5LIBS=@K5LIBS@
> GSSLIBS=@GSSLIBS@
64,65c66,67
< LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
< canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
---
> LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \
> canohost.o channels.o cipher.o cipher-aes.o \
73,74c75,76
< msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
< schnorr.o ssh-pkcs11.o
---
> msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \
> jpake.o schnorr.o ssh-pkcs11.o krl.o
142c144
< $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS)
---
> $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)
145c147
< $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS)
---
> $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)
197a200,206
> # special case target for umac128
> umac128.o: umac.c
> $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \
> -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \
> -Dumac_update=umac128_update -Dumac_final=umac128_final \
> -Dumac_delete=umac128_delete
>
375c384,389
< tests interop-tests: $(TARGETS)
---
> regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
> [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
> $(CC) $(CPPFLAGS) -o $@ $? \
> $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
>
> tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT)