Apply reschedule patch to 1.37 code.

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 9cd92e2752055c49e5b9537b65d97a8a9704bb63..02fbdadc4e9c2a9cd50c631c9bf181d6dc715dee 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -15,12 +15,13 @@ thisdir = .
 first_rule: all
 dummy:
 
+# --client-only directories
 fd_subdirs = src scripts doc src/lib src/findlib src/filed \
-            rescue rescue/linux
+            @READLINE_SRC@ src/console rescue rescue/linux \
+            @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@
 
-
-subdirs =    src/cats @READLINE_SRC@ src/console src/dird \
-            src/stored @GNOME_DIR@ src/tools
+# Non-client-only directores
+subdirs =    src/cats src/dird src/stored src/tools
 
 all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
 
@@ -85,30 +86,31 @@ installdirs:
        $(MKDIR) $(DESTDIR)$(scriptdir)
        $(MKDIR) $(DESTDIR)$(working_dir)
 #      $(MKDIR) $(DESTDIR)$(mandir)
+
+gnomedirs:
        $(MKDIR) $(DESTDIR)/usr/share/pixmaps
        $(MKDIR) $(DESTDIR)/usr/share/gnome/apps/System
        $(MKDIR) $(DESTDIR)/usr/share/applications
        $(MKDIR) $(DESTDIR)/etc/security/console.apps
        $(MKDIR) $(DESTDIR)/etc/pam.d
-       $(MKDIR) $(DESTDIR)/usr/bin
 
-install-menu: installdirs
+install-menu: gnomedirs
        ${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
        ${INSTALL_DATA} scripts/bacula.desktop.gnome1 $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
        ${INSTALL_DATA} scripts/bacula.desktop.gnome2 $(DESTDIR)/usr/share/applications/bacula.desktop
 
-install-menu-xsu: installdirs
+install-menu-xsu: gnomedirs
        ${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
        ${INSTALL_DATA} scripts/bacula.desktop.gnome1.xsu $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
        ${INSTALL_DATA} scripts/bacula.desktop.gnome2.xsu $(DESTDIR)/usr/share/applications/bacula.desktop
 
-install-menu-consolehelper: installdirs
+install-menu-consolehelper: gnomedirs
        ${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
        ${INSTALL_DATA} scripts/bacula.desktop.gnome1.consolehelper $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
        ${INSTALL_DATA} scripts/bacula.desktop.gnome2.consolehelper $(DESTDIR)/usr/share/applications/bacula.desktop
        ${INSTALL_DATA} scripts/gnome-console.console_apps $(DESTDIR)/etc/security/console.apps/gnome-console
        ${INSTALL_DATA} scripts/gnome-console.pamd $(DESTDIR)/etc/pam.d/gnome-console
-       ln -s /usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
+       ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
 
 install: installdirs
        @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
@@ -140,6 +142,20 @@ uninstall-autostart-fd:
 uninstall-autostart-sd:
        (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
+uninstall-menu:
+       rm -f $(DESTDIR)/usr/share/pixmaps/bacula.png
+       rm -f $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
+       rm -f $(DESTDIR)/usr/share/applications/bacula.desktop
+
+uninstall-menu-consolehelper:
+       rm -f $(DESTDIR)/usr/share/pixmaps/bacula.png
+       rm -f $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
+       rm -f $(DESTDIR)/usr/share/applications/bacula.desktop
+       rm -f $(DESTDIR)/etc/security/console.apps/gnome-console
+       rm -f $(DESTDIR)/etc/pam.d/gnome-console
+       rm -f $(DESTDIR)/usr/bin/gnome-console
+
+
 Makefile: Makefile.in
        cd $(topdir) \
            && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -160,16 +176,18 @@ Makefiles:
        chmod 755 make_catalog_backup delete_catalog_backup)
 
 clean:
-       @for I in ${all_subdirs}; \
+       @for I in ${all_subdirs} doc/latex doc/latex-fr; \
          do (cd $$I; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1); done
        @(cd platforms; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1)
        @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
        @$(RMF) examples/1 examples/2 examples/devices/1 examples/devices/2
+       @$(RMF) -r autom4te.cache
+       @find . -name .#* -exec $(RMF) {} \;
 
 
 # clean for distribution
 distclean:
-       @for I in $(all_subdirs); do (cd $$I; $(MAKE) $@ || exit 1); done
+       @for I in $(all_subdirs) doc/latex doc/latex-fr; 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)
@@ -185,7 +203,7 @@ distclean:
        @$(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) doc/latex doc/latex-fr; 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)