diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 58d67a5d5..063fa5c70 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -19,7 +19,7 @@ CC=@CC@ | |||
19 | LD=@LD@ | 19 | LD=@LD@ |
20 | PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" | 20 | PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" |
21 | CFLAGS=@CFLAGS@ | 21 | CFLAGS=@CFLAGS@ |
22 | CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@ | 22 | CPPFLAGS=@CPPFLAGS@ -I. -Iopenbsd-compat/ -I$(srcdir) $(PATHS) @DEFS@ |
23 | LIBS=@LIBS@ | 23 | LIBS=@LIBS@ |
24 | AR=@AR@ | 24 | AR=@AR@ |
25 | RANLIB=@RANLIB@ | 25 | RANLIB=@RANLIB@ |
@@ -27,7 +27,7 @@ INSTALL=@INSTALL@ | |||
27 | PERL=@PERL@ | 27 | PERL=@PERL@ |
28 | ENT=@ENT@ | 28 | ENT=@ENT@ |
29 | XAUTH_PATH=@XAUTH_PATH@ | 29 | XAUTH_PATH=@XAUTH_PATH@ |
30 | LDFLAGS=-L. @LDFLAGS@ | 30 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
31 | EXEEXT=@EXEEXT@ | 31 | EXEEXT=@EXEEXT@ |
32 | SSH_MODE= @SSHMODE@ | 32 | SSH_MODE= @SSHMODE@ |
33 | 33 | ||
@@ -37,9 +37,7 @@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | |||
37 | 37 | ||
38 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER) | 38 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER) |
39 | 39 | ||
40 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o cygwin_util.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o | 40 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o |
41 | |||
42 | LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-getcwd.o bsd-getgrouplist.o bsd-inet_aton.o bsd-inet_ntoa.o bsd-misc.o bsd-mktemp.o bsd-realpath.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bsd-strmode.o bsd-strsep.o bsd-strtok.o bsd-vis.o bsd-setproctitle.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o | ||
43 | 41 | ||
44 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o | 42 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o |
45 | 43 | ||
@@ -79,9 +77,8 @@ $(LIBOPENBSD_COMPAT_OBJS): config.h | |||
79 | .c.o: | 77 | .c.o: |
80 | $(CC) $(CFLAGS) $(CPPFLAGS) -c $< | 78 | $(CC) $(CFLAGS) $(CPPFLAGS) -c $< |
81 | 79 | ||
82 | libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) | 80 | libopenbsd-compat.a: |
83 | $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS) | 81 | (cd openbsd-compat; make) |
84 | $(RANLIB) $@ | ||
85 | 82 | ||
86 | libssh.a: $(LIBSSH_OBJS) | 83 | libssh.a: $(LIBSSH_OBJS) |
87 | $(AR) rv $@ $(LIBSSH_OBJS) | 84 | $(AR) rv $@ $(LIBSSH_OBJS) |
@@ -119,10 +116,12 @@ $(MANPAGES) $(CONFIGFILES):: | |||
119 | $(FIXPATHSCMD) $(srcdir)/$@ | 116 | $(FIXPATHSCMD) $(srcdir)/$@ |
120 | 117 | ||
121 | clean: | 118 | clean: |
119 | (cd openbsd-compat; make clean) | ||
122 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 120 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
123 | rm -f *.out core | 121 | rm -f *.out core |
124 | 122 | ||
125 | distclean: clean | 123 | distclean: clean |
124 | (cd openbsd-compat; make distclean) | ||
126 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | 125 | rm -f Makefile config.h config.status ssh_prng_cmds *~ |
127 | 126 | ||
128 | mrproper: distclean | 127 | mrproper: distclean |