Skip to content
Browse files

Merge pull request #309 from theuni/build-fixes

Build fixes after afc1bf8
  • Loading branch information...
2 parents 9cf97fc + 05e6b24 commit 6331a469a77502f0846ce42cdc586aa76cc60052 @theuni theuni committed Jul 28, 2011
Showing with 6 additions and 6 deletions.
  1. +6 −6 Makefile.include.in
View
12 Makefile.include.in
@@ -83,22 +83,22 @@ GEN_DEPS=\
%.o: %.cpp
@rm -f $@
- $(SILENT_CPP) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.cc
@rm -f $@
- $(SILENT_CC) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.c
@rm -f $@
- $(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ $(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.C
@rm -f $@
- $(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.S
@@ -111,12 +111,12 @@ GEN_DEPS=\
%.o: %.m
@rm -f $@
- $(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ $(SILENT_MM) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.mm
@rm -f $@
- $(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
+ $(SILENT_MM) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)

0 comments on commit 6331a46

Please sign in to comment.
Something went wrong with that request. Please try again.