summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile83
-rw-r--r--Makefile.in40
-rw-r--r--openssh.spec12
3 files changed, 22 insertions, 113 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 64f389f62..000000000
--- a/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
1# Generated automatically from Makefile.in by configure.
2prefix=/usr/local
3exec_prefix=${prefix}
4bindir=${exec_prefix}/bin
5sbindir=${exec_prefix}/sbin
6libdir=${exec_prefix}/lib
7mandir=${prefix}/man
8
9CC=gcc
10OPT_FLAGS=-g
11CFLAGS=$(OPT_FLAGS) -Wall -DETCDIR=\"${prefix}/etc\" -DHAVE_CONFIG_H
12TARGETS=bin/libssh.a bin/ssh bin/sshd bin/ssh-add bin/ssh-keygen bin/ssh-agent bin/scp
13LFLAGS=-L./bin
14LIBS=-lssh -lpam -ldl -lpwdb -lz -lutil -lcrypto
15AR=ar
16RANLIB=ranlib
17
18OBJS= authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \
19 auth-rsa.o bufaux.o buffer.o canohost.o channels.o cipher.o \
20 clientloop.o compress.o crc32.o deattack.o helper.o hostfile.o \
21 log-client.o login.o log-server.o match.o mpaux.o packet.o pty.o \
22 readconf.o readpass.o rsa.o servconf.o serverloop.o \
23 sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o \
24 helper.o mktemp.o strlcpy.o rc4.o
25
26all: $(OBJS) $(TARGETS)
27
28bin/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
29 [ -d bin ] || mkdir bin
30 $(AR) rv $@ $^
31 $(RANLIB) $@
32
33bin/ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o
34 [ -d bin ] || mkdir bin
35 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
36
37bin/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
38 [ -d bin ] || mkdir bin
39 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
40
41bin/scp: scp.o
42 [ -d bin ] || mkdir bin
43 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
44
45bin/ssh-add: ssh-add.o log-client.o
46 [ -d bin ] || mkdir bin
47 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
48
49bin/ssh-agent: ssh-agent.o log-client.o
50 [ -d bin ] || mkdir bin
51 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
52
53bin/ssh-keygen: ssh-keygen.o log-client.o
54 [ -d bin ] || mkdir bin
55 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
56
57clean:
58 rm -f *.o core bin/* config.status config.cache config.log
59
60install:
61 install -d $(bindir)
62 install -d $(sbindir)
63 install -d $(mandir)
64 install -d $(mandir)/man1
65 install -d $(mandir)/man8
66 install -s -c bin/ssh $(bindir)/ssh
67 install -s -c bin/scp $(bindir)/scp
68 install -s -c bin/ssh-add $(bindir)/ssh-add
69 install -s -c bin/ssh-agent $(bindir)/ssh-agent
70 install -s -c bin/ssh-keygen $(bindir)/ssh-keygen
71 install -s -c bin/sshd $(sbindir)/sshd
72 install -m644 -c ssh.1 $(mandir)/man1/ssh.1
73 install -m644 -c scp.1 $(mandir)/man1/scp.1
74 install -m644 -c ssh-add.1 $(mandir)/man1/ssh-add.1
75 install -m644 -c ssh-agent.1 $(mandir)/man1/ssh-agent.1
76 install -m644 -c ssh-keygen.1 $(mandir)/man1/ssh-keygen.1
77 install -m644 -c sshd.8 $(mandir)/man8/sshd.8
78
79distclean: clean
80 rm -f Makefile config.h *~
81 rm -rf bin
82
83mrproper: distclean
diff --git a/Makefile.in b/Makefile.in
index d1aec1330..6217c5848 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,8 +8,8 @@ mandir=@mandir@
8CC=@CC@ 8CC=@CC@
9OPT_FLAGS=-g 9OPT_FLAGS=-g
10CFLAGS=$(OPT_FLAGS) -Wall -DETCDIR=\"@sysconfdir@\" @DEFS@ 10CFLAGS=$(OPT_FLAGS) -Wall -DETCDIR=\"@sysconfdir@\" @DEFS@
11TARGETS=bin/libssh.a bin/ssh bin/sshd bin/ssh-add bin/ssh-keygen bin/ssh-agent bin/scp 11TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp
12LFLAGS=-L./bin 12LFLAGS=-L.
13LIBS=-lssh @LIBS@ 13LIBS=-lssh @LIBS@
14AR=@AR@ 14AR=@AR@
15RANLIB=@RANLIB@ 15RANLIB=@RANLIB@
@@ -24,37 +24,30 @@ OBJS= authfd.o authfile.o auth-passwd.o auth-rhosts.o auth-rh-rsa.o \
24 24
25all: $(OBJS) $(TARGETS) 25all: $(OBJS) $(TARGETS)
26 26
27bin/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 27libssh.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
28 [ -d bin ] || mkdir bin
29 $(AR) rv $@ $^ 28 $(AR) rv $@ $^
30 $(RANLIB) $@ 29 $(RANLIB) $@
31 30
32bin/ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o 31ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o
33 [ -d bin ] || mkdir bin
34 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 32 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
35 33
36bin/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 34sshd: 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
37 [ -d bin ] || mkdir bin
38 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 35 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
39 36
40bin/scp: scp.o 37scp: scp.o
41 [ -d bin ] || mkdir bin
42 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 38 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
43 39
44bin/ssh-add: ssh-add.o log-client.o 40ssh-add: ssh-add.o log-client.o
45 [ -d bin ] || mkdir bin
46 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 41 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
47 42
48bin/ssh-agent: ssh-agent.o log-client.o 43ssh-agent: ssh-agent.o log-client.o
49 [ -d bin ] || mkdir bin
50 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 44 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
51 45
52bin/ssh-keygen: ssh-keygen.o log-client.o 46ssh-keygen: ssh-keygen.o log-client.o
53 [ -d bin ] || mkdir bin
54 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 47 $(CC) -o $@ $^ $(LFLAGS) $(LIBS)
55 48
56clean: 49clean:
57 rm -f *.o core bin/* config.status config.cache config.log 50 rm -f *.o core $(TARGETS) config.status config.cache config.log
58 51
59install: 52install:
60 install -d $(bindir) 53 install -d $(bindir)
@@ -62,12 +55,12 @@ install:
62 install -d $(mandir) 55 install -d $(mandir)
63 install -d $(mandir)/man1 56 install -d $(mandir)/man1
64 install -d $(mandir)/man8 57 install -d $(mandir)/man8
65 install -s -c bin/ssh $(bindir)/ssh 58 install -s -c ssh $(bindir)/ssh
66 install -s -c bin/scp $(bindir)/scp 59 install -s -c scp $(bindir)/scp
67 install -s -c bin/ssh-add $(bindir)/ssh-add 60 install -s -c ssh-add $(bindir)/ssh-add
68 install -s -c bin/ssh-agent $(bindir)/ssh-agent 61 install -s -c ssh-agent $(bindir)/ssh-agent
69 install -s -c bin/ssh-keygen $(bindir)/ssh-keygen 62 install -s -c ssh-keygen $(bindir)/ssh-keygen
70 install -s -c bin/sshd $(sbindir)/sshd 63 install -s -c sshd $(sbindir)/sshd
71 install -m644 -c ssh.1 $(mandir)/man1/ssh.1 64 install -m644 -c ssh.1 $(mandir)/man1/ssh.1
72 install -m644 -c scp.1 $(mandir)/man1/scp.1 65 install -m644 -c scp.1 $(mandir)/man1/scp.1
73 install -m644 -c ssh-add.1 $(mandir)/man1/ssh-add.1 66 install -m644 -c ssh-add.1 $(mandir)/man1/ssh-add.1
@@ -77,6 +70,5 @@ install:
77 70
78distclean: clean 71distclean: clean
79 rm -f Makefile config.h core configure *~ 72 rm -f Makefile config.h core configure *~
80 rm -rf bin
81 73
82mrproper: distclean 74mrproper: distclean
diff --git a/openssh.spec b/openssh.spec
index 0ee946892..fe6c137b8 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -52,12 +52,12 @@ install -m755 sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
52install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config 52install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config
53install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config 53install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config
54 54
55install -s -m755 bin/sshd $RPM_BUILD_ROOT/usr/sbin 55install -s -m755 sshd $RPM_BUILD_ROOT/usr/sbin
56install -s -m755 bin/ssh $RPM_BUILD_ROOT/usr/bin 56install -s -m755 ssh $RPM_BUILD_ROOT/usr/bin
57install -s -m755 bin/scp $RPM_BUILD_ROOT/usr/bin 57install -s -m755 scp $RPM_BUILD_ROOT/usr/bin
58install -s -m755 bin/ssh-agent $RPM_BUILD_ROOT/usr/bin 58install -s -m755 ssh-agent $RPM_BUILD_ROOT/usr/bin
59install -s -m755 bin/ssh-add $RPM_BUILD_ROOT/usr/bin 59install -s -m755 ssh-add $RPM_BUILD_ROOT/usr/bin
60install -s -m755 bin/ssh-keygen $RPM_BUILD_ROOT/usr/bin 60install -s -m755 ssh-keygen $RPM_BUILD_ROOT/usr/bin
61 61
62install -m644 sshd.8 $RPM_BUILD_ROOT/usr/man/man8 62install -m644 sshd.8 $RPM_BUILD_ROOT/usr/man/man8
63install -m644 ssh.1 $RPM_BUILD_ROOT/usr/man/man1 63install -m644 ssh.1 $RPM_BUILD_ROOT/usr/man/man1
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 12:47:06 +0000