X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2FMakefile.in;h=0fe99cb4b46d272a6fc6b20afb6acdc689f388ef;hb=cbdd60557759fff13ec70a1b22d579651e25855d;hp=a6dc267e96d183e7ba32b10b24a389c1875acdd6;hpb=5168006b83f501a3cd516fa0e420c9bbac15f0da;p=bacula%2Fbacula diff --git a/bacula/Makefile.in b/bacula/Makefile.in index a6dc267e96..0fe99cb4b4 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -1,6 +1,7 @@ # # Version $Id$ -# +# Master Makefile +# @MCOMMON@ working_dir=@working_dir@ @@ -19,13 +20,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@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \ + src/console src/plugins/fd # 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 @@ -34,6 +35,7 @@ DIST_CFG = autoconf/aclocal.m4 autoconf/configure.in \ autoconf/install-sh autoconf/mkinstalldirs MKDIR = $(srcdir)/autoconf/mkinstalldirs +LIBTOOL_DEPS = @LIBTOOL_DEPS@ #------------------------------------------------------------------------- @@ -56,24 +58,22 @@ 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 + +autoconf/aclocal.m4: autoconf/configure.in autoconf/bacula-macros/* autoconf/gettext-macros/* autoconf/libtool/* + +# Note, the following is needed in the above if ever any new macro is added. +# However, at the current time, the -I libtool causes the autoconf/aclocal.m4 +# get messed up, so this is commented out +# cd autoconf && aclocal -I bacula-macros -I gettext-macros -I libtool 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 + ${RMF} config.cache config.log config.out config.status src/config.h + ${RMF} -r autoconf/autom4te.cache autom4te.cache autoconf --prepend-include=$(srcdir)/autoconf \ autoconf/configure.in > configure chmod 755 configure - -old-configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h - cd $(srcdir); - ${RMF} -f config.cache config.log config.out config.status src/config.h - autoconf --include=$(srcdir)/autoconf \ - autoconf/configure.in > configure - chmod 755 configure - @rm -f config.cache + ${RMF} -r autoconf/autom4te.cache autom4te.cache config.status: if test -x config.status; then config.status --recheck; \ @@ -81,11 +81,14 @@ config.status: autoconf/config.h.in: autoconf/configure.in autoconf/acconfig.h cd $(srcdir); - ${RMF} -f config.cache config.log config.out config.status src/config.h + ${RMF} config.cache config.log config.out config.status src/config.h autoheader --prepend-include=$(srcdir)/autoconf \ autoconf/configure.in > autoconf/config.h.in chmod 644 autoconf/config.h.in +libtool: Makefile $(LIBTOOL_DEPS) + $(SHELL) ./config.status --recheck + installdirs: $(MKDIR) $(DESTDIR)$(sbindir) $(MKDIR) $(DESTDIR)$(sysconfdir) @@ -157,18 +160,17 @@ 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 + $(RMF) $(DESTDIR)/usr/share/pixmaps/bacula.png + $(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop + $(RMF) $(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 - + $(RMF) $(DESTDIR)/usr/share/pixmaps/bacula.png + $(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop + $(RMF) $(DESTDIR)/usr/share/applications/bacula.desktop + $(RMF) $(DESTDIR)/etc/security/console.apps/gnome-console + $(RMF) $(DESTDIR)/etc/pam.d/gnome-console + $(RMF) $(DESTDIR)/usr/bin/gnome-console Makefile: Makefile.in cd $(topdir) \ @@ -184,8 +186,8 @@ Makefiles: (cd src/cats; \ chmod 755 create_bacula_database update_bacula_tables make_bacula_tables; \ chmod 755 grant_bacula_privileges drop_bacula_tables drop_bacula_database; \ - chmod 755 create_@DB_NAME@_database update_@DB_NAME@_tables make_@DB_NAME@_tables; \ - chmod 755 grant_@DB_NAME@_privileges drop_@DB_NAME@_tables drop_@DB_NAME@_database; \ + chmod 755 create_@DB_TYPE@_database update_@DB_TYPE@_tables make_@DB_TYPE@_tables; \ + chmod 755 grant_@DB_TYPE@_privileges drop_@DB_TYPE@_tables drop_@DB_TYPE@_database; \ chmod 755 make_catalog_backup delete_catalog_backup) clean: @@ -195,7 +197,7 @@ clean: @$(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) {} \; + @find . -name ".#*" -exec $(RMF) {} \; # clean for distribution @@ -210,6 +212,7 @@ distclean: @$(RMF) *~ 1 2 3 core core.* config.guess console.log console.sum @$(RMF) working/* kerns-* @$(RMF) -rf txt diff src/python src/testprogs + @$(RMF) libtool devclean: @for I in $(all_subdirs); do (cd $$I && $(MAKE) $@ || exit 1); done