Fix distclean to wipe CVS

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@251 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 33c8e64e23a2a876ba87c42cc8afad934a12eafd..1713883dc0ab39e760cae868da91529c1dc1b64c 100755 (executable)
--- 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 9152769dc21ac05bdae842a3ad913ed5946f170a..c74ed0d22e18e4e889486ed3204bc6ebf3ba7289 100644 (file)
--- 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 bb7169aa11f36438314d4f746b51e8755c72e8c3..31a5d7bce5f7b2be6f6b13f7cb291523605fc88a 100644 (file)
--- 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 0d49463e9d4215e0d941f33c788c06bdc3d5ea6b..7cf9123a32bb1650d031644aac6fad41675b91a6 100644 (file)
--- 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 bb7169aa11f36438314d4f746b51e8755c72e8c3..31a5d7bce5f7b2be6f6b13f7cb291523605fc88a 100644 (file)
--- 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 96ffa2e0bb2ab805a956574c88e23eda72f2cb08..3506dbcc7bb1b44287a0e66a76b96db53e1a1556 100644 (file)
--- 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 0d49463e9d4215e0d941f33c788c06bdc3d5ea6b..7cf9123a32bb1650d031644aac6fad41675b91a6 100644 (file)
--- 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 f05b139d129449b7c227d18555ef4e025682e06f..af119f23ef04a5cf73876725d927653855a0e556 100644 (file)
--- 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 fc778fca25a5cbb31d3dd723e77517342435ae9d..1a3d0f9817e80e62f424a513f75a825325baab9e 100644 (file)
--- 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 348cd8e0bec88e174f568cd981ad74a3d9056340..7bda0a6ab475ffe6ed0d915ab7d5e2b11211e477 100644 (file)
--- 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 129c27ae7a8bb9a29a3ba26c3a622be33eff14d5..3966cae6e54bdb406105db1aa95d5091fbb27415 100644 (file)
--- 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 1eec1c924fa09976b146c053ba59d41d2cad9118..3c285c8bc32a6ff163c61e06d09c61471a1d1e0d 100644 (file)
--- 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 6b64ef74dff5e2f036a8daa13b9e1ffcc3c53875..748a9b6b1f6326c318c2062d52b82b2181c48920 100755 (executable)
--- 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 d8a7493d4d7a0203986762523aca65367772ae97..163b2b0b99ff88197e251c56f744566bcaab017d 100755 (executable)
--- 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 12fbd39543ffdd2044ba27bc59f78f75f40f9490..2c0e8538099e3ce741153432af5bbe4b24b32e9c 100644 (file)
--- 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 1cc8a4b6b332ec41fd6e316297b2f69f1a27881f..3429ff9c105997014206d1280e13ac860b6a01dc 100644 (file)
--- 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 21710b9c9fac46cf48bf59ccf072fd270cfa65bf..efb478a3d62be959da5a6f238508f81320917b62 100644 (file)
--- 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 0edf9b9ce04f172821cd286871e638950fe5595b..80b0c8f5afc44b866cb666b2b3adaec8c75da9ee 100644 (file)
--- 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