- HPUX and Configure fixes from Lutz Jaenicke

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 43870d5f94e89d4ffae3e9069f56c90a8d9bdc2f..584f3054dca7923997066c83b2a0d762a2cde460 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,15 +27,20 @@ AR=@AR@
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 PERL=@PERL@
+ENT=@ENT@
 LDFLAGS=-L. @LDFLAGS@
 
+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-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 fake-getaddrinfo.o fake-getnameinfo.o fingerprint.o hostfile.o key.o log.o match.o mpaux.o nchan.o packet.o radix.o random.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o 
+LIBSSH_OBJS=atomicio.o authfd.o authfile.o aux.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 log-client.o readconf.o clientloop.o
+SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
 
-SSHDOBJS= sshd.o auth-rhosts.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o md5crypt.o session.o auth.o
+SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-rhosts.o auth-krb4.o auth-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o md5crypt.o session.o
 
 TROFFMAN       = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8
 CATMAN         = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh.0 sshd.0
@@ -47,41 +52,49 @@ PATHSUBS    = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/known_hosts=$(sysco
 
 FIXPATHSCMD    = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
 
-all: $(TARGETS) $(MANPAGES) $(CONFIGFILES)
+all: $(TARGETS) $(CONFIGFILES)
+
+manpages: $(MANPAGES)
+
+$(LIBSSH_OBJS): config.h
 
-$(LIBOBJS): config.h
+$(LIBOPENBSD_COMPAT_OBJS): config.h
 
-libssh.a: $(LIBOBJS)
-       $(AR) rv $@ $(LIBOBJS)
+libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)
+       $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS)
        $(RANLIB) $@
 
-ssh: libssh.a $(SSHOBJS)
-       $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS)
+libssh.a: $(LIBSSH_OBJS)
+       $(AR) rv $@ $(LIBSSH_OBJS)
+       $(RANLIB) $@
+
+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)/$@
 
 clean:
-       rm -f *.o *.a $(TARGETS) config.status config.cache config.log 
+       rm -f *.o *.a $(TARGETS) config.cache config.log 
        rm -f *.out core
 
 distclean: clean
-       rm -f Makefile config.h core *~
+       rm -f Makefile config.h config.status ssh_prng_cmds *~
 
 mrproper: distclean
 
@@ -95,12 +108,12 @@ catman-do:
                        >$${f%%.[18]}.0 ; \
        done
 
-install: $(TARGETS)
-       $(INSTALL) -d $(DESTDIR)$(bindir)
-       $(INSTALL) -d $(DESTDIR)$(sbindir)
-       $(INSTALL) -d $(DESTDIR)$(mandir)
-       $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)1
-       $(INSTALL) -d $(DESTDIR)$(mandir)/$(mansubdir)8
+install: manpages $(TARGETS)
+       ./mkinstalldirs $(DESTDIR)$(bindir)
+       ./mkinstalldirs $(DESTDIR)$(sbindir)
+       ./mkinstalldirs $(DESTDIR)$(mandir)
+       ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
+       ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
        $(INSTALL) -m 4755 -s ssh $(DESTDIR)$(bindir)/ssh
        $(INSTALL) -s scp $(DESTDIR)$(bindir)/scp
        $(INSTALL) -s ssh-add $(DESTDIR)$(bindir)/ssh-add
@@ -119,17 +132,23 @@ install: $(TARGETS)
        ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 
        if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
-               $(INSTALL) -d $(DESTDIR)$(sysconfdir); \
+               ./mkinstalldirs $(DESTDIR)$(sysconfdir); \
                $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \
                $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \
        fi
+       if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
+               $(PERL) fixprogs ssh_prng_cmds $(ENT); \
+               $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
+       fi
 
 host-key: ssh-keygen
-       ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N ''
+       ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N ""
+       ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N ""
 
 uninstallall:  uninstall
        -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
        -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
+       -rm -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds
        -rmdir $(DESTDIR)$(sysconfdir)
        -rmdir $(DESTDIR)$(bindir)
        -rmdir $(DESTDIR)$(sbindir)