X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=abc9c6f4b7338c8d032b68203aaf2e2b1d9950b1;hb=4f97db494e3f35d5458781c229d470b26aef75ec;hp=9cd92e2752055c49e5b9537b65d97a8a9704bb63;hpb=d00893ec7adea48d7c4d8454c6cdbda6bc6556d3;p=bacula%2Fbacula

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index 9cd92e2752..abc9c6f4b7 100755
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -15,12 +15,13 @@ thisdir = .
 first_rule: all
 dummy:
 
-fd_subdirs = src scripts doc src/lib src/findlib src/filed \
-	     rescue rescue/linux
+# --client-only directories
+fd_subdirs = src scripts src/lib src/findlib src/filed \
+	     @READLINE_SRC@ src/console \
+	     @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@}
 
@@ -37,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
 
@@ -48,7 +49,7 @@ 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
 
@@ -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
@@ -147,8 +163,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-freespace dvd-writepart)
 
 	(cd src/cats; \
 	chmod 755 create_bacula_database      update_bacula_tables     make_bacula_tables; \
@@ -165,6 +182,8 @@ 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
@@ -177,12 +196,8 @@ distclean:
 	@$(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