ebl update to BwebConsole (drop Expect/Bconsole and scp)

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 00a3e5c6a9d1e18470457a275e93be86fda3a1ab..4187ecb951b0bb1df09622722e031a99aadf255b 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -19,13 +19,13 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-            @READLINE_SRC@ src/console \
-            @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@
+       @READLINE_SRC@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
+       src/console
 
 # Non-client-only directores
 subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
 
-all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} 
+all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} manpages
 
 DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -62,6 +62,7 @@ autoconf/aclocal.m4: autoconf/configure.in autoconf/bacula-macros/* autoconf/get
 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
+       ${RMF} -rf autoconf/autom4te.cache autom4te.cache
        autoconf --prepend-include=$(srcdir)/autoconf \
        autoconf/configure.in > configure
        chmod 755 configure
@@ -99,7 +100,6 @@ installdirs:
        -if test "x$(dir_group)" != "x" ; then \
           chgrp $(dir_group) $(DESTDIR)$(working_dir); \
        fi
-#      $(MKDIR) $(DESTDIR)$(mandir)
 
 gnomedirs:
        $(MKDIR) $(DESTDIR)/usr/share/pixmaps
@@ -189,7 +189,7 @@ Makefiles:
         chmod 755 make_catalog_backup delete_catalog_backup)
 
 clean:
-       @for I in ${all_subdirs}; \
+       @for I in ${all_subdirs} src/win32; \
          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