- Better KrbIV / AFS detection, based on patch from:

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2f2e31e81970075adfecc07b20bbd6503247d9df..23f0058228f356e16d859b0979aaf6fbf2b9386e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,34 +21,43 @@ 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@
 LDFLAGS=-L. @LDFLAGS@
 
 GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
 GNOME_LIBS=`gnome-config --libs gnome gnomeui`
 
-OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \
+OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o auth-pam.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 \
+  bsd-login.o bsd-misc.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 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 
 
-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 \
+LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-misc.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 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 
 
-all: $(OBJS) $(TARGETS) manpages
+SSHOBJS= ssh.o sshconnect.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
+
+MANPAGES=scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8
+
+CONFIGFILES=sshd_config ssh_config
+
+all: $(OBJS) $(TARGETS) $(MANPAGES) $(CONFIGFILES)
 
 $(OBJS): config.h
 
@@ -58,16 +67,11 @@ libssh.a: $(LIBOBJS)
        $(AR) rv $@ $(LIBOBJS)
        $(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)
+ssh: $(SSHOBJS) libssh.a
+       $(CC) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS)
 
-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)
+sshd:  $(SSHDOBJS) libssh.a
+       $(CC) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS)
 
 scp:   scp.o libssh.a
        $(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) 
@@ -88,11 +92,31 @@ clean:
        rm -f *.o $(TARGETS) config.status config.cache config.log core \
                *.1 *.8 sshd_config ssh_config
 
-manpages:
-       $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/*.1.in $(srcdir)/*.8.in \
-               $(srcdir)/ssh_config.in $(srcdir)/sshd_config.in
+scp.1: scp.1.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} $(srcdir)/scp.1.in
+
+ssh-add.1: ssh-add.1.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-add.1.in
+
+ssh-agent.1: ssh-agent.1.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-agent.1.in
+
+ssh-keygen.1: ssh-keygen.1.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh-keygen.1.in
+
+ssh.1: ssh.1.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh.1.in
+
+sshd.8: sshd.8.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} sshd.8.in
+
+sshd_config: sshd_config.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} sshd_config.in
+
+ssh_config: ssh_config.in
+       $(PERL) $(FIXPATHS) -Dsysconfdir=${sysconfdir} ssh_config.in
 
-install: all
+install: $(TARGETS)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(sbindir)
        $(INSTALL) -d $(mandir)