X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/a0f842515b12cb99dae3b68f35038a27dd6a9fb5..278a05ad21a7e1729abc503ff0a1a1085b2da7f9:/Makefile.in diff --git a/Makefile.in b/Makefile.in index 72ac0a81..4a6bf954 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4,164 +4,246 @@ bindir=@bindir@ sbindir=@sbindir@ libexecdir=@libexecdir@ mandir=@mandir@ +mansubdir=@mansubdir@ sysconfdir=@sysconfdir@ +piddir=@piddir@ +srcdir=@srcdir@ +top_srcdir=@top_srcdir@ + +DESTDIR= -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH=@srcdir@ SSH_PROGRAM=@bindir@/ssh -ASKPASS_LOCATION=@libexecdir@/ssh -ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass -FIXPATHS=@top_srcdir@/fixpaths +ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass CC=@CC@ +LD=@LD@ PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ -EXTRA_TARGETS=@GNOME_ASKPASS@ -TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) LIBS=@LIBS@ -LIBWRAP=@LIBWRAP@ AR=@AR@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ PERL=@PERL@ +ENT=@ENT@ +XAUTH_PATH=@XAUTH_PATH@ LDFLAGS=-L. @LDFLAGS@ +EXEEXT=@EXEEXT@ +SSH_MODE= @SSHMODE@ + +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$(EXEEXT) + +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 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 util.o uuencode.o xmalloc.o + +LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-getcwd.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-strsep.o bsd-strtok.o bsd-vis.o bsd-setproctitle.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o + +SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o + +SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-skey.o auth2-skey.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o dh.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o -GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` -GNOME_LIBS=`gnome-config --libs gnome gnomeui` +TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 +CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh-keyscan.0 ssh.0 sshd.0 sftp-server.0 +MANPAGES = @MANTYPE@ -OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \ - auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \ - bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o \ - bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \ - compress.o crc32.o deattack.o helper.o helper.o hostfile.o \ - log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \ - packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \ - serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \ - xmalloc.o +CONFIGFILES=sshd_config ssh_config primes -LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.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 fingerprint.o helper.o \ - hostfile.o log.o match.o mpaux.o nchan.o packet.o \ - radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \ - xmalloc.o +PATHSUBS = \ + -D/etc/ssh_config=$(sysconfdir)/ssh_config \ + -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \ + -D/etc/sshd_config=$(sysconfdir)/sshd_config \ + -D/usr/libexec=$(libexecdir) \ + -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \ + -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key \ + -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \ + -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \ + -D/var/run/sshd.pid=$(piddir)/sshd.pid \ + -D/etc/primes=$(sysconfdir)/primes \ + -D/etc/sshrc=$(sysconfdir)/sshrc \ + -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) -all: $(OBJS) $(TARGETS) manpages +FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) -$(OBJS): config.h +all: $(TARGETS) $(CONFIGFILES) -$(LIBOBJS): config.h +manpages: $(MANPAGES) -libssh.a: $(LIBOBJS) - $(AR) rv $@ $(LIBOBJS) +$(LIBSSH_OBJS): config.h + +$(LIBOPENBSD_COMPAT_OBJS): config.h + +libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) + $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS) $(RANLIB) $@ -ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a - $(CC) -o $@ ssh.o sshconnect.o log-client.o readconf.o \ - clientloop.o $(LDFLAGS) -lssh $(LIBS) +libssh.a: $(LIBSSH_OBJS) + $(AR) rv $@ $(LIBSSH_OBJS) + $(RANLIB) $@ -sshd: sshd.o auth-rhosts.o auth-krb4.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 libssh.a - $(CC) -o $@ sshd.o auth-rhosts.o auth-krb4.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 $(LDFLAGS) -lssh $(LIBS) $(LIBWRAP) +ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS) + $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -scp: scp.o libssh.a - $(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) +sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -ssh-add: ssh-add.o log-client.o libssh.a - $(CC) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS) +scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o + $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -ssh-agent: ssh-agent.o log-client.o libssh.a - $(CC) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS) +ssh-add$(EXEEXT): 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-keygen: ssh-keygen.o log-client.o libssh.a - $(CC) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) +ssh-agent$(EXEEXT): libopenbsd-compat.a libssh.a ssh-agent.o log-client.o + $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -gnome-ssh-askpass: gnome-ssh-askpass.c - $(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS) +ssh-keygen$(EXEEXT): libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o + $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -clean: - rm -f *.o $(TARGETS) config.status config.cache config.log core \ - *.1 *.8 sshd_config ssh_config - -manpages: - $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \ - $(srcdir)/ssh_config.in $(srcdir)/sshd_config.in - -install: all - $(INSTALL) -d $(bindir) - $(INSTALL) -d $(sbindir) - $(INSTALL) -d $(mandir) - $(INSTALL) -d $(mandir)/man1 - $(INSTALL) -d $(mandir)/man8 - $(INSTALL) -s ssh $(bindir)/ssh - $(INSTALL) -s scp $(bindir)/scp - $(INSTALL) -s ssh-add $(bindir)/ssh-add - $(INSTALL) -s ssh-agent $(bindir)/ssh-agent - $(INSTALL) -s ssh-keygen $(bindir)/ssh-keygen - $(INSTALL) -s sshd $(sbindir)/sshd - $(INSTALL) -m 644 ssh.1 $(mandir)/man1/ssh.1 - $(INSTALL) -m 644 scp.1 $(mandir)/man1/scp.1 - $(INSTALL) -m 644 ssh-add.1 $(mandir)/man1/ssh-add.1 - $(INSTALL) -m 644 ssh-agent.1 $(mandir)/man1/ssh-agent.1 - $(INSTALL) -m 644 ssh-keygen.1 $(mandir)/man1/ssh-keygen.1 - $(INSTALL) -m 644 sshd.8 $(mandir)/man8/sshd.8 - -rm -f $(bindir)/slogin - ln -s ssh $(bindir)/slogin - -rm -f $(mandir)/man1/slogin.1 - ln -s ssh.1 $(mandir)/man1/slogin.1 - - if [ ! -z "@GNOME_ASKPASS@" ] ; then \ - $(INSTALL) -d $(libexecdir) ; \ - $(INSTALL) -d $(libexecdir)/ssh ; \ - $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_LOCATION} ; \ - fi +ssh-keyscan$(EXEEXT): libopenbsd-compat.a libssh.a log-client.o ssh-keyscan.o + $(LD) -o $@ ssh-keyscan.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) - if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ - $(INSTALL) -d $(sysconfdir); \ - $(INSTALL) -m 644 ssh_config $(sysconfdir)/ssh_config; \ - $(INSTALL) -m 644 sshd_config $(sysconfdir)/sshd_config; \ - fi +sftp-server$(EXEEXT): libopenbsd-compat.a libssh.a sftp-server.o log-server.o + $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -uninstallall: uninstall - -rm -f $(sysconfdir)/ssh_config - -rm -f $(sysconfdir)/sshd_config - -rmdir $(sysconfdir) - -rmdir $(bindir) - -rmdir $(sbindir) - -rmdir $(mandir)/man1 - -rmdir $(mandir)/man8 - -rmdir $(mandir) - -rmdir $(libexecdir) +# test driver for the loginrec code - not built by default +logintest: logintest.o libopenbsd-compat.a libssh.a log-client.o loginrec.o + $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log-client.o $(LIBS) -uninstall: - -rm -f $(bindir)/ssh - -rm -f $(bindir)/scp - -rm -f $(bindir)/ssh-add - -rm -f $(bindir)/ssh-agent - -rm -f $(bindir)/ssh-keygen - -rm -f $(sbindir)/sshd - -rm -f $(mandir)/man1/ssh.1 - -rm -f $(mandir)/man1/scp.1 - -rm -f $(mandir)/man1/ssh-add.1 - -rm -f $(mandir)/man1/ssh-agent.1 - -rm -f $(mandir)/man1/ssh-keygen.1 - -rm -f $(mandir)/man8/sshd.8 - -rm -f $(bindir)/slogin - -rm -f $(mandir)/man1/slogin.1 - -rm -f ${ASKPASS_PROGRAM} - -rmdir $(libexecdir)/ssh ; +$(MANPAGES) $(CONFIGFILES):: + $(FIXPATHSCMD) $(srcdir)/$@ + +clean: + rm -f *.o *.a $(TARGETS) logintest 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 veryclean: distclean - rm -f configure config.h.in + rm -f configure config.h.in *.0 + +catman-do: + @for f in $(TROFFMAN) ; do \ + echo "$$f -> $${f%%.[18]}.0" ; \ + nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ + >$${f%%.[18]}.0 ; \ + done + +distprep: catman-do + autoreconf + +install: manpages $(TARGETS) install-files host-key + +install-files: + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 + $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 + $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) + $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh + $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp + $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add + $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent + $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen + $(INSTALL) -m 0775 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan + $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd + $(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(libexecdir)/sftp-server + $(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 + $(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + $(INSTALL) -m 644 ssh-add.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 + $(INSTALL) -m 644 ssh-agent.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 + $(INSTALL) -m 644 ssh-keygen.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 + $(INSTALL) -m 644 ssh-keyscan.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 + $(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 + $(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 + -rm -f $(DESTDIR)$(bindir)/slogin + ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin + if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ + fi + if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ + $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/ssh_config already exists, install will not overwrite"; \ + fi + if [ ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ + $(INSTALL) -m 644 sshd_config.out $(DESTDIR)$(sysconfdir)/sshd_config; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ + fi + if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ + $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ + if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ + $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \ + fi ; \ + fi + if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \ + $(INSTALL) -m 644 primes.out $(DESTDIR)$(sysconfdir)/primes; \ + else \ + echo "$(DESTDIR)$(sysconfdir)/primes already exists, install will not overwrite"; \ + fi + +host-key: ssh-keygen$(EXEEXT) + if [ -z "$(DESTDIR)" ] ; then \ + if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ + echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ + else \ + ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ + fi ; \ + if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ + echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ + else \ + ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ + fi ; \ + if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key ] ; then \ + echo "$(DESTDIR)$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \ + else \ + ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" ; \ + fi ; \ + fi ; + +host-key-force: ssh-keygen$(EXEEXT) + ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" + ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" + ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_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) + -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1 + -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8 + -rmdir $(DESTDIR)$(mandir) + -rmdir $(DESTDIR)$(libexecdir) + +uninstall: + -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) + -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) + -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 + -rm -f $(DESTDIR)$(bindir)/slogin + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + -rm -f $(DESTDIR)${ASKPASS_PROGRAM} + -rmdir $(DESTDIR)$(libexecdir)/ssh ;