Browse Source

Rename src/obj/test to src/obj-test to workaround bug in older GNU Make

pull/1/head
Luke Dashjr 11 years ago
parent
commit
34c69036da
  1. 10
      src/makefile.unix
  2. 2
      src/obj-test/.gitignore

10
src/makefile.unix

@ -111,7 +111,7 @@ all: bitcoind @@ -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 @@ -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/%)) @@ -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

2
src/obj-test/.gitignore vendored

@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
*
!.gitignore
Loading…
Cancel
Save