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-01-23 14:27:08 -0500 |
| commit | 34c69036dae7b4be100100cc99eb1dbe32fe1bef (patch) | |
| tree | 2b78a73a3798e03ec5d07ca3de437d6a584d62ed /src | |
| parent | ca9afa84017a756366e31f1f4be5c85f09a5dbc0 (diff) | |
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 69ca0f7bf7..41452dec81 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -111,7 +111,7 @@ all: bitcoind # 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 @@ obj/%.o: %.cpp 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 @@ test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) 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 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 |