X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/2ddcfdf30a369bcd684e8f61064656d0592e5f90..dfb95100b75341034315ecf6ad77f4130457afed:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 298790a3..23f00582 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,97 +6,180 @@ libexecdir=@libexecdir@
 mandir=@mandir@
 sysconfdir=@sysconfdir@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH=@srcdir@
+
 SSH_PROGRAM=@bindir@/ssh
-ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass
+ASKPASS_LOCATION=@libexecdir@/ssh
+ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass
+FIXPATHS=@top_srcdir@/fixpaths
 
 CC=@CC@
-PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DASKPASS_PROGRAM=\"$(ASKPASS_PROGRAM)\"
+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@
 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=	authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.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 bsd-mktemp.o bsd-strlcpy.o bsd-strlcat.o bsd-daemon.o \
-		bsd-login.o rc4.o md5crypt.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-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-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 
+
+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
 
-all: $(OBJS) $(TARGETS)
+CONFIGFILES=sshd_config ssh_config
 
-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 $@ $^
+all: $(OBJS) $(TARGETS) $(MANPAGES) $(CONFIGFILES)
+
+$(OBJS): config.h
+
+$(LIBOBJS): config.h
+
+libssh.a: $(LIBOBJS)
+	$(AR) rv $@ $(LIBOBJS)
 	$(RANLIB) $@
 
-ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
+ssh: $(SSHOBJS) libssh.a
+	$(CC) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(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 bsd-login.o bsd-daemon.o md5crypt.o libssh.a
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
+sshd:	$(SSHDOBJS) libssh.a
+	$(CC) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS)
 
 scp:	scp.o libssh.a
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
+	$(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) 
 
 ssh-add: ssh-add.o log-client.o libssh.a
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
+	$(CC) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
 
 ssh-agent: ssh-agent.o log-client.o libssh.a
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
+	$(CC) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
 
 ssh-keygen: ssh-keygen.o log-client.o libssh.a
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
+	$(CC) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
 
 gnome-ssh-askpass: gnome-ssh-askpass.c
 	$(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS)
 
 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
-	ln -sf ssh $(bindir)/slogin
-	ln -sf ssh.1 $(mandir)/man1/slogin.1
-
-	if [ "x@INSTALL_ASKPASS@" = "xyes" ] ; then \
-		install -d $(libexecdir) ; \
-		install -d $(libexecdir)/ssh ; \
-		if [ -z "@GNOME_ASKPASS@" ] ; then \
-			install -m755 -c ssh-askpass ${ASKPASS_PROGRAM}; \
-		else \
-			install -m755 -c gnome-ssh-askpass ${ASKPASS_PROGRAM}; \
-		fi ; \
+	rm -f *.o $(TARGETS) config.status config.cache config.log core \
+		*.1 *.8 sshd_config ssh_config
+
+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: $(TARGETS)
+	$(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
 
 	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) -m 644 ssh_config $(sysconfdir)/ssh_config; \
+		$(INSTALL) -m 644 sshd_config $(sysconfdir)/sshd_config; \
 	fi
 
+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)
+
+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 ;
+
 distclean: clean
 	rm -f Makefile config.h core *~