Integrate Phil's Makefile patch

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

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index c242ef036e52a7415e36e513c8298494172cc65a..28f4cae267339e7a03663558ab5f351954903b74 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -92,7 +92,8 @@ install: installdirs
 uninstall:
        @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
-install-autostart: install-autostart-dir install-autostart-fd install-autostart-sd
+install-autostart:
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-dir:
        (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
@@ -103,7 +104,8 @@ install-autostart-fd:
 install-autostart-sd:
        (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
-uninstall-autostart: uninstall-autostart-dir uninstall-autostart-fd uninstall-autrun-sd
+uninstall-autostart:
+       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-dir:
        (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
@@ -158,6 +160,17 @@ distclean:
        @$(RMF) -r po/CVS src/immortal/CVS rescue/freebsd/CVS rescue/solaris/CVS
        @$(RMF) -r CVS src/gnome-console/CVS src/tconsole/CVS
 
+devclean:
+       @for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || exit 1); done
+       @for I in $(all_subdirs); do (cd $$I; $(RMF) startit stopit btraceback); done
+       @(cd $(srcdir); $(RMF) *~ config.cache config.h config.log config.status config.out)
+       @(cd $(srcdir); $(RMF) Makefile autoconf/Make.common)
+       @(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
+       @$(RMF) bacula fd Makefile startmysql stopmysql startit stopit btraceback
+       @$(RMF) bconsole gconsole
+       @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
+       @$(RMF) working/*
+
 distdirs:
        mkdir ../$(VERNAME);
        mkdir ../$(VERNAME)/autoconf;

diff --git a/bacula/platforms/Makefile.in b/bacula/platforms/Makefile.in
index a0584c5f4cb3ce2452d5baf31837760d8849e60e..a31517717e5a3f6b9fced73d7afc91517b4cd376 100644 (file)
--- a/bacula/platforms/Makefile.in
+++ b/bacula/platforms/Makefile.in
@@ -27,7 +27,13 @@ all:
        done
 
 
-install: install-autostart-dir install-autostart-fd install-autostart-sd
+install: install-autostart
+
+install-autostart:
+       @if test x$(DISTNAME) != x ; then \
+          (cd $(DISTNAME); \
+             $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \
+       fi
 
 install-autostart-dir:
        @if test x$(DISTNAME) != x ; then \
@@ -47,7 +53,13 @@ install-autostart-sd:
              $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \
        fi
 
-uninstall: uninstall-autostart-dir uninstall-autostart-fd uninstall-autrun-sd
+uninstall: uninstall-autostart
+
+uninstall-autostart:
+       @if test x$(DISTNAME) != x ; then \
+          (cd $(DISTNAME); \
+            $(MAKE) DESTDIR=$(DESTDIR) "DISTNAME=$(DISTNAME)" "DISTVER=$(DISTVER)" $@) \
+       fi
 
 uninstall-autostart-dir:
        @if test x$(DISTNAME) != x ; then \
@@ -86,3 +98,11 @@ distclean:
            fi; \
            (cd $${subdir}; rm -rf CVS) \
        done
+
+devclean:
+       @rm -f Makefile
+       @for subdir in ${SUBDIRS}; do \
+           if [ -f $${subdir}/Makefile ]; then \
+                    (cd $${subdir}; $(MAKE) devclean) \
+           fi; \
+       done

diff --git a/bacula/platforms/aix/Makefile.in b/bacula/platforms/aix/Makefile.in
index 46358c1ad34f028790665fd0da292a91d5062f01..9116ee4f4cd88d9e1ba52135cbabaf3d31046c54 100644 (file)
--- a/bacula/platforms/aix/Makefile.in
+++ b/bacula/platforms/aix/Makefile.in
@@ -79,3 +79,7 @@ clean:
 distclean: clean
        @rm -f Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec
+

diff --git a/bacula/platforms/bsdi/Makefile.in b/bacula/platforms/bsdi/Makefile.in
index 31a5d7bce5f7b2be6f6b13f7cb291523605fc88a..c070eed6c20d53e0f3e45848671b01647bf68a68 100644 (file)
--- a/bacula/platforms/bsdi/Makefile.in
+++ b/bacula/platforms/bsdi/Makefile.in
@@ -134,3 +134,7 @@ clean:
 distclean: clean
        @rm -f Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec
+

diff --git a/bacula/platforms/darwin/Makefile.in b/bacula/platforms/darwin/Makefile.in
index 3e69931954b15b1a3e2ff88926b70b593f19e989..0c2d64f417c84049965a9082a58e77f29ee15d85 100644 (file)
--- a/bacula/platforms/darwin/Makefile.in
+++ b/bacula/platforms/darwin/Makefile.in
@@ -42,3 +42,7 @@ clean:
 distclean: clean
        @rm -f Makefile
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile
+

diff --git a/bacula/platforms/freebsd/Makefile.in b/bacula/platforms/freebsd/Makefile.in
index 31a5d7bce5f7b2be6f6b13f7cb291523605fc88a..c070eed6c20d53e0f3e45848671b01647bf68a68 100644 (file)
--- a/bacula/platforms/freebsd/Makefile.in
+++ b/bacula/platforms/freebsd/Makefile.in
@@ -134,3 +134,7 @@ clean:
 distclean: clean
        @rm -f Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec
+

diff --git a/bacula/platforms/gentoo/Makefile.in b/bacula/platforms/gentoo/Makefile.in
index 4f7123cb784c7ed3359e6492016fe57c569d9c25..bdc07d6e8aaff33e71c3b3c1724c62fe1953c84b 100644 (file)
--- a/bacula/platforms/gentoo/Makefile.in
+++ b/bacula/platforms/gentoo/Makefile.in
@@ -51,3 +51,7 @@ clean:
 distclean: clean
        @rm -f Makefile 
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile 
+

diff --git a/bacula/platforms/irix/Makefile.in b/bacula/platforms/irix/Makefile.in
index 7cf9123a32bb1650d031644aac6fad41675b91a6..2d156d06a562208a354a93e297c11b966cb45bf0 100644 (file)
--- a/bacula/platforms/irix/Makefile.in
+++ b/bacula/platforms/irix/Makefile.in
@@ -79,3 +79,7 @@ clean:
 distclean: clean
        @rm -f Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec
+

diff --git a/bacula/platforms/mandrake/Makefile.in b/bacula/platforms/mandrake/Makefile.in
index e782a9e59c668fae8720555db56a3fa932d35013..1f455a023a13ec5c2f777e3c1f2c291e92e496e4 100644 (file)
--- a/bacula/platforms/mandrake/Makefile.in
+++ b/bacula/platforms/mandrake/Makefile.in
@@ -80,3 +80,8 @@ distclean: clean
        @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
        @rm -f bacula-sd bacula-fd bacula-dir
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+       @rm -f bacula-sd bacula-fd bacula-dir
+

diff --git a/bacula/platforms/openbsd/Makefile.in b/bacula/platforms/openbsd/Makefile.in
index 31a5d7bce5f7b2be6f6b13f7cb291523605fc88a..c070eed6c20d53e0f3e45848671b01647bf68a68 100644 (file)
--- a/bacula/platforms/openbsd/Makefile.in
+++ b/bacula/platforms/openbsd/Makefile.in
@@ -134,3 +134,7 @@ clean:
 distclean: clean
        @rm -f Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec
+

diff --git a/bacula/platforms/redhat/Makefile.in b/bacula/platforms/redhat/Makefile.in
index 9e329a747193f9bda5929d9ff48ed71ae87963f7..aa8b9f0d93c349eddcec6a6af84cefbb85ac50cb 100644 (file)
--- a/bacula/platforms/redhat/Makefile.in
+++ b/bacula/platforms/redhat/Makefile.in
@@ -14,7 +14,7 @@ nothing:
 
 install: install-autostart
 
-install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir install-logrotate
+install-autostart: install-autostart-fd install-autostart-sd install-autostart-dir
 
 install_logrotate:
        @$(INSTALL_PROGRAM) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bacula
@@ -54,7 +54,7 @@ install-autostart-dir:
 
 uninstall: uninstall-autostart
 
-uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir uninstall-logrotate
+uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir
 
 uninstall-logrotate:
        @rm -f $(DESTDIR)/etc/logrotate.d/bacula
@@ -85,3 +85,8 @@ distclean: clean
        @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
        @rm -f bacula-sd bacula-fd bacula-dir
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+       @rm -f bacula-sd bacula-fd bacula-dir
+

diff --git a/bacula/platforms/solaris/Makefile.in b/bacula/platforms/solaris/Makefile.in
index 8d39622226adea5505452eefece36f9b56fb4ba7..b6304886002b0b661842b129f253eff2eb790289 100644 (file)
--- a/bacula/platforms/solaris/Makefile.in
+++ b/bacula/platforms/solaris/Makefile.in
@@ -82,3 +82,7 @@ clean:
 distclean: clean
        @rm -f Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec
+

diff --git a/bacula/platforms/suse/Makefile.in b/bacula/platforms/suse/Makefile.in
index a2dcad99d1bae50b7f22ae6ed1b691e3685a8635..6a6225fb962cf75a6073c6e917c0ace486ef94cc 100644 (file)
--- a/bacula/platforms/suse/Makefile.in
+++ b/bacula/platforms/suse/Makefile.in
@@ -79,3 +79,8 @@ distclean: clean
        @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
        @rm -f bacula-sd bacula-fd bacula-dir
        @rm -rf CVS
+
+devclean: clean
+       @rm -f Makefile bacula-*.spec bacula.*.spec bacula.spec
+       @rm -f bacula-sd bacula-fd bacula-dir
+

diff --git a/bacula/platforms/unknown/Makefile.in b/bacula/platforms/unknown/Makefile.in
index af119f23ef04a5cf73876725d927653855a0e556..bb11d6a8bdc33eb1d11f08fd10be8bc66bc6b8ec 100644 (file)
--- a/bacula/platforms/unknown/Makefile.in
+++ b/bacula/platforms/unknown/Makefile.in
@@ -42,3 +42,7 @@ clean:
 distclean:
        @rm -f bacula-SD bacula-FD bacula-DIR Makefile bacula-*.spec
        @rm -rf CVS
+
+devclean:
+       @rm -f bacula-SD bacula-FD bacula-DIR Makefile bacula-*.spec
+

diff --git a/bacula/src/Makefile.in b/bacula/src/Makefile.in
index 8b67e61486fb7dd16e7fcd2eedceb01c43edf7be..8722d1a65ce5191682a8435cbce1a832a1adb6ae 100644 (file)
--- a/bacula/src/Makefile.in
+++ b/bacula/src/Makefile.in
@@ -52,6 +52,11 @@ distclean: realclean
        @$(RMF) config.h host.h
        @$(RMF) -r CVS
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       @(cd $(srcdir); $(RMF) Makefile)
+       @$(RMF) config.h host.h
+
 install:
 
 

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 9bb444842e7d395f47424d59637231d5adf147f3..0ef1320723c932fea335132fa1adb33ebf8a9572 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -86,6 +86,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 install:
        $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
        $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 860ac0bd1be968a03e802e4558e600359aa60b2f..2a5da51482b82c60569812b9f6781c3413f01a21 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -68,6 +68,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 install: all
        @if test -f ${DESTDIR}${sbindir}/console; then \
           echo " "; \

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index a306b014844b07298b477963e5dd0dc908bdad31..c2ecac92c3385aca11e01e9765f843a9fd4495ce 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -89,6 +89,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 install: all
        $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        @srcconf=bacula-dir.conf; \

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 965f1a18329ae876d0ee5a7183e39acb3d4a35fc..ea8260bd68c8b65251e89bc2e1ed56c939c33861 100755 (executable)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -101,6 +101,13 @@ distclean: realclean
           (cd win32; $(MAKE) distclean); \
        fi
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+       if test -f win32/Makefile; then \
+          (cd win32; $(MAKE) devclean); \
+       fi
+
 install: all
        $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
        @srcconf=bacula-fd.conf; \

diff --git a/bacula/src/filed/win32/Makefile.in b/bacula/src/filed/win32/Makefile.in
index c31a19cf0ead92795072a4a8d021149d1801f839..d25f21dd8a645f54d0e375bf3fc8f77970294b2c 100755 (executable)
--- a/bacula/src/filed/win32/Makefile.in
+++ b/bacula/src/filed/win32/Makefile.in
@@ -68,6 +68,9 @@ distclean: clean
        @rm -f Makefile
        @rm -rf bin/CVS CVS
 
+devclean: clean
+       @rm -f Makefile
+
 install:
        @mkdir -p $(DESTDIR)$(sbindir) $(DESTDIR)/tmp $(DESTDIR)$(sbindir)/../working
        @echo "Installing system binary files ..."

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index 09000594e5802fe80af67439484c560b095b7097..409a71474df6e2132a3fec5a4886f1bb4da3eb3f 100644 (file)
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -61,6 +61,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 install:
 
 

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index aa4105c50d5233fe0abb79c3d92d27c3e74aab6d..a3192c7f239d70a1503bc38d0fad5e2a7b618340 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -165,6 +165,9 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
 
 # Semi-automatic generation of dependencies:
 # Use cc -M because X11 `makedepend' doesn't work on all systems

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index 1896ffb09657c92dd0748329d72cf3c711022e33..ced8002607464dfbed55b84c81fb81f5be459c82 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -69,6 +69,10 @@ distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
+devclean: realclean
+       if test $(srcdir) = .; then $(MAKE) realclean; fi
+       (cd $(srcdir); $(RMF) Makefile)
+
 # Allow non-root execution of bsmtp for non-root Directors
 install: bsmtp
        $(INSTALL_PROGRAM) bsmtp $(DESTDIR)$(sbindir)/bsmtp