- Added BSD compatible install program and autoconf test, thanks to

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 73c4db766eb6abfac15418974b275bb7d95f1c8d..ec7f0fd7519bcf9dbc649661e3415e891e4374b9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
-libdir=@libdir@
+libexecdir=@libexecdir@
 mandir=@mandir@
 sysconfdir=@sysconfdir@
 
@@ -17,28 +17,31 @@ TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@
+INSTALL=@INSTALL@
+LFLAGS=@LDFLAGS@
 
 GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
 GNOME_LIBS=`gnome-config --libs gnome gnomeui`
 
 OBJS=  authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \
-               auth-rsa.o bufaux.o buffer.o canohost.o channels.o cipher.o \
-               clientloop.o compress.o crc32.o deattack.o helper.o hostfile.o \
-               log-client.o login.o log-server.o match.o mpaux.o packet.o pty.o \
-               readconf.o readpass.o rsa.o servconf.o serverloop.o \
+               auth-rsa.o auth-skey.o bufaux.o buffer.o canohost.o channels.o \
+               cipher.o clientloop.o compress.o crc32.o deattack.o helper.o \
+               hostfile.o log-client.o login.o log-server.o match.o mpaux.o \
+               packet.o pty.o readconf.o readpass.o rsa.o servconf.o serverloop.o \
                sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \
-               helper.o mktemp.o strlcpy.o rc4.o
+               helper.o bsd-mktemp.o bsd-strlcpy.o bsd-strlcat.o bsd-daemon.o \
+               bsd-login.o rc4.o md5crypt.o
 
 all: $(OBJS) $(TARGETS)
 
-libssh.a: authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o hostfile.o match.o mpaux.o nchan.o packet.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o helper.o rc4.o mktemp.o strlcpy.o log.o fingerprint.o
+libssh.a: authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o hostfile.o match.o mpaux.o nchan.o packet.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o helper.o rc4.o bsd-mktemp.o bsd-strlcpy.o bsd-strlcat.o log.o fingerprint.o
        $(AR) rv $@ $^
        $(RANLIB) $@
 
 ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a
        $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
-sshd:  sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o libssh.a
+sshd:  sshd.o auth-rhosts.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 bsd-daemon.o md5crypt.o libssh.a
        $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
 scp:   scp.o libssh.a
@@ -60,40 +63,40 @@ clean:
        rm -f *.o core $(TARGETS) config.status config.cache config.log
 
 install: all
-       install -d $(bindir)
-       install -d $(sbindir)
-       install -d $(mandir)
-       install -d $(mandir)/man1
-       install -d $(mandir)/man8
-       install -s -c ssh $(bindir)/ssh
-       install -s -c scp $(bindir)/scp
-       install -s -c ssh-add $(bindir)/ssh-add
-       install -s -c ssh-agent $(bindir)/ssh-agent
-       install -s -c ssh-keygen $(bindir)/ssh-keygen
-       install -s -c sshd $(sbindir)/sshd
-       install -m644 -c ssh.1 $(mandir)/man1/ssh.1
-       install -m644 -c scp.1 $(mandir)/man1/scp.1
-       install -m644 -c ssh-add.1 $(mandir)/man1/ssh-add.1
-       install -m644 -c ssh-agent.1 $(mandir)/man1/ssh-agent.1
-       install -m644 -c ssh-keygen.1 $(mandir)/man1/ssh-keygen.1
-       install -m644 -c sshd.8 $(mandir)/man8/sshd.8
+       $(INSTALL) -d $(bindir)
+       $(INSTALL) -d $(sbindir)
+       $(INSTALL) -d $(mandir)
+       $(INSTALL) -d $(mandir)/man1
+       $(INSTALL) -d $(mandir)/man8
+       $(INSTALL) -s -c ssh $(bindir)/ssh
+       $(INSTALL) -s -c scp $(bindir)/scp
+       $(INSTALL) -s -c ssh-add $(bindir)/ssh-add
+       $(INSTALL) -s -c ssh-agent $(bindir)/ssh-agent
+       $(INSTALL) -s -c ssh-keygen $(bindir)/ssh-keygen
+       $(INSTALL) -s -c sshd $(sbindir)/sshd
+       $(INSTALL) -m644 -c ssh.1 $(mandir)/man1/ssh.1
+       $(INSTALL) -m644 -c scp.1 $(mandir)/man1/scp.1
+       $(INSTALL) -m644 -c ssh-add.1 $(mandir)/man1/ssh-add.1
+       $(INSTALL) -m644 -c ssh-agent.1 $(mandir)/man1/ssh-agent.1
+       $(INSTALL) -m644 -c ssh-keygen.1 $(mandir)/man1/ssh-keygen.1
+       $(INSTALL) -m644 -c sshd.8 $(mandir)/man8/sshd.8
        ln -sf ssh $(bindir)/slogin
        ln -sf ssh.1 $(mandir)/man1/slogin.1
 
        if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
-               install -d $(libdir) ; \
-               install -d $(libexecdir)/ssh ; \
+               $(INSTALL) -d $(libexecdir) ; \
+               $(INSTALL) -d $(libexecdir)/ssh ; \
                if [ -z "@GNOME_ASKPASS@" ] ; then \
-                       install -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
+                       $(INSTALL) -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
                else \
-                       install -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
+                       $(INSTALL) -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
                fi ; \
        fi
 
        if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \
-               install -d $(sysconfdir); \
-               install -m644 ssh_config $(sysconfdir)/ssh_config; \
-               install -m644 sshd_config $(sysconfdir)/sshd_config; \
+               $(INSTALL) -d $(sysconfdir); \
+               $(INSTALL) -m644 ssh_config $(sysconfdir)/ssh_config; \
+               $(INSTALL) -m644 sshd_config $(sysconfdir)/sshd_config; \
        fi
 
 distclean: clean