X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=64042e8390ab841cdf3f66e9c1500883d7627919;hb=8db7c1356fb4030c6e79cf74bac1fb240d55b042;hp=3d8ae498a890c22afa9055c0813695f02a8701e5;hpb=26838794577fc5ae76f2ab5bb167402861cd5cd3;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 3d8ae498a8..64042e8390 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -16,14 +16,14 @@ first_rule: all
 dummy:
 
 # --client-only directories
-fd_subdirs = src scripts doc src/lib src/findlib src/filed \
-	     @READLINE_SRC@ src/console rescue rescue/linux \
-	     @GNOME_DIR@ @WX_DIR@
+fd_subdirs = src scripts src/lib src/findlib src/filed \
+	     @READLINE_SRC@ src/console \
+	     @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
 
@@ -38,7 +38,7 @@ MKDIR = $(srcdir)/autoconf/mkinstalldirs
 all: Makefile
 	@for I in ${all_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) $@ || (echo ""; echo ""; echo -e "  \a\a ====== Error in `pwd` ======\a\a"; \
+	      $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
 			    echo ""; echo "";)); \
 	done
 
@@ -49,11 +49,14 @@ depend:
 bacula-fd: Makefile	   
 	@for I in ${fd_subdirs}; \
 	  do (cd $$I; echo "==>Entering directory `pwd`"; \
-	      $(MAKE) all || (echo ""; echo ""; echo -e "  \a\a ====== Error in `pwd` ======\a\a"; \
+	      $(MAKE) all || (echo ""; echo ""; echo "	 ====== Error in `pwd` ======; \
 			    echo ""; echo "";)); \
 	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
@@ -163,8 +166,9 @@ Makefile: Makefile.in
 Makefiles:
 	$(SHELL) config.status
 	(cd scripts; \
-	chmod 755 startmysql stopmysql bacula fd startit stopit btraceback; \
-	chmod 755 mtx-changer bconsole gconsole devel_bacula)
+	chmod 755 startmysql stopmysql bacula startit stopit btraceback; \
+	chmod 755 mtx-changer bconsole gconsole devel_bacula; \
+	chmod 755 dvd-handler)
 
 	(cd src/cats; \
 	chmod 755 create_bacula_database      update_bacula_tables     make_bacula_tables; \
@@ -181,30 +185,28 @@ clean:
 	@(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); 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
 	@$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum
-	@$(RMF) working/*
-	@$(RMF) -r examples/devices/CVS autoconf/CVS autoconf/gnome-macros/CVS
-	@$(RMF) -r doc/techlogs/2002/CVS doc/techlogs/2001/CVS doc/techlogs/1.27/CVS
-	@$(RMF) -r examples/CVS intl/CVS scripts/CVS
-	@$(RMF) -r po/CVS src/immortal/CVS rescue/freebsd/CVS rescue/solaris/CVS
-	@$(RMF) -r CVS src/gnome-console/CVS src/tconsole/CVS
+	@$(RMF) working/* kerns-* 
+	@$(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
@@ -214,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