diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-26 22:17:35 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-26 22:17:35 +0000 |
| commit | cd24f370929dcff6c790ce53dc70133259c80bff (patch) | |
| tree | 7b9e6cab7c4120e35b752c757bdbe91134f252ed /src/makefile.unix | |
| parent | 7c08c1a5df691685b9de8c6d1088bb792b079d58 (diff) | |
| parent | b958999af17473300e5b3cd26bd16997e21dd644 (diff) | |
| download | bitcoin-cd24f370929dcff6c790ce53dc70133259c80bff.tar.xz | |
Merge commit 'b958999' into 0.6.0.x
Conflicts:
src/makefile.osx
src/makefile.unix
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 92c1b97e1f..88306515a3 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -115,7 +115,7 @@ all: bitcoind -include obj-test/*.P obj/%.o: %.cpp - $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< + $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ @@ -127,7 +127,7 @@ bitcoind: $(OBJS:obj/%=obj/%) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -o $@ $< + $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ |