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 9a286a390..5b2431d4a 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@ |
@@ -39,13 +39,15 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
39 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | 39 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ |
40 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 40 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
41 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ | 41 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ |
42 | -D_PATH_SSH_DATADIR=\"$(SSH_DATADIR)\" \ | 42 | -D_PATH_SSH_DATADIR=\"$(SSH_DATADIR)\" |
43 | 43 | ||
44 | CC=@CC@ | 44 | CC=@CC@ |
45 | LD=@LD@ | 45 | LD=@LD@ |
46 | CFLAGS=@CFLAGS@ | 46 | CFLAGS=@CFLAGS@ |
47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
48 | LIBS=@LIBS@ | 48 | LIBS=@LIBS@ |
49 | K5LIBS=@K5LIBS@ | ||
50 | GSSLIBS=@GSSLIBS@ | ||
49 | SSHLIBS=@SSHLIBS@ | 51 | SSHLIBS=@SSHLIBS@ |
50 | SSHDLIBS=@SSHDLIBS@ | 52 | SSHDLIBS=@SSHDLIBS@ |
51 | LIBEDIT=@LIBEDIT@ | 53 | LIBEDIT=@LIBEDIT@ |
@@ -63,8 +65,8 @@ MANFMT=@MANFMT@ | |||
63 | 65 | ||
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) ssh-vulnkey$(EXEEXT) | 66 | 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) ssh-vulnkey$(EXEEXT) |
65 | 67 | ||
66 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 68 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
67 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ | 69 | canohost.o channels.o cipher.o cipher-aes.o \ |
68 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ | 70 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ |
69 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 71 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
70 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ | 72 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ |
@@ -73,8 +75,8 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
73 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 75 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
74 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ | 76 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ |
75 | kexgssc.o \ | 77 | kexgssc.o \ |
76 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \ | 78 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
77 | schnorr.o ssh-pkcs11.o | 79 | jpake.o schnorr.o ssh-pkcs11.o krl.o |
78 | 80 | ||
79 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 81 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
80 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ | 82 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ |
@@ -143,10 +145,10 @@ libssh.a: $(LIBSSH_OBJS) | |||
143 | $(RANLIB) $@ | 145 | $(RANLIB) $@ |
144 | 146 | ||
145 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | 147 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) |
146 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) | 148 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS) |
147 | 149 | ||
148 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 150 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
149 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) | 151 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) |
150 | 152 | ||
151 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | 153 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o |
152 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 154 | $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
@@ -202,6 +204,13 @@ $(CONFIGFILES): $(CONFIGFILES_IN) | |||
202 | moduli: | 204 | moduli: |
203 | echo | 205 | echo |
204 | 206 | ||
207 | # special case target for umac128 | ||
208 | umac128.o: umac.c | ||
209 | $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ | ||
210 | -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ | ||
211 | -Dumac_update=umac128_update -Dumac_final=umac128_final \ | ||
212 | -Dumac_delete=umac128_delete | ||
213 | |||
205 | clean: regressclean | 214 | clean: regressclean |
206 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 215 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
207 | rm -f *.out core survey | 216 | rm -f *.out core survey |
@@ -384,7 +393,12 @@ uninstall: | |||
384 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 393 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
385 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
386 | 395 | ||
387 | tests interop-tests: $(TARGETS) | 396 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c |
397 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
398 | $(CC) $(CPPFLAGS) -o $@ $? \ | ||
399 | $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
400 | |||
401 | tests interop-tests: $(TARGETS) regress/modpipe$(EXEEXT) | ||
388 | BUILDDIR=`pwd`; \ | 402 | BUILDDIR=`pwd`; \ |
389 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 403 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ |
390 | [ -f `pwd`/regress/Makefile ] || \ | 404 | [ -f `pwd`/regress/Makefile ] || \ |