diff options
| author | Cory Fields <foss@atlastechnologiesinc.com> | 2011-07-28 02:22:55 -0400 |
|---|---|---|
| committer | Cory Fields <foss@atlastechnologiesinc.com> | 2011-07-28 02:25:45 -0400 |
| commit | b4157b3f38fe070cf4fbaff02f0e2a3e3284a948 (patch) | |
| tree | b952be3399a0aee100ff489c22c2fb7bed3a3713 /Makefile.include.in | |
| parent | 30a90701ecff5ac147796d4dadc9c08924a90c27 (diff) | |
fixed: linux build
commit afc1bf87b changed the behavior so that build fails if a .d file
cannot be found. Rather than simply reverting to the old behavior (using
cp ; rather than cp &&), fix the problem instead.
gcc by default creates .d files where the Makefile was invoked, rather
than in the path of the source/object file. We can use the -MF param to
specify that it needs to go in the same path as the object.
As a side effect this also cleans up a great deal of console spew
(missing .d files) during build.
Diffstat (limited to 'Makefile.include.in')
| -rw-r--r-- | Makefile.include.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.include.in b/Makefile.include.in index c351bdcf33..45f140ea0a 100644 --- a/Makefile.include.in +++ b/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_CC) $(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_CC) $(CC) -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) |