summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-22 11:00:11 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-22 11:00:11 +1000
commita21ea0840c8040e17c120c972de03d780c9bd4a5 (patch)
tree9a9316476b7dc47a66f4d543d6e7652538ce52b6
parent7baaa6a9615ec2bc05e4af7bcc751bfb2e6b3881 (diff)
- (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
builds. Portability corrections from tim@.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in15
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ad0d32ec..305248642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030923
2 - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
3 builds. Portability corrections from tim@.
4
120030919 520030919
2 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; 6 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
3 djast AT cs.toronto.edu 7 djast AT cs.toronto.edu
@@ -1129,4 +1133,4 @@
1129 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1133 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1130 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1134 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1131 1135
1132$Id: ChangeLog,v 1.2994.2.12 2003/09/19 10:55:10 dtucker Exp $ 1136$Id: ChangeLog,v 1.2994.2.13 2003/09/22 01:00:11 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index 8a8774461..c90b17d10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 dtucker Exp $ 1# $Id: Makefile.in,v 1.249.2.1 2003/09/22 01:00:12 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@
@@ -192,20 +192,18 @@ ssh_prng_cmds.out: ssh_prng_cmds
192moduli: 192moduli:
193 echo 193 echo
194 194
195clean: 195clean: regressclean
196 rm -f *.o *.a $(TARGETS) logintest config.cache config.log 196 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
197 rm -f *.out core 197 rm -f *.out core
198 (cd openbsd-compat && $(MAKE) clean) 198 (cd openbsd-compat && $(MAKE) clean)
199 (cd regress && $(MAKE) clean)
200 199
201distclean: 200distclean: regressclean
202 rm -f *.o *.a $(TARGETS) logintest config.cache config.log 201 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
203 rm -f *.out core 202 rm -f *.out core
204 rm -f Makefile config.h config.status ssh_prng_cmds *~ 203 rm -f Makefile config.h config.status ssh_prng_cmds *~
205 rm -rf autom4te.cache 204 rm -rf autom4te.cache
206 (cd openbsd-compat && $(MAKE) distclean) 205 (cd openbsd-compat && $(MAKE) distclean)
207 (cd scard && $(MAKE) distclean) 206 (cd scard && $(MAKE) distclean)
208 (cd regress && $(MAKE) distclean)
209 207
210veryclean: distclean 208veryclean: distclean
211 rm -f configure config.h.in *.0 209 rm -f configure config.h.in *.0
@@ -373,6 +371,8 @@ uninstall:
373tests: $(TARGETS) 371tests: $(TARGETS)
374 BUILDDIR=`pwd`; \ 372 BUILDDIR=`pwd`; \
375 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ 373 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
374 [ -f `pwd`/regress/Makefile ] || \
375 ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
376 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ 376 TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
377 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ 377 TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
378 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ 378 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -398,3 +398,8 @@ tests: $(TARGETS)
398 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ 398 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
399 EXEEXT="$(EXEEXT)" \ 399 EXEEXT="$(EXEEXT)" \
400 $@ 400 $@
401
402regressclean:
403 if [ -f regress/Makefile -a -r regress/Makefile ]; then \
404 (cd regress && $(MAKE) clean) \
405 fi