Mercurial > hg > bitcoin
changeset 1780:e2560d4a0650 draft
Rename src/obj/test to src/obj-test to workaround bug in older GNU Make
| author | Luke Dashjr <luke-jr+git@utopios.org> |
|---|---|
| date | Mon, 23 Jan 2012 14:27:08 -0500 |
| parents | 8d8818ba9501 |
| children | 7b123f675f21 |
| files | src/makefile.unix src/obj-test/.gitignore |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/makefile.unix +++ b/src/makefile.unix @@ -111,7 +111,7 @@ # auto-generated dependencies: -include obj/*.P --include obj/test/*.P +-include obj-test/*.P obj/%.o: %.cpp $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< @@ -123,9 +123,9 @@ bitcoind: $(OBJS:obj/%=obj/%) $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -TESTOBJS := $(patsubst test/%.cpp,obj/test/%.o,$(wildcard test/*.cpp)) +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) -obj/test/%.o: test/%.cpp +obj-test/%.o: test/%.cpp $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -o $@ $< @cp $(@:%.o=%.d) $(@:%.o=%.P); \ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ @@ -138,6 +138,6 @@ clean: -rm -f bitcoind test_bitcoin -rm -f obj/*.o - -rm -f obj/test/*.o + -rm -f obj-test/*.o -rm -f obj/*.P - -rm -f obj/test/*.P + -rm -f obj-test/*.P