Final changes

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index abc9c6f4b7338c8d032b68203aaf2e2b1d9950b1..71d0b70c992291d235e2d8de2a3cb6100338c810 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -21,9 +21,9 @@ fd_subdirs = src scripts src/lib src/findlib src/filed \
             @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@
 
 # Non-client-only directores
-subdirs =    src/cats src/dird src/stored src/tools
+subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
 
-all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} 
 
 DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -54,6 +54,9 @@ bacula-fd: Makefile
        done
 
 #-------------------------------------------------------------------------
+autoconf/aclocal.m4: autoconf/configure.in autoconf/bacula-macros/* autoconf/gettext-macros/*
+       cd autoconf && aclocal -I bacula-macros -I gettext-macros
+
 configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
        cd $(srcdir);
        ${RMF} -f config.cache config.log config.out config.status src/config.h
@@ -113,34 +116,34 @@ install-menu-consolehelper: gnomedirs
        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
+       @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 uninstall:
-       @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+       @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 install-autostart:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-dir:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-fd:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 install-autostart-sd:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1) 
 
 uninstall-autostart:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-dir:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-fd:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-autostart-sd:
-       (cd platforms; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
+       (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
 uninstall-menu:
        rm -f $(DESTDIR)/usr/share/pixmaps/bacula.png
@@ -188,10 +191,10 @@ clean:
 
 # clean for distribution
 distclean:
-       @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)
+       @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
@@ -200,10 +203,10 @@ distclean:
        @$(RMF) -rf txt diff src/python src/testprogs
 
 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)
+       @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
@@ -213,12 +216,12 @@ devclean:
 distdirs:
        mkdir ../$(VERNAME);
        mkdir ../$(VERNAME)/autoconf;
-       @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
+       @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
 
 distcopy:
        $(CP) -p $(DIST) ../$(VERNAME);
        $(CP) -p $(DIST_CFG) ../$(VERNAME)/autoconf;
-       @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+       @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 
 distrib: configure autoconf/config.h.in distdirs distcopy