Deleted Added
sdiff udiff text old ( 124208 ) new ( 126274 )
full compact
Makefile.in (124208) Makefile.in (126274)
1# $Id: Makefile.in,v 1.249.2.1 2003/09/22 01:00:12 dtucker Exp $
1# $Id: Makefile.in,v 1.257 2004/02/18 03:35:11 djm Exp $
2
3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@
5
6AUTORECONF=autoreconf
7
8prefix=@prefix@
9exec_prefix=@exec_prefix@

--- 46 unchanged lines hidden (view full) ---

56LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
57EXEEXT=@EXEEXT@
58
59INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
60INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
61
62TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
63
2
3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@
5
6AUTORECONF=autoreconf
7
8prefix=@prefix@
9exec_prefix=@exec_prefix@

--- 46 unchanged lines hidden (view full) ---

56LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
57EXEEXT=@EXEEXT@
58
59INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
60INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
61
62TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
63
64LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \
65 cipher.o cipher-aes.o cipher-bf1.o cipher-ctr.o cipher-3des1.o \
66 compat.o compress.o crc32.o deattack.o fatal.o \
67 hostfile.o log.o match.o moduli.o mpaux.o nchan.o packet.o \
68 readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o atomicio.o \
69 key.o dispatch.o kex.o mac.o uuencode.o misc.o \
64LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \
65 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
66 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
67 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
68 log.o match.o moduli.o mpaux.o nchan.o packet.o \
69 readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \
70 atomicio.o key.o dispatch.o kex.o mac.o uuencode.o misc.o \
70 rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
71 kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
72 entropy.o scard-opensc.o gss-genr.o
73
74SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
75 sshconnect.o sshconnect1.o sshconnect2.o
76
77SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
78 sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \
79 auth.o auth1.o auth2.o auth-options.o session.o \
80 auth-chall.o auth2-chall.o groupaccess.o \
81 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
82 auth2-none.o auth2-passwd.o auth2-pubkey.o \
83 monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
84 kexdhs.o kexgexs.o \
85 auth-krb5.o \
86 auth2-gss.o gss-serv.o gss-serv-krb5.o \
71 rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
72 kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
73 entropy.o scard-opensc.o gss-genr.o
74
75SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
76 sshconnect.o sshconnect1.o sshconnect2.o
77
78SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
79 sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \
80 auth.o auth1.o auth2.o auth-options.o session.o \
81 auth-chall.o auth2-chall.o groupaccess.o \
82 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
83 auth2-none.o auth2-passwd.o auth2-pubkey.o \
84 monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
85 kexdhs.o kexgexs.o \
86 auth-krb5.o \
87 auth2-gss.o gss-serv.o gss-serv-krb5.o \
87 loginrec.o auth-pam.o auth-sia.o md5crypt.o
88 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o
88
89MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
90MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
91MANTYPE = @MANTYPE@
92
93CONFIGFILES=sshd_config.out ssh_config.out moduli.out
94CONFIGFILES_IN=sshd_config ssh_config moduli
95

--- 39 unchanged lines hidden (view full) ---

135
136sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
137 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
138
139scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
140 $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
141
142ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
89
90MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
91MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
92MANTYPE = @MANTYPE@
93
94CONFIGFILES=sshd_config.out ssh_config.out moduli.out
95CONFIGFILES_IN=sshd_config ssh_config moduli
96

--- 39 unchanged lines hidden (view full) ---

136
137sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
138 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
139
140scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
141 $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
142
143ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
143 $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
144 $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
144
145ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o
145
146ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o
146 $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
147 $(LD) -o $@ ssh-agent.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
147
148ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
148
149ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
149 $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
150 $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
150
151ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
151
152ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
152 $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
153 $(LD) -o $@ ssh-keysign.o readconf.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
153
154ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
154
155ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
155 $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
156 $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
156
157sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
157
158sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
158 $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
159 $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
159
160
160sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o sftp-glob.o progressmeter.o
161 $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-int.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
161sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
162 $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
162
163ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o
164 $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
165
166# test driver for the loginrec code - not built by default
167logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
168 $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS)
169

--- 18 unchanged lines hidden (view full) ---

188 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
189 fi
190
191# fake rule to stop make trying to compile moduli.o into a binary "modulo"
192moduli:
193 echo
194
195clean: regressclean
163
164ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o
165 $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
166
167# test driver for the loginrec code - not built by default
168logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
169 $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS)
170

--- 18 unchanged lines hidden (view full) ---

189 $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
190 fi
191
192# fake rule to stop make trying to compile moduli.o into a binary "modulo"
193moduli:
194 echo
195
196clean: regressclean
196 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
197 rm -f *.out core
197 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
198 rm -f *.out core
198 (cd openbsd-compat && $(MAKE) clean)
199
200distclean: regressclean
199 (cd openbsd-compat && $(MAKE) clean)
200
201distclean: regressclean
201 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
202 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
202 rm -f *.out core
203 rm -f Makefile config.h config.status ssh_prng_cmds *~
204 rm -rf autom4te.cache
205 (cd openbsd-compat && $(MAKE) distclean)
206 (cd scard && $(MAKE) distclean)
207
208veryclean: distclean
209 rm -f configure config.h.in *.0

--- 7 unchanged lines hidden (view full) ---

217 base=`echo $$f | sed 's/\..*$$//'` ; \
218 echo "$$f -> $$base.0" ; \
219 nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
220 >$$base.0 ; \
221 done
222
223distprep: catman-do
224 $(AUTORECONF)
203 rm -f *.out core
204 rm -f Makefile config.h config.status ssh_prng_cmds *~
205 rm -rf autom4te.cache
206 (cd openbsd-compat && $(MAKE) distclean)
207 (cd scard && $(MAKE) distclean)
208
209veryclean: distclean
210 rm -f configure config.h.in *.0

--- 7 unchanged lines hidden (view full) ---

218 base=`echo $$f | sed 's/\..*$$//'` ; \
219 echo "$$f -> $$base.0" ; \
220 nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
221 >$$base.0 ; \
222 done
223
224distprep: catman-do
225 $(AUTORECONF)
226 -rm -rf autom4te.cache
225 (cd scard && $(MAKE) -f Makefile.in distprep)
226
227install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config
228install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
229
230check-config:
231 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
232

--- 104 unchanged lines hidden (view full) ---

337 -rmdir $(DESTDIR)$(sysconfdir)
338 -rmdir $(DESTDIR)$(bindir)
339 -rmdir $(DESTDIR)$(sbindir)
340 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
341 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8
342 -rmdir $(DESTDIR)$(mandir)
343 -rmdir $(DESTDIR)$(libexecdir)
344
227 (cd scard && $(MAKE) -f Makefile.in distprep)
228
229install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config
230install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
231
232check-config:
233 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
234

--- 104 unchanged lines hidden (view full) ---

339 -rmdir $(DESTDIR)$(sysconfdir)
340 -rmdir $(DESTDIR)$(bindir)
341 -rmdir $(DESTDIR)$(sbindir)
342 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)1
343 -rmdir $(DESTDIR)$(mandir)/$(mansubdir)8
344 -rmdir $(DESTDIR)$(mandir)
345 -rmdir $(DESTDIR)$(libexecdir)
346
345uninstall:
347uninstall:
346 -rm -f $(DESTDIR)$(bindir)/slogin
347 -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
348 -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
349 -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
350 -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
351 -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
352 -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
353 -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)

--- 14 unchanged lines hidden (view full) ---

368 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
369 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
370
371tests: $(TARGETS)
372 BUILDDIR=`pwd`; \
373 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
374 [ -f `pwd`/regress/Makefile ] || \
375 ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
348 -rm -f $(DESTDIR)$(bindir)/slogin
349 -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT)
350 -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT)
351 -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
352 -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT)
353 -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
354 -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
355 -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)

--- 14 unchanged lines hidden (view full) ---

370 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
371 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
372
373tests: $(TARGETS)
374 BUILDDIR=`pwd`; \
375 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
376 [ -f `pwd`/regress/Makefile ] || \
377 ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
378 TEST_SHELL="@TEST_MINUS_S_SH@"; \
376 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
377 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
378 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
379 TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \
380 TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \
381 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
382 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
383 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
384 cd $(srcdir)/regress || exit $$?; \
385 $(MAKE) \
386 .OBJDIR="$${BUILDDIR}/regress" \
387 .CURDIR="`pwd`" \
388 BUILDDIR="$${BUILDDIR}" \
389 OBJ="$${BUILDDIR}/regress/" \
390 PATH="$${BUILDDIR}:$${PATH}" \
379 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
380 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
381 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
382 TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \
383 TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \
384 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
385 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
386 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
387 cd $(srcdir)/regress || exit $$?; \
388 $(MAKE) \
389 .OBJDIR="$${BUILDDIR}/regress" \
390 .CURDIR="`pwd`" \
391 BUILDDIR="$${BUILDDIR}" \
392 OBJ="$${BUILDDIR}/regress/" \
393 PATH="$${BUILDDIR}:$${PATH}" \
394 TEST_SHELL="$${TEST_SHELL}" \
391 TEST_SSH_SSH="$${TEST_SSH_SSH}" \
392 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
393 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
394 TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \
395 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
396 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
397 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
398 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
399 EXEEXT="$(EXEEXT)" \
400 $@
401
402regressclean:
403 if [ -f regress/Makefile -a -r regress/Makefile ]; then \
404 (cd regress && $(MAKE) clean) \
405 fi
395 TEST_SSH_SSH="$${TEST_SSH_SSH}" \
396 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
397 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \
398 TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \
399 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
400 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
401 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
402 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
403 EXEEXT="$(EXEEXT)" \
404 $@
405
406regressclean:
407 if [ -f regress/Makefile -a -r regress/Makefile ]; then \
408 (cd regress && $(MAKE) clean) \
409 fi