diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-23 14:27:08 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-02 17:29:50 -0500 |
commit | 1677743fca631f8fb970fe917866dd982c6ddd40 (patch) | |
tree | e5d72958904191b8c51c0df29088e62188540fc0 /src | |
parent | d1e56838dc067568cfce7bc85bdc228da58f2597 (diff) | |
download | bitcoin-1677743fca631f8fb970fe917866dd982c6ddd40.tar.xz |
Rename src/obj/test to src/obj-test to workaround bug in older GNU Make
Diffstat (limited to 'src')
-rw-r--r-- | src/makefile.unix | 10 | ||||
-rw-r--r-- | src/obj-test/.gitignore | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 9d97ae50ca..53948bcba6 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -129,7 +129,7 @@ all: bitcoind # auto-generated dependencies: -include obj/nogui/*.P --include obj/test/*.P +-include obj-test/*.P obj/nogui/%.o: %.cpp $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< @@ -141,21 +141,21 @@ obj/nogui/%.o: %.cpp bitcoind: $(OBJS:obj/%=obj/nogui/%) $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -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/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ rm -f $(@:%.o=%.d) -test_bitcoin: obj/test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) +test_bitcoin: obj-test/test_bitcoin.o $(filter-out obj/nogui/init.o,$(OBJS:obj/%=obj/nogui/%)) $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(LDFLAGS) $(LIBS) clean: -rm -f bitcoind test_bitcoin -rm -f obj/*.o -rm -f obj/nogui/*.o - -rm -f obj/test/*.o + -rm -f obj-test/*.o -rm -f obj/*.P -rm -f obj/nogui/*.P - -rm -f obj/test/*.P + -rm -f obj-test/*.P diff --git a/src/obj-test/.gitignore b/src/obj-test/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/src/obj-test/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore |