From d05b69f0f08aa57f434a4bd1f7a0936eb6768508 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 28 Dec 2002 18:37:28 +0000 Subject: [PATCH] Fix distclean to wipe CVS git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@251 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/Makefile.in | 5 +++++ bacula/platforms/Makefile.in | 11 ++++++----- bacula/platforms/freebsd/Makefile.in | 1 + bacula/platforms/irix/Makefile.in | 1 + bacula/platforms/openbsd/Makefile.in | 1 + bacula/platforms/redhat/Makefile.in | 1 + bacula/platforms/solaris/Makefile.in | 1 + bacula/platforms/unknown/Makefile.in | 1 + bacula/src/Makefile.in | 1 + bacula/src/cats/Makefile.in | 2 +- bacula/src/console/Makefile.in | 2 +- bacula/src/dird/Makefile.in | 2 +- bacula/src/filed/Makefile.in | 2 +- bacula/src/filed/win32/Makefile.in | 3 ++- bacula/src/findlib/Makefile.in | 2 +- bacula/src/lib/Makefile.in | 2 +- bacula/src/stored/Makefile.in | 2 +- bacula/src/tools/Makefile.in | 2 +- 18 files changed, 28 insertions(+), 14 deletions(-) diff --git a/bacula/Makefile.in b/bacula/Makefile.in index 33c8e64e23..1713883dc0 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -139,6 +139,11 @@ distclean: @$(RMF) console gconsole @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum @$(RMF) working/* + @$(RMF) -r CVS testsuite/CVS testsuite/config/CVS testsuite/console.test/CVS + @$(RMF) -r examples/devices/CVS autoconf/CVS autoconf/gnome-macros/CVS + @$(RMF) -r doc/techlogs/2002/CVS doc/techlogs/2001/CVS doc/techlogs/1.27/CVS + @$(RMF) -r examples/CVS intl/CVS scripts/CVS + @$(RMF) -r po/CVS src/immortal/CVS rescue/freebsd/CVS rescue/solaris/CVS distdirs: mkdir ../$(VERNAME); diff --git a/bacula/platforms/Makefile.in b/bacula/platforms/Makefile.in index 9152769dc2..c74ed0d22e 100644 --- a/bacula/platforms/Makefile.in +++ b/bacula/platforms/Makefile.in @@ -11,8 +11,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL = @INSTALL@ -SUBDIRS = freebsd redhat solaris unknown hpux suse openbsd \ - slackware alpha netbsd caldera debian +SUBDIRS = freebsd redhat solaris unknown openbsd irix MAKE = make @@ -72,15 +71,17 @@ depend: clean: @for subdir in ${SUBDIRS}; do \ if [ -f $${subdir}/Makefile ]; then \ - (cd $${subdir}; make clean;) \ + (cd $${subdir}; make clean) \ fi; \ done rm -f 1 2 3 distclean: - rm -f Makefile + @rm -f Makefile + @rm -rf CVS @for subdir in ${SUBDIRS}; do \ if [ -f $${subdir}/Makefile ]; then \ - (cd $${subdir}; make distclean;) \ + (cd $${subdir}; make distclean) \ fi; \ + (cd $${subdir}; rm -rf CVS) \ done diff --git a/bacula/platforms/freebsd/Makefile.in b/bacula/platforms/freebsd/Makefile.in index bb7169aa11..31a5d7bce5 100644 --- a/bacula/platforms/freebsd/Makefile.in +++ b/bacula/platforms/freebsd/Makefile.in @@ -133,3 +133,4 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec + @rm -rf CVS diff --git a/bacula/platforms/irix/Makefile.in b/bacula/platforms/irix/Makefile.in index 0d49463e9d..7cf9123a32 100644 --- a/bacula/platforms/irix/Makefile.in +++ b/bacula/platforms/irix/Makefile.in @@ -78,3 +78,4 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec + @rm -rf CVS diff --git a/bacula/platforms/openbsd/Makefile.in b/bacula/platforms/openbsd/Makefile.in index bb7169aa11..31a5d7bce5 100644 --- a/bacula/platforms/openbsd/Makefile.in +++ b/bacula/platforms/openbsd/Makefile.in @@ -133,3 +133,4 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec + @rm -rf CVS diff --git a/bacula/platforms/redhat/Makefile.in b/bacula/platforms/redhat/Makefile.in index 96ffa2e0bb..3506dbcc7b 100644 --- a/bacula/platforms/redhat/Makefile.in +++ b/bacula/platforms/redhat/Makefile.in @@ -72,3 +72,4 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec @rm -f bacula-sd bacula-fd bacula-dir + @rm -rf CVS diff --git a/bacula/platforms/solaris/Makefile.in b/bacula/platforms/solaris/Makefile.in index 0d49463e9d..7cf9123a32 100644 --- a/bacula/platforms/solaris/Makefile.in +++ b/bacula/platforms/solaris/Makefile.in @@ -78,3 +78,4 @@ clean: distclean: clean @rm -f Makefile bacula-*.spec + @rm -rf CVS diff --git a/bacula/platforms/unknown/Makefile.in b/bacula/platforms/unknown/Makefile.in index f05b139d12..af119f23ef 100644 --- a/bacula/platforms/unknown/Makefile.in +++ b/bacula/platforms/unknown/Makefile.in @@ -41,3 +41,4 @@ clean: distclean: @rm -f bacula-SD bacula-FD bacula-DIR Makefile bacula-*.spec + @rm -rf CVS diff --git a/bacula/src/Makefile.in b/bacula/src/Makefile.in index fc778fca25..1a3d0f9817 100644 --- a/bacula/src/Makefile.in +++ b/bacula/src/Makefile.in @@ -48,6 +48,7 @@ distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi @(cd $(srcdir); $(RMF) Makefile) @$(RMF) config.h + @$(RMF) -r CVS install: diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in index 348cd8e0be..7bda0a6ab4 100644 --- a/bacula/src/cats/Makefile.in +++ b/bacula/src/cats/Makefile.in @@ -66,7 +66,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) install: $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(sysconfdir)/create_@DB_NAME@_database diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in index 129c27ae7a..3966cae6e5 100644 --- a/bacula/src/console/Makefile.in +++ b/bacula/src/console/Makefile.in @@ -65,7 +65,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) install: all $(INSTALL_SCRIPT) console $(DESTDIR)$(sbindir)/console diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in index 1eec1c924f..3c285c8bc3 100644 --- a/bacula/src/dird/Makefile.in +++ b/bacula/src/dird/Makefile.in @@ -86,7 +86,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) install: all $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in index 6b64ef74df..748a9b6b1f 100755 --- a/bacula/src/filed/Makefile.in +++ b/bacula/src/filed/Makefile.in @@ -89,7 +89,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) if test -f win32/Makefile; then \ (cd win32; $(MAKE) distclean); \ fi diff --git a/bacula/src/filed/win32/Makefile.in b/bacula/src/filed/win32/Makefile.in index d8a7493d4d..163b2b0b99 100755 --- a/bacula/src/filed/win32/Makefile.in +++ b/bacula/src/filed/win32/Makefile.in @@ -66,7 +66,8 @@ clean: rm -f bin/bacula-fd.exe bin/smtp.exe bin/testfind.exe distclean: clean - rm -f Makefile + @rm -f Makefile + @rm -rf bin/CVS CVS install: @mkdir -p $(sbindir) /tmp $(sbindir)/../working diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in index 12fbd39543..2c0e853809 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -59,7 +59,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) install: diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index 1cc8a4b6b3..3429ff9c10 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -114,7 +114,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) # Semi-automatic generation of dependencies: # Use gcc -MM because X11 `makedepend' doesn't work on all systems diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in index 21710b9c9f..efb478a3d6 100644 --- a/bacula/src/stored/Makefile.in +++ b/bacula/src/stored/Makefile.in @@ -141,7 +141,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) # Semi-automatic generation of dependencies: diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in index 0edf9b9ce0..80b0c8f5af 100644 --- a/bacula/src/tools/Makefile.in +++ b/bacula/src/tools/Makefile.in @@ -64,7 +64,7 @@ realclean: clean distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile) + (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) install: smtp $(INSTALL_PROGRAM) smtp $(DESTDIR)$(sbindir)/smtp -- 2.39.5