win32: Tweak Makefile to handle dependencies

- the dependencies where ignored because the target was wrong
  before > main.o obj64/main.d: main.cpp who.h ../libwin32/main.cpp
  after  > obj64/main.o obj64/main.d: main.cpp who.h ../libwin32/main.cpp
  the "obj64" "prefix allows make to find the rule when building
  obj64/main.o
- adding "-" to "include" shut up missing .d files at first compile

diff --git a/bacula/src/win32/Makefile.rules b/bacula/src/win32/Makefile.rules
index 13a08760814f5a53970d97d16e6f83388e1a5883..c882b56525bd23d5e70681b83fe1579388f22319 100644 (file)
--- a/bacula/src/win32/Makefile.rules
+++ b/bacula/src/win32/Makefile.rules
@@ -25,10 +25,11 @@ define makedep
        @echo "Generating dependencies for $<"
        $(call checkdir,$@)
        $(ECHO_CMD)$(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
-       sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       sed 's,\($*\)\.o[ :]*,$(OBJDIR)/\1.o $@ : ,g' < $@.$$$$ > $@; \
        rm -f $@.$$$$
 endef
 
+
 define link_conapp
        @echo "Linking $@"
        $(call checkdir,$@)
@@ -76,6 +77,6 @@ $(OBJDIR)/%.d: %.cpp
 
 ifneq ($(ALL_OBJS),)
 ifneq ($(MAKECMDGOALS),clean)
-include $(patsubst %.o,%.d,$(filter-out %.res,$(ALL_OBJS)))
+-include $(patsubst %.o,%.d,$(filter-out %.res,$(ALL_OBJS)))
 endif
 endif