diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-09 14:28:55 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-09 14:28:55 +1000 |
commit | 16e519cb9c11fd55f08c1d259a275f729711511b (patch) | |
tree | 1a30a8477a923721e06e203370b760c470254808 /Makefile.in | |
parent | 30c3d429306bb4afe71c18db92816b981f7b6d9d (diff) |
- Moved all the bsd-* and fake-* stuff into new libopenbsd-compat.a
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 8d2c71b95..39f2f9959 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -33,7 +33,9 @@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | |||
33 | 33 | ||
34 | TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) | 34 | TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) |
35 | 35 | ||
36 | LIBOBJS= atomicio.o authfd.o authfile.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dispatch.o dsa.o fake-getaddrinfo.o fake-getnameinfo.o fingerprint.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o | 36 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dispatch.o dsa.o fingerprint.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o |
37 | |||
38 | LIBOPENBSD_COMPAT_OBJS=bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o fake-getaddrinfo.o fake-getnameinfo.o | ||
37 | 39 | ||
38 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o | 40 | SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o |
39 | 41 | ||
@@ -53,29 +55,35 @@ all: $(TARGETS) $(CONFIGFILES) | |||
53 | 55 | ||
54 | manpages: $(MANPAGES) | 56 | manpages: $(MANPAGES) |
55 | 57 | ||
56 | $(LIBOBJS): config.h | 58 | $(LIBSSH_OBJS): config.h |
59 | |||
60 | $(LIBOPENBSD_COMPAT_OBJS): config.h | ||
61 | |||
62 | libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) | ||
63 | $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS) | ||
64 | $(RANLIB) $@ | ||
57 | 65 | ||
58 | libssh.a: $(LIBOBJS) | 66 | libssh.a: $(LIBSSH_OBJS) |
59 | $(AR) rv $@ $(LIBOBJS) | 67 | $(AR) rv $@ $(LIBSSH_OBJS) |
60 | $(RANLIB) $@ | 68 | $(RANLIB) $@ |
61 | 69 | ||
62 | ssh: libssh.a $(SSHOBJS) | 70 | ssh: libopenbsd-compat.a libssh.a $(SSHOBJS) |
63 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS) | 71 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
64 | 72 | ||
65 | sshd: libssh.a $(SSHDOBJS) | 73 | sshd: libssh.a libopenbsd-compat.a $(SSHDOBJS) |
66 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS) | 74 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
67 | 75 | ||
68 | scp: libssh.a scp.o | 76 | scp: libopenbsd-compat.a libssh.a scp.o |
69 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) | 77 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
70 | 78 | ||
71 | ssh-add: libssh.a ssh-add.o log-client.o | 79 | ssh-add: libopenbsd-compat.a libssh.a ssh-add.o log-client.o |
72 | $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS) | 80 | $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
73 | 81 | ||
74 | ssh-agent: libssh.a ssh-agent.o log-client.o | 82 | ssh-agent: libopenbsd-compat.a libssh.a ssh-agent.o log-client.o |
75 | $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS) | 83 | $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
76 | 84 | ||
77 | ssh-keygen: libssh.a ssh-keygen.o log-client.o | 85 | ssh-keygen: libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o |
78 | $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) | 86 | $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
79 | 87 | ||
80 | $(MANPAGES) $(CONFIGFILES):: | 88 | $(MANPAGES) $(CONFIGFILES):: |
81 | $(FIXPATHSCMD) $(srcdir)/$@ | 89 | $(FIXPATHSCMD) $(srcdir)/$@ |