- Remove autoconf generated Makefile from CVS

 - Stripped subdirectories from CVS server
 - Fixed makefile to suit

3 files changed, 22 insertions, 113 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 64f389f6..00000000
--- a/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-prefix=/usr/local
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-sbindir=${exec_prefix}/sbin
-libdir=${exec_prefix}/lib
-mandir=${prefix}/man
-
-CC=gcc
-OPT_FLAGS=-g
-CFLAGS=$(OPT_FLAGS) -Wall -DETCDIR=\"${prefix}/etc\" -DHAVE_CONFIG_H
-TARGETS=bin/libssh.a bin/ssh bin/sshd bin/ssh-add bin/ssh-keygen bin/ssh-agent bin/scp
-LFLAGS=-L./bin
-LIBS=-lssh -lpam -ldl -lpwdb -lz -lutil -lcrypto 
-AR=ar
-RANLIB=ranlib
-
-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 \
-		sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \
-		helper.o mktemp.o strlcpy.o rc4.o
-
-all: $(OBJS) $(TARGETS)
-
-bin/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
-	[ -d bin ] || mkdir bin
-	$(AR) rv $@ $^
-	$(RANLIB) $@
-
-bin/ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o
-	[ -d bin ] || mkdir bin
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
-
-bin/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
-	[ -d bin ] || mkdir bin
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
-
-bin/scp:	scp.o
-	[ -d bin ] || mkdir bin
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
-
-bin/ssh-add: ssh-add.o log-client.o
-	[ -d bin ] || mkdir bin
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
-
-bin/ssh-agent: ssh-agent.o log-client.o
-	[ -d bin ] || mkdir bin
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
-
-bin/ssh-keygen: ssh-keygen.o log-client.o
-	[ -d bin ] || mkdir bin
-	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
-
-clean:
-	rm -f *.o core bin/* config.status config.cache config.log
-	
-install:
-	install -d $(bindir)
-	install -d $(sbindir)
-	install -d $(mandir)
-	install -d $(mandir)/man1
-	install -d $(mandir)/man8
-	install -s -c bin/ssh $(bindir)/ssh
-	install -s -c bin/scp $(bindir)/scp
-	install -s -c bin/ssh-add $(bindir)/ssh-add
-	install -s -c bin/ssh-agent $(bindir)/ssh-agent
-	install -s -c bin/ssh-keygen $(bindir)/ssh-keygen
-	install -s -c bin/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
-
-distclean: clean
-	rm -f Makefile config.h *~
-	rm -rf bin
-
-mrproper: distclean
diff --git a/Makefile.in b/Makefile.in
index d1aec133..6217c584 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,8 +8,8 @@ mandir=@mandir@
 CC=@CC@
 OPT_FLAGS=-g
 CFLAGS=$(OPT_FLAGS) -Wall -DETCDIR=\"@sysconfdir@\" @DEFS@
-TARGETS=bin/libssh.a bin/ssh bin/sshd bin/ssh-add bin/ssh-keygen bin/ssh-agent bin/scp
-LFLAGS=-L./bin
+TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp
+LFLAGS=-L.
 LIBS=-lssh @LIBS@
 AR=@AR@
 RANLIB=@RANLIB@
@@ -24,37 +24,30 @@ OBJS=	authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \
 
 all: $(OBJS) $(TARGETS)
 
-bin/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
-	[ -d bin ] || mkdir bin
+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
 	$(AR) rv $@ $^
 	$(RANLIB) $@
 
-bin/ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o
-	[ -d bin ] || mkdir bin
+ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o
 	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
-bin/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
-	[ -d bin ] || mkdir bin
+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
 	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
-bin/scp:	scp.o
-	[ -d bin ] || mkdir bin
+scp:	scp.o
 	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
-bin/ssh-add: ssh-add.o log-client.o
-	[ -d bin ] || mkdir bin
+ssh-add: ssh-add.o log-client.o
 	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
-bin/ssh-agent: ssh-agent.o log-client.o
-	[ -d bin ] || mkdir bin
+ssh-agent: ssh-agent.o log-client.o
 	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
-bin/ssh-keygen: ssh-keygen.o log-client.o
-	[ -d bin ] || mkdir bin
+ssh-keygen: ssh-keygen.o log-client.o
 	$(CC) -o $@ $^ $(LFLAGS) $(LIBS) 
 
 clean:
-	rm -f *.o core bin/* config.status config.cache config.log
+	rm -f *.o core $(TARGETS) config.status config.cache config.log
 	
 install:
 	install -d $(bindir)
@@ -62,12 +55,12 @@ install:
 	install -d $(mandir)
 	install -d $(mandir)/man1
 	install -d $(mandir)/man8
-	install -s -c bin/ssh $(bindir)/ssh
-	install -s -c bin/scp $(bindir)/scp
-	install -s -c bin/ssh-add $(bindir)/ssh-add
-	install -s -c bin/ssh-agent $(bindir)/ssh-agent
-	install -s -c bin/ssh-keygen $(bindir)/ssh-keygen
-	install -s -c bin/sshd $(sbindir)/sshd
+	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
@@ -77,6 +70,5 @@ install:
 
 distclean: clean
 	rm -f Makefile config.h core configure *~
-	rm -rf bin
 
 mrproper: distclean
diff --git a/openssh.spec b/openssh.spec
index 0ee94689..fe6c137b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -52,12 +52,12 @@ install -m755 sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
 install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config
 install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config
 
-install -s -m755 bin/sshd $RPM_BUILD_ROOT/usr/sbin
-install -s -m755 bin/ssh $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/scp $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/ssh-agent $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/ssh-add $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/ssh-keygen $RPM_BUILD_ROOT/usr/bin
+install -s -m755 sshd $RPM_BUILD_ROOT/usr/sbin
+install -s -m755 ssh $RPM_BUILD_ROOT/usr/bin
+install -s -m755 scp $RPM_BUILD_ROOT/usr/bin
+install -s -m755 ssh-agent $RPM_BUILD_ROOT/usr/bin
+install -s -m755 ssh-add $RPM_BUILD_ROOT/usr/bin
+install -s -m755 ssh-keygen $RPM_BUILD_ROOT/usr/bin
 
 install -m644 sshd.8 $RPM_BUILD_ROOT/usr/man/man8
 install -m644 ssh.1 $RPM_BUILD_ROOT/usr/man/man1