Fix bug #1246 Sometimes access denied with VSS enabled. UCS

[bacula/bacula] / bacula / src / filed / Makefile.in

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 00340456354fe8f3e18ce940f01f9d6d2796a2dc..e19a727702cb813053e86aedc0d667748775d942 100644 (file)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -31,7 +31,7 @@ dummy:
 SVRSRCS = filed.c authenticate.c acl.c backup.c estimate.c \
          fd_plugins.c accurate.c \
          filed_conf.c heartbeat.c job.c pythonfd.c \
-         restore.c status.c verify.c verify_vol.c
+         restore.c status.c verify.c verify_vol.c xattr.c
 SVROBJS = $(SVRSRCS:.c=.o)
 
 # these are the objects that are changed by the .configure process
@@ -59,20 +59,28 @@ all: Makefile @WIN32@ bacula-fd @STATIC_FD@
        @echo " "
 
 win32/winlib.a:
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 win32/winmain.o:
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 win32/winres.res:
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 # win32 libraries if needed
 win32: $(WIN32OBJS)
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
@@ -92,13 +100,13 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) bacula-fd filed core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bacula-fd
-       if test -f win32/Makefile; then \
-          (cd win32; $(MAKE) clean); \
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) clean); \
        fi
 
 realclean: clean
@@ -107,15 +115,15 @@ realclean: clean
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
-       if test -f win32/Makefile; then \
-          (cd win32; $(MAKE) distclean); \
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) distclean); \
        fi
 
 devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
-       if test -f win32/Makefile; then \
-          (cd win32; $(MAKE) devclean); \
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) devclean); \
        fi
 
 install: all
@@ -130,7 +138,7 @@ install: all
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
        @if test -f static-bacula-fd; then \
-          $(LIBTOOL_INSTALL) install $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
+          $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
        fi