summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-22 10:58:55 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-22 10:58:55 +1000
commit782390e62e6a71ad2acf59b8f58e2957afc9dd0f (patch)
treef56e6d5d15a65d3c33cccd74c2568a8bef78cb70 /Makefile.in
parent4724d96ca8af844c0c5446388e82e728e2b8c55e (diff)
- (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
builds. Portability corrections from tim@.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in15
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 8a877446..4368132e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 dtucker Exp $
+# $Id: Makefile.in,v 1.250 2003/09/22 00:58:56 dtucker Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -192,20 +192,18 @@ ssh_prng_cmds.out: ssh_prng_cmds
moduli:
echo
-clean:
+clean: regressclean
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core
(cd openbsd-compat && $(MAKE) clean)
- (cd regress && $(MAKE) clean)
-distclean:
+distclean: regressclean
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core
rm -f Makefile config.h config.status ssh_prng_cmds *~
rm -rf autom4te.cache
(cd openbsd-compat && $(MAKE) distclean)
(cd scard && $(MAKE) distclean)
- (cd regress && $(MAKE) distclean)
veryclean: distclean
rm -f configure config.h.in *.0
@@ -373,6 +371,8 @@ uninstall:
tests: $(TARGETS)
BUILDDIR=`pwd`; \
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
+ [ -f `pwd`/regress/Makefile ] || \
+ ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -398,3 +398,8 @@ tests: $(TARGETS)
TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
EXEEXT="$(EXEEXT)" \
$@
+
+regressclean:
+ if [ -f regress/Makefile -a -r regress/Makefile ]; then \
+ (cd regress && $(MAKE) clean) \
+ fi