From 7a8223a12817463f756d40720d2b791fdc625500 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 10 Mar 2004 21:38:50 +0000 Subject: [PATCH] Integrate Phil's Makefile patch git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1123 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/Makefile.in | 17 +++++++++++++++-- bacula/platforms/Makefile.in | 24 ++++++++++++++++++++++-- bacula/platforms/aix/Makefile.in | 4 ++++ bacula/platforms/bsdi/Makefile.in | 4 ++++ bacula/platforms/darwin/Makefile.in | 4 ++++ bacula/platforms/freebsd/Makefile.in | 4 ++++ bacula/platforms/gentoo/Makefile.in | 4 ++++ bacula/platforms/irix/Makefile.in | 4 ++++ bacula/platforms/mandrake/Makefile.in | 5 +++++ bacula/platforms/openbsd/Makefile.in | 4 ++++ bacula/platforms/redhat/Makefile.in | 9 +++++++-- bacula/platforms/solaris/Makefile.in | 4 ++++ bacula/platforms/suse/Makefile.in | 5 +++++ bacula/platforms/unknown/Makefile.in | 4 ++++ bacula/src/Makefile.in | 5 +++++ bacula/src/cats/Makefile.in | 4 ++++ bacula/src/console/Makefile.in | 4 ++++ bacula/src/dird/Makefile.in | 4 ++++ bacula/src/filed/Makefile.in | 7 +++++++ bacula/src/filed/win32/Makefile.in | 3 +++ bacula/src/findlib/Makefile.in | 4 ++++ bacula/src/stored/Makefile.in | 3 +++ bacula/src/tools/Makefile.in | 4 ++++ 23 files changed, 128 insertions(+), 6 deletions(-) diff --git a/bacula/Makefile.in b/bacula/Makefile.in index c242ef036e..28f4cae267 100755 --- 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 a0584c5f4c..a31517717e 100644 --- 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 46358c1ad3..9116ee4f4c 100644 --- 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 31a5d7bce5..c070eed6c2 100644 --- 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 3e69931954..0c2d64f417 100644 --- 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 31a5d7bce5..c070eed6c2 100644 --- 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 4f7123cb78..bdc07d6e8a 100644 --- 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 7cf9123a32..2d156d06a5 100644 --- 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 e782a9e59c..1f455a023a 100644 --- 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 31a5d7bce5..c070eed6c2 100644 --- 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 9e329a7471..aa8b9f0d93 100644 --- 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 8d39622226..b630488600 100644 --- 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 a2dcad99d1..6a6225fb96 100644 --- 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 af119f23ef..bb11d6a8bd 100644 --- 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 8b67e61486..8722d1a65c 100644 --- 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 9bb444842e..0ef1320723 100644 --- 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 860ac0bd1b..2a5da51482 100644 --- 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 a306b01484..c2ecac92c3 100644 --- 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 965f1a1832..ea8260bd68 100755 --- 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 c31a19cf0e..d25f21dd8a 100755 --- 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 09000594e5..409a71474d 100644 --- 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 aa4105c50d..a3192c7f23 100644 --- 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 1896ffb096..ced8002607 100644 --- 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 -- 2.39.2