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 58d67a5d..063fa5c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,7 +19,7 @@ CC=@CC@ LD=@LD@ PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@ +CPPFLAGS=@CPPFLAGS@ -I. -Iopenbsd-compat/ -I$(srcdir) $(PATHS) @DEFS@ LIBS=@LIBS@ AR=@AR@ RANLIB=@RANLIB@ @@ -27,7 +27,7 @@ INSTALL=@INSTALL@ PERL=@PERL@ ENT=@ENT@ XAUTH_PATH=@XAUTH_PATH@ -LDFLAGS=-L. @LDFLAGS@ +LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ EXEEXT=@EXEEXT@ SSH_MODE= @SSHMODE@ @@ -37,9 +37,7 @@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER) -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 - -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 +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 SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o @@ -79,9 +77,8 @@ $(LIBOPENBSD_COMPAT_OBJS): config.h .c.o: $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) - $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS) - $(RANLIB) $@ +libopenbsd-compat.a: + (cd openbsd-compat; make) libssh.a: $(LIBSSH_OBJS) $(AR) rv $@ $(LIBSSH_OBJS) @@ -119,10 +116,12 @@ $(MANPAGES) $(CONFIGFILES):: $(FIXPATHSCMD) $(srcdir)/$@ clean: + (cd openbsd-compat; make clean) rm -f *.o *.a $(TARGETS) logintest config.cache config.log rm -f *.out core distclean: clean + (cd openbsd-compat; make distclean) rm -f Makefile config.h config.status ssh_prng_cmds *~ mrproper: distclean |