Added fix for bug #1275 where acl or xattr data is saved for virtual filenames genera...

[bacula/bacula] / bacula / src / win32 / Makefile.rules

diff --git a/bacula/src/win32/Makefile.rules b/bacula/src/win32/Makefile.rules
index 62ee60c462bc867e50a34decfb9258092db43686..9e2adc71c558404b98e1c49bcc7e0183479c55d1 100644 (file)
--- a/bacula/src/win32/Makefile.rules
+++ b/bacula/src/win32/Makefile.rules
@@ -7,6 +7,7 @@
 
 define clean_obj
        $(ECHO_CMD)rm -f $(1) $(patsubst %.o,%.d,$(filter-out %.res,$(1)))
+       $(ECHO_CMD)rm -f $(1) $(addsuffix .d.*,$(basename $(1)))
 endef
 
 define clean_exe
@@ -14,7 +15,7 @@ define clean_exe
 endef
 
 define checkdir
-       @if [ ! -e $(dir $(1)) ]; then mkdir $(dir $(1)); fi
+       @if [ ! -e $(dir $(1)) ]; then mkdir -p $(dir $(1)); fi
 endef
 
 define makedep
@@ -29,14 +30,12 @@ define link_conapp
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(CFLAGS) $(LDFLAGS) -mconsole $^ $(1) -o $@
-       $(makedbg)
 endef
 
 define link_winapp
        @echo "Linking $@"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) $(CFLAGS) $(LDFLAGS) -mwindows $^ $(1) -o $@
-       $(makedbg)
 endef
 
 define makedbg
@@ -63,11 +62,15 @@ $(OBJDIR)/%.res: %.rc
        $(ECHO_CMD)$(WINDRES) -O coff $< -o $@
 
 $(OBJDIR)/%.d: %.c
+       $(call checkdir, $@)
        $(makedep)
 
 $(OBJDIR)/%.d: %.cpp
+       $(call checkdir, $@)
        $(makedep)
 
+ifneq ($(ALL_OBJS),)
 ifneq ($(MAKECMDGOALS),clean)
 include $(patsubst %.o,%.d,$(filter-out %.res,$(ALL_OBJS)))
 endif
+endif