diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /Makefile.in | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index ea0f9c3ef..bca425d36 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.263 2004/08/15 11:01:37 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.270 2005/02/25 23:12:38 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -43,6 +43,7 @@ LD=@LD@ | |||
43 | CFLAGS=@CFLAGS@ | 43 | CFLAGS=@CFLAGS@ |
44 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 44 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
45 | LIBS=@LIBS@ | 45 | LIBS=@LIBS@ |
46 | LIBEDIT=@LIBEDIT@ | ||
46 | LIBPAM=@LIBPAM@ | 47 | LIBPAM=@LIBPAM@ |
47 | LIBWRAP=@LIBWRAP@ | 48 | LIBWRAP=@LIBWRAP@ |
48 | AR=@AR@ | 49 | AR=@AR@ |
@@ -84,7 +85,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
84 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ | 85 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ |
85 | auth-krb5.o \ | 86 | auth-krb5.o \ |
86 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
87 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o | 88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
89 | audit.o audit-bsm.o | ||
88 | 90 | ||
89 | MANPAGES = 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 | 91 | MANPAGES = 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 |
90 | MANPAGES_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 | 92 | MANPAGES_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 |
@@ -158,7 +160,7 @@ sftp-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) | 160 | $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
159 | 161 | ||
160 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | 162 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o |
161 | $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 163 | $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) |
162 | 164 | ||
163 | ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o | 165 | ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o |
164 | $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 166 | $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
@@ -194,13 +196,13 @@ moduli: | |||
194 | 196 | ||
195 | clean: regressclean | 197 | clean: regressclean |
196 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 198 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
197 | rm -f *.out core | 199 | rm -f *.out core survey |
198 | (cd openbsd-compat && $(MAKE) clean) | 200 | (cd openbsd-compat && $(MAKE) clean) |
199 | 201 | ||
200 | distclean: regressclean | 202 | distclean: regressclean |
201 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 203 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
202 | rm -f *.out core opensshd.init | 204 | rm -f *.out core opensshd.init |
203 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds *~ | 205 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds survey.sh *~ |
204 | rm -rf autom4te.cache | 206 | rm -rf autom4te.cache |
205 | (cd openbsd-compat && $(MAKE) distclean) | 207 | (cd openbsd-compat && $(MAKE) distclean) |
206 | (cd scard && $(MAKE) distclean) | 208 | (cd scard && $(MAKE) distclean) |
@@ -228,8 +230,9 @@ distprep: catman-do | |||
228 | -rm -rf autom4te.cache | 230 | -rm -rf autom4te.cache |
229 | (cd scard && $(MAKE) -f Makefile.in distprep) | 231 | (cd scard && $(MAKE) -f Makefile.in distprep) |
230 | 232 | ||
231 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config | 233 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
232 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files | 234 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf |
235 | install-nosysconf: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files | ||
233 | 236 | ||
234 | check-config: | 237 | check-config: |
235 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 238 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
@@ -279,6 +282,8 @@ install-files: scard-install | |||
279 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 282 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
280 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 283 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
281 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 284 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
285 | |||
286 | install-sysconf: | ||
282 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 287 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
283 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ | 288 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ |
284 | fi | 289 | fi |
@@ -376,7 +381,7 @@ tests: $(TARGETS) | |||
376 | BUILDDIR=`pwd`; \ | 381 | BUILDDIR=`pwd`; \ |
377 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 382 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ |
378 | [ -f `pwd`/regress/Makefile ] || \ | 383 | [ -f `pwd`/regress/Makefile ] || \ |
379 | ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ | 384 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \ |
380 | TEST_SHELL="@TEST_SHELL@"; \ | 385 | TEST_SHELL="@TEST_SHELL@"; \ |
381 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 386 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
382 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 387 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |
@@ -410,6 +415,15 @@ regressclean: | |||
410 | (cd regress && $(MAKE) clean) \ | 415 | (cd regress && $(MAKE) clean) \ |
411 | fi | 416 | fi |
412 | 417 | ||
418 | survey: survey.sh ssh | ||
419 | @$(SHELL) ./survey.sh > survey | ||
420 | @echo 'The survey results have been placed in the file "survey" in the' | ||
421 | @echo 'current directory. Please review the file then send with' | ||
422 | @echo '"make send-survey".' | ||
423 | |||
424 | send-survey: survey | ||
425 | mail portable-survey@mindrot.org <survey | ||
426 | |||
413 | package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) | 427 | package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) |
414 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ | 428 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ |
415 | sh buildpkg.sh; \ | 429 | sh buildpkg.sh; \ |