From 34c69036dae7b4be100100cc99eb1dbe32fe1bef Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 23 Jan 2012 14:27:08 -0500
Subject: [PATCH] Rename src/obj/test to src/obj-test to workaround bug in
 older GNU Make

---
 src/makefile.unix       | 10 +++++-----
 src/obj-test/.gitignore |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 src/obj-test/.gitignore

diff --git a/src/makefile.unix b/src/makefile.unix
index 69ca0f7b..41452dec 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 00000000..d6b7ef32
--- /dev/null
+++ b/src/obj-test/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore