- Moved all the bsd-* and fake-* stuff into new libopenbsd-compat.a

4 files changed, 27 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 698aa3fc0..eb94cf17d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,7 @@
     - handle escapes in real and original key format, ok millert@
     [version.h]
     - OpenSSH-2.1
-
+ - Moved all the bsd-* and fake-* stuff into new libopenbsd-compat.a
 
 20000508
  - Makefile and RPM spec fixes
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@
 
 TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
 
-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 
+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 
+
+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 
 
 SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
 
@@ -53,29 +55,35 @@ all: $(TARGETS) $(CONFIGFILES)
 
 manpages: $(MANPAGES)
 
-$(LIBOBJS): config.h
+$(LIBSSH_OBJS): config.h
+
+$(LIBOPENBSD_COMPAT_OBJS): config.h
+
+libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)
+        $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS)
+        $(RANLIB) $@
 
-libssh.a: $(LIBOBJS)
-        $(AR) rv $@ $(LIBOBJS)
+libssh.a: $(LIBSSH_OBJS)
+        $(AR) rv $@ $(LIBSSH_OBJS)
         $(RANLIB) $@
 
-ssh: libssh.a $(SSHOBJS)
-        $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS)
+ssh: libopenbsd-compat.a libssh.a $(SSHOBJS)
+        $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-sshd: libssh.a  $(SSHDOBJS)
-        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS)
+sshd: libssh.a  libopenbsd-compat.a $(SSHDOBJS)
+        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-scp: libssh.a scp.o
-        $(LD) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) 
+scp: libopenbsd-compat.a libssh.a scp.o
+        $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-ssh-add: libssh.a ssh-add.o log-client.o
-        $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
+ssh-add: libopenbsd-compat.a libssh.a ssh-add.o log-client.o
+        $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-ssh-agent: libssh.a ssh-agent.o log-client.o
-        $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
+ssh-agent: libopenbsd-compat.a libssh.a ssh-agent.o log-client.o
+        $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
-ssh-keygen: libssh.a ssh-keygen.o log-client.o
-        $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
+ssh-keygen: libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o
+        $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
 $(MANPAGES) $(CONFIGFILES)::
         $(FIXPATHSCMD) $(srcdir)/$@
diff --git a/TODO b/TODO
index 649f8e5c6..8fa2fdc87 100644
--- a/TODO
+++ b/TODO
@@ -7,8 +7,6 @@
 - Replace the horror in acconfig.h which tries to comphensate for the 
   lack of u_intXX_t types. There must be a better way.
 
-- Move all compatability cruft (bsd-*, fake-*) into subordinate library
-
 - Cleanup configure.in
 
 - Load / write random seed on startup / exit
diff --git a/includes.h b/includes.h
index 56878a040..da1ee9ced 100644
--- a/includes.h
+++ b/includes.h
@@ -89,22 +89,8 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
 #include "version.h"
 
-/* BSD function replacements */
-#include "bsd-bindresvport.h"
-#include "bsd-rresvport.h"
-#include "bsd-misc.h"
-#include "bsd-strlcpy.h"
-#include "bsd-strlcat.h"
-#include "bsd-mktemp.h"
-#include "bsd-snprintf.h"
-#include "bsd-daemon.h"
-#include "bsd-login.h"
-#include "bsd-base64.h"
-
-/* rfc2553 socket API replacements */
-#include "fake-getaddrinfo.h"
-#include "fake-getnameinfo.h"
-#include "fake-socket.h"
+/* OpenBSD function replacements */
+#include "openbsd-compat.h"
 
 /* Entropy collection */
 #include "entropy.h"