diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 5081c4bf3..dd0502e63 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.326 2012/04/04 01:27:57 djm Exp $ | 1 | # $Id: Makefile.in,v 1.336 2013/03/07 15:37:13 tim 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@ |
@@ -37,13 +37,15 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
37 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ | 37 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ |
38 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | 38 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ |
39 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 39 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
40 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ | 40 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" |
41 | 41 | ||
42 | CC=@CC@ | 42 | CC=@CC@ |
43 | LD=@LD@ | 43 | LD=@LD@ |
44 | CFLAGS=@CFLAGS@ | 44 | CFLAGS=@CFLAGS@ |
45 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 45 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
46 | LIBS=@LIBS@ | 46 | LIBS=@LIBS@ |
47 | K5LIBS=@K5LIBS@ | ||
48 | GSSLIBS=@GSSLIBS@ | ||
47 | SSHLIBS=@SSHLIBS@ | 49 | SSHLIBS=@SSHLIBS@ |
48 | SSHDLIBS=@SSHDLIBS@ | 50 | SSHDLIBS=@SSHDLIBS@ |
49 | LIBEDIT=@LIBEDIT@ | 51 | LIBEDIT=@LIBEDIT@ |
@@ -61,8 +63,8 @@ MANFMT=@MANFMT@ | |||
61 | 63 | ||
62 | TARGETS=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) | 64 | TARGETS=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) |
63 | 65 | ||
64 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 66 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
65 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ | 67 | canohost.o channels.o cipher.o cipher-aes.o \ |
66 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ | 68 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ |
67 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 69 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
68 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ | 70 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ |
@@ -71,8 +73,8 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
71 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
72 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ | 74 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ |
73 | kexgssc.o \ | 75 | kexgssc.o \ |
74 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \ | 76 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
75 | schnorr.o ssh-pkcs11.o | 77 | jpake.o schnorr.o ssh-pkcs11.o krl.o |
76 | 78 | ||
77 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 79 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
78 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ | 80 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ |
@@ -140,10 +142,10 @@ libssh.a: $(LIBSSH_OBJS) | |||
140 | $(RANLIB) $@ | 142 | $(RANLIB) $@ |
141 | 143 | ||
142 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | 144 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) |
143 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) | 145 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS) |
144 | 146 | ||
145 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 147 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
146 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) | 148 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) |
147 | 149 | ||
148 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | 150 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o |
149 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 151 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
@@ -196,6 +198,13 @@ $(CONFIGFILES): $(CONFIGFILES_IN) | |||
196 | moduli: | 198 | moduli: |
197 | echo | 199 | echo |
198 | 200 | ||
201 | # special case target for umac128 | ||
202 | umac128.o: umac.c | ||
203 | $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ | ||
204 | -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ | ||
205 | -Dumac_update=umac128_update -Dumac_final=umac128_final \ | ||
206 | -Dumac_delete=umac128_delete | ||
207 | |||
199 | clean: regressclean | 208 | clean: regressclean |
200 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 209 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
201 | rm -f *.out core survey | 210 | rm -f *.out core survey |
@@ -373,7 +382,12 @@ uninstall: | |||
373 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 382 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
374 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 383 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
375 | 384 | ||
376 | tests interop-tests: $(TARGETS) | 385 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c |
386 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
387 | $(CC) $(CPPFLAGS) -o $@ $? \ | ||
388 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
389 | |||
390 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | ||
377 | BUILDDIR=`pwd`; \ | 391 | BUILDDIR=`pwd`; \ |
378 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 392 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ |
379 | [ -f `pwd`/regress/Makefile ] || \ | 393 | [ -f `pwd`/regress/Makefile ] || \ |